|
6a34e4e1
|
2012-02-29T19:56:39
|
|
Don't check for NULL before free()
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
c41061a0
|
2012-02-23T19:26:33
|
|
Use yacc-generated header instead of tokens.h
The yacc implementation can generate all the necessary token
definitions itself; there is no need to maintain a hand written
file for that.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
ad4f195e
|
2012-02-25T23:17:47
|
|
makekeys: Receive the keysym files as arguments
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
0d8874d0
|
2012-02-26T00:03:24
|
|
makekeys: update to match the rest of libX11 makekeys
This integrates two commits from libX11:
ebd6ef0a4db0ddef0ae17ad14571518ccdeea5ba
XStringToKeysym: Special case for XF86 keysyms
Some XFree86 keysyms were in XKeysymDB as XF86_foo, despite really being
XF86foo. So, if we get to the bottom of XStringToKeysym and haven't
found our XF86_foo, try it again as XF86foo.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
00175397480b76d32bf82b0c7c94c91a2a95954e
makekeys: Scan vendor keysyms as well as core
Since we can't really live without vendor keysyms, scan them all in to
generate ks_tables.h, rather than only doing the core ones, and leaving
the vendor syms to be manually synchronised with XKeysymDB.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Notice that the xkey.sh test is changed to match libX11 behavior, i.e.
XKeysymToString(0x1008FE20) -> "XF86Ungrab" as opposed to "XF86_Ungrab".
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
04e687c9
|
2012-02-25T21:09:28
|
|
makekeys: Fix build/target word size mismatch when cross-compiling
This matches commit 24283d40b1e4314c6647dda49d2a159833341a8b from
libX11:
Since makekeys is built using build environment's compiler and
runs natively, we have to make sure that the size of the
Signature type is the same on both the native environment
and the target, otherwise we get mismatches upon running X,
and some LSB test failures (xts5).
Use an unsigned 32-bit integer on all platforms.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
eff72fab
|
2012-02-25T11:53:01
|
|
Fix warnings in scanner and parser
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
1d969c5c
|
2012-02-24T16:08:55
|
|
Fix an incorrect sizeof
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
f3e4335f
|
2012-02-24T16:07:17
|
|
Fix all constness warnings
These are all trivial/obvious fixes which clear a bunch of warnings.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
cca1c050
|
2012-02-24T16:03:44
|
|
Fix possible null dereferences
Fix all reported null dereferences from clang-analyzer.
There seems to be one false negative (in file indicators.c), but it is
fixed anyway.
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
744527e9
|
2012-02-24T16:10:06
|
|
Fix remaining warnings
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
a0dd0526
|
2012-02-25T11:46:12
|
|
Remove unused includes of "tokens.h"
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
9005624f
|
2012-02-24T16:00:10
|
|
Remove unneeded assignments and variables
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
|
9ad0be33
|
2012-02-24T10:04:16
|
|
Remove unused debug #defines
Signed-off-by: Ran Benita <ran234@gmail.com>
|
|
1ab058bb
|
2012-02-20T17:47:46
|
|
Fix typo in ExprResolveKeyCode
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
e209fe31
|
2012-02-20T17:33:39
|
|
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>
|
|
|
43ed3ff0
|
2012-02-20T17:14:04
|
|
Switch expression resolution priv from char to void
Avoids a lot of really lame casts.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
eb6d9a05
|
2012-02-20T17:09:06
|
|
Remove chaining support from LookupModMask
Turns out we never use it, so.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
11ea0791
|
2012-02-20T17:07:48
|
|
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>
|
|
|
1a2f2556
|
2012-02-20T17:00:51
|
|
Remove unused LookupPriv::priv
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
55e058f8
|
2012-02-20T16:59:51
|
|
Move some definitions from expr.h to expr.c
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
90d86c36
|
2012-02-20T16:54:54
|
|
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>
|
|
|
590df28c
|
2012-02-20T16:35:39
|
|
Move groupNames mask definition to its user
groupNames was declared in compat.c as a global to anything which
included compat.h (for which groupNames was its sole reason to exist),
but only ever used in indicators.c.
Which is kind of fortunate, given that e314931e removed identical
definitions of groupNames (as integers, not masks) from both action.c
and symbols.c.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
91b89852
|
2012-02-20T16:24:02
|
|
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>
|
|
|
d32822e6
|
2012-02-20T16:04:37
|
|
Open-code a radio group SimpleLookup
Because, joke's on you, it wasn't actually looking up radio groups.
Just checking to see if it was a string that was "none", or an integer.
Lord give me strength.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
e314931e
|
2012-02-20T15:47:57
|
|
Add ExprResolveGroup helper
Just a dumb wrapper around ExprResolveInteger.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
8b47dbbf
|
2012-02-20T15:47:38
|
|
Add ExprResolveButton helper
Just a dumb wrapper around ExprResolveInteger.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
3431a089
|
2012-02-20T15:37:53
|
|
Introduce ExprResolveLevel helper
Which returns an integer representing the level number represented by
the given expression.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
193e9b39
|
2012-02-20T15:33:40
|
|
Introduce ExprResolveRadioGroup helper
Just a tiny special-cased version of ExprResolveInteger.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
26285a7b
|
2012-02-20T14:15:08
|
|
Remove priv arguments from ExprResolveString
They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
b7b49eb0
|
2012-02-20T14:10:41
|
|
Remove priv arguments from ExprResolveKeySym
They've never been used by its one caller.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
70033b13
|
2012-02-20T14:08:55
|
|
Remove priv arguments from ExprResolveKeyName
They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
482d4faa
|
2012-02-20T13:44:27
|
|
Remove priv arguments from ExprResolveBoolean
They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
94041575
|
2012-02-20T13:40:34
|
|
Remove priv arguments from ExprResolveFloat
They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
3151ce36
|
2012-02-20T13:34:36
|
|
Remove priv arguments from ExprResolveModMask
What with them now being unused and all.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
67605d2c
|
2012-02-20T13:32:09
|
|
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>
|
|
|
fbb82199
|
2012-02-16T11:18:49
|
|
Respect explicit minimum/maximum keycodes
Make sure we carry over an explicit minimum/maximum keycode setting,
rather than just using the computed minimum/maximum; this got broken
while changing the keycode range to be unsigned.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Pekka Paalanen <ppaalanen@gmail.com>
|
|
|
c45cdb0c
|
2012-02-16T00:22:11
|
|
Still more memory leak fixes
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
83f18b1c
|
2012-02-15T19:39:33
|
|
Fix xkbparse.y compilation
Thanks to autotools happily building stale generated sources, I hadn't
actually ever built my xkbparse.y changes. Fix that so it not only
compiles, but works. This seems to parse long keycodes correctly,
although I very much would not recommend testing this by declaring
0x1fffffff as your highest keycode.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
eb8c96cb
|
2012-02-15T16:42:45
|
|
Don't leak SymbolsInfo
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
67c874d7
|
2012-02-15T16:24:07
|
|
Enable stderr debugging by default
(If debugFlags is set to non-zero.)
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
1a6c3807
|
2012-02-15T15:58:14
|
|
vmod: Pass xkb_desc explicitly to vmod functions
Some error paths don't set info->xkb correctly, so just do like most
utility functions and pass the xkb_desc explicitly.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
4e228511
|
2012-02-15T14:34:08
|
|
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>
|
|
|
8f01b144
|
2012-02-15T12:54:11
|
|
xkbscan: Copy, rather than assign, file name
For some reason, lex decided to reduce a strcpy into an assignment,
leading to entirely justified valgrind warnings about invalid reads,
when scanFile was set to a string which may have only ever lived on the
stack of a now-exited function.
Make it a strdup() instead.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
ead9d0cb
|
2012-02-15T11:49:10
|
|
Move include path from X11/extensions/ to xkbcommon/
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
615291f1
|
2012-01-05T14:20:35
|
|
xkbcomp: Silence warning of return of uninitialised value
Some routes through HandleGeometryVar do not set a return value. Set a default
value for the return variable to avoid returning an uninitialised value.
|
|
c19661b9
|
2011-12-16T12:52:00
|
|
Add xkbc_free_keymap helper
Which just calls XkbcFreeKeyboard with the only arguments you'd ever
pass it.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
99e29de2
|
2011-10-27T14:30:21
|
|
xkbcomp: Copy the string into the buffer rather than updating pointer
Avoids assigning the global pointer to a value that may only have a stack
lifetime:
Fixes valgrind warnings such as:
==24795== Invalid read of size 1
==24795== at 0x4A06E9A: strcpy (mc_replace_strmem.c:311)
==24795== by 0x4E54D68: ProcessIncludeFile (misc.c:73)
==24795== by 0x4E59726: HandleIncludeSymbols.constprop.3 (symbols.c:829)
==24795== by 0x4E59D8E: HandleSymbolsFile (symbols.c:1673)
==24795== by 0x4E5A068: CompileSymbols (symbols.c:2211)
==24795== by 0x4E51A61: CompileKeymap (keymap.c:155)
==24795== by 0x4E5B410: xkb_compile_keymap_from_components (xkbcomp.c:236)
==24795== by 0x4E5B587: xkb_compile_keymap_from_rules (xkbcomp.c:161)
==24795== by 0x405ED2: display_create (window.c:2007)
==24795== by 0x403732: main (desktop-shell.c:320)
==24795== Address 0x7fefff0a0 is just below the stack ptr. To suppress, use:
--workaround-gcc296-bugs=yes
==24795==
==24795== Source and destination overlap in strcpy(0x7fefff430, 0x7fefff430)
==24795== at 0x4A06F3D: strcpy (mc_replace_strmem.c:311)
==24795== by 0x4E54D68: ProcessIncludeFile (misc.c:73)
==24795== by 0x4E59726: HandleIncludeSymbols.constprop.3 (symbols.c:829)
==24795== by 0x4E59D8E: HandleSymbolsFile (symbols.c:1673)
==24795== by 0x4E5A068: CompileSymbols (symbols.c:2211)
==24795== by 0x4E51A61: CompileKeymap (keymap.c:155)
==24795== by 0x4E5B410: xkb_compile_keymap_from_components (xkbcomp.c:236)
==24795== by 0x4E5B587: xkb_compile_keymap_from_rules (xkbcomp.c:161)
==24795== by 0x405ED2: display_create (window.c:2007)
==24795== by 0x403732: main (desktop-shell.c:320)
|
|
f91afe4f
|
2011-06-03T17:19:09
|
|
Add prototype for CheckDefaultMap().
Those warnings disappear accordingly:
| CC parseutils.lo
| parseutils.c:742: warning: no previous prototype for ‘CheckDefaultMap’
| CC xkbscan.lo
| xkbscan.l: In function ‘XKBParseString’:
| xkbscan.l:220: warning: implicit declaration of function ‘CheckDefaultMap’
| xkbscan.l:220: warning: nested extern declaration of ‘CheckDefaultMap’
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
|
|
|
621c2a7a
|
2011-01-29T14:24:46
|
|
Get rid of unneeded <X11/Xlib.h> include.
There's no need for this xlib include:
| YACC xkbparse.c
| CC xkbparse.lo
| xkbparse.y:98:22: error: X11/Xlib.h: No such file or directory
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
|
|
a63e82be
|
2010-12-17T21:14:54
|
|
Rename XkbcInternAtom() to xkb_intern_atom() and export
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
|
|
2422c41b
|
2010-12-09T16:28:52
|
|
config: add keysymdef and xf86keysym as dependencies of ks_tables.h
This would cover the scenario where these headers file are updated,
for example, a new version is installed. Running 'make' again
on libxkbcommon should rebuild ks_tables.h.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
|
69e52ad9
|
2010-12-09T16:22:17
|
|
config: makekeys prog should stand alone in the makekeys directory
This program is a utility to generated a header file.
The header file it generates should not be located in the
directory where this utility program is compiled.
Move the /makekeys dir as a sibling of /src.
This reduces the number of bi-directional relationships
between directories.
Make corresponding makefiles simplifications.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
|
89377d5c
|
2010-12-08T21:20:46
|
|
config: use existing variables KEYSYMDEF_H and XF86KEYSYM_H
These automake variables are not currently used.
The variable KS_HEADERS is not required anymore.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
|
f5076604
|
2010-12-07T11:09:13
|
|
config: let Automake handle Lex and Yacc dist and cleaning
BUILT_SOURCES and MAINTAINERCLEAN are not needed for lex and yacc
Note that xkbscan was missing on those lines.
Automake generates all the rules to handle building, distribution
and cleaning.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
|
63e2719a
|
2010-12-07T10:33:23
|
|
config: replace deprecated INCLUDES with AM_CPPFLAGS
Fixes automake warning.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
|
ceba14dc
|
2010-12-07T10:23:18
|
|
config: update subdirs .gitignore
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
f8301ebc
|
2010-11-11T23:27:21
|
|
xkbscan: resolve build warning/rpmlint error
xkbscan.l: In function 'setScanState':
xkbscan.l:201:1: warning: control reaches end of non-void function
I: Program returns random data in a function
E: libxkbcommon no-return-in-nonvoid-function xkbscan.l:201
Change return type of setScanState to void, since a return value is
never used by its callers.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
|
|
f94a64cc
|
2010-10-26T16:21:28
|
|
Link with -no-undefined
Use -no-undefined to assure libtool that the libxkbcommon library has
no unresolved symbols at link time, so that libtool will build a shared
library on platforms require that all symbols are resolved when the
library is linked.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
|
|
|
8d2c522f
|
2010-10-21T21:34:41
|
|
Don't check for xlib, we don't need it
|
|
|
c88439db
|
2010-10-20T22:27:07
|
|
Update xkb->ctrls->num_groups when copying the keysyms
This used to be set when we read an XKM file.
|
|
|
12569157
|
2010-10-20T15:57:45
|
|
Restore compatible action structs
This unbreaks the X server code to serialize an xkb_desc, but loses the
32 bit vmod fields. Needs some work...
|
|
|
a84c0879
|
2010-10-19T21:57:59
|
|
Use flex for generating the scanner, add support for parsing from strings
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
|
|
|
e8798287
|
2010-10-08T15:33:18
|
|
Don't return a static buffer in public API
|
|
73ca959d
|
2010-09-27T16:05:52
|
|
Dead code removal and static markup
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
|
fb05ee47
|
2010-09-03T20:35:28
|
|
Remove libxkbfile dependency for real this time
|
|
|
20bfe128
|
2010-08-29T21:30:10
|
|
Use const char * in struct xkb_rule_names
|
|
|
be2bd661
|
2010-08-25T14:51:52
|
|
Pull in a few #defines from libxkbfile and lower kbproto requirement
|
|
|
b3805a23
|
2010-07-02T12:26:43
|
|
Get rid of a few unused #defines in public header
|
|
|
97fbc348
|
2010-07-02T12:14:03
|
|
Rename XkbRMLVOSet to struct xkb_rule_names
|
|
|
15f25999
|
2010-07-02T12:10:05
|
|
Move private structs and defines to private headers
|
|
|
3f0034a9
|
2010-07-02T11:50:01
|
|
Rename public entry points to lowercase and underscore
|
|
|
9f602686
|
2010-07-01T14:35:24
|
|
Pull in enough structs and defines from XKBstr.h to only need XKB.h
We want to move away from sharing implementation structs and let libX11
and libxkbcommon use each their own set of structs.
|
|
|
8e653493
|
2010-06-30T17:31:34
|
|
Fix warning from CARD32 -> uint32_t conversion
|
|
|
e10e16ad
|
2010-06-30T17:20:56
|
|
Constify XkbcAtomText()
Atoms aren't mutable and this lets us put tbGetBuffer() back in the box.
|
|
|
d95b2893
|
2010-06-30T17:13:21
|
|
Make XkbcInitAtoms() call optional
|
|
|
0ece2cdb
|
2010-06-30T16:56:24
|
|
Drop more malloc/free wrappers
|
|
|
a76df865
|
2010-06-30T16:33:25
|
|
Use the right action structs
We were casting the union members to the wrong action structs (from kbproto).
|
|
|
1723ef1b
|
2010-06-30T15:48:39
|
|
Copy over missing action structs from kbproto
|
|
|
9258cc3d
|
2010-06-30T13:31:21
|
|
Rename Xkbc*Action to struct xkb_*_action
|
|
|
399d4bd6
|
2010-06-28T06:58:01
|
|
Drop malloc wrappers
|
|
|
47d3b396
|
2010-06-28T06:50:12
|
|
Drop CARD32 and Opaque types
|
|
|
2fb329c9
|
2010-06-23T16:25:10
|
|
Copy and duplicate XkbModsRec and XkbKTMapEntryRec
Copy these types in so we can extend the vmod size.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
8693c265
|
2010-06-22T15:54:52
|
|
Add really rudimentary rules caching support
Keep the parsed form of the last-used rules file around, and reuse that
if we get asked for the same ruleset. If not, bin it and cache the
other one.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
7257d4c8
|
2010-06-21T14:28:34
|
|
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>
|
|
|
b3852542
|
2010-06-21T14:27:58
|
|
Interp: More lazy keysym resolution
Resolve the keysyms when we create an InterpDef, rather than directly
in the parser.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
2c4a045a
|
2010-06-21T14:22:26
|
|
Allow external atom databases
Allow people to plug in an external atom database (e.g. the X server's),
so we don't have to migrate our own atoms over later. We are a bit
over-keen on atoms at the moment, so it does pollute the atom database a
bit though.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
15b0db54
|
2010-06-17T05:56:08
|
|
Copy in XkbCompatMapRec and XkbSymInterpretRec
These contain actions, so transition them ahead to XkbcAction and move
them into XKBcommon.h.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
60e7eeeb
|
2010-06-17T03:16:09
|
|
Use CARD32 instead of Atom, drag in XkbClientMapRec
On 64-bit architectures, XID varies in size between the server (always
32 bits), and non-server (always unsigned long) for some inexplicable
reason. Use CARD32 instead to avoid this horrible trap.
This involves dragging in XkbClientMapRec so we don't get stuck in the
KeySym trap.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
f246db20
|
2010-06-15T19:40:31
|
|
Fix compilation with DEBUG
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
acc467de
|
2010-06-15T19:39:15
|
|
xkbcomp: Use fread() instead of getc()
So, it turns out that if you're parsing a fairly large amount of data,
using getc() to get all the input rather than, say, read(), is some kind
of remarkably daft and unperformant idea.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
240a0c34
|
2010-06-15T19:38:16
|
|
xkbcomp: Lazy keysym parsing (avoid XStringToKeysym)
Instead of calling XStringToKeysym on every keysym we parse, store it as
a string until we need to store it in an actual keymap.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
48baabeb
|
2010-06-15T19:30:30
|
|
Atoms: Avoid allocations in XkbAtomText()
XkbAtomGetString() returns a freshly-allocated string, whereas
XkbAtomText() returns the same in a temporary buffer. XkbAtomText used
to call XkbAtomGetString() and then free the result, which seems quite
spectacularly pointless when you think about it. Shuffle the atom code
around so we don't have to allocate for XkbAtomText().
This changes semantics slightly wrt non-printable characters, but I
haven't been able to see any effect so far. And it may well be ever so
slightly quicker.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
a0e180b0
|
2010-06-15T16:42:06
|
|
Expose tbGetBuffer to the rest of libxkbcommon
This will let us implement XkbAtomGetString on top of XkbAtomText,
instead of having the latter get a duplicated string, dump it into a
temporary buffer, and subsequently free it (sigh).
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
4346e006
|
2010-06-15T16:41:10
|
|
xkbcomp: keycodes: Silence gcc warnings
It was right to warn us: some of these were actually bogus.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
5df3dff7
|
2010-06-15T15:27:12
|
|
xkbcomp: geometry: Plug numerous atom text & expr leaks
This code is absolute misery.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
18039a6c
|
2010-06-15T15:25:40
|
|
xkbcomp: Atom text and expr leak fixes part #973
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
a22386d4
|
2010-06-15T15:23:23
|
|
xkbcomp: Don't leak atom text and string exprs, again
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
d2d787df
|
2010-06-17T00:51:49
|
|
Regroup actions into current vs. deprecated, resize vmod
Use Xkbc* for all our actions that we intend to keep around, and Xkb*
for deprecated ones we can hopefully get rid of, at least internally.
While we're at it, make vmods be a uint32_t.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
e564235b
|
2010-06-15T19:43:14
|
|
xkbcomp: Don't malloc() and free() most scanned tokens
Use a constant buffer instead. Sigh.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
85b7f47d
|
2009-04-25T18:13:52
|
|
Add XkbcCanonicaliseComponents
Canonicalises two sets of components (new and old), e.g.:
new: +bar
old: foo
result: foo+bar
This is required as part of the spec, so clients can reuse part of the
device's old keymap.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|