|
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.
|
|
|
9d55d5bb
|
2010-06-30T17:32:54
|
|
Drop Xmd.h include now that we're using uint32_t
|
|
|
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>
|
|
|
b74223eb
|
2010-06-23T16:25:02
|
|
fix mod size confusion
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
080a083f
|
2010-06-15T16:43:10
|
|
configure.ac: Enable automake silent rules by default
This allows us to spot warnings much more easily. Also, drop the
now-deprecated AM_MAINTAINER_MODE.
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>
|
|
|
8904c6ee
|
2010-06-15T15:22:05
|
|
xkbcomp: expr: Use XkbcAtomText instead of GetString
This returns us a temporary string, rather than leaking the atom.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
ad0a3d7c
|
2010-06-15T15:20:32
|
|
xkbcomp: Don't leak atom text and string exprs
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
d20bdd3b
|
2010-06-15T15:14:58
|
|
xkbcomp: vmod: Don't get and immediately intern atoms
XkbcInternAtom(XkbcAtomGetString(atom)) has to be the most spectacularly
broken antipattern I've yet seen. Just compare the atoms directly.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
50a037ca
|
2010-06-15T15:13:56
|
|
xkbcomp: Replace open-coded strdup
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
51402502
|
2009-04-25T18:15:02
|
|
Add testcase for XkbcCanonicaliseComponents
Should be reasonably thorough; the shell part is, however, quite
unpleasant.
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>
|
|
|
8ffa3713
|
2009-04-25T18:13:24
|
|
XKBcommon.h: Make header self-contained
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
8b5af79b
|
2009-04-25T14:55:59
|
|
Keysym: Add apallingly bad API documentation for keysym <-> string
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
70b64213
|
2009-04-25T14:52:51
|
|
Make keysym <-> string conversion public API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
62eb167d
|
2009-04-25T14:51:46
|
|
XKB: Text: Use keysym <-> string conversion from keysym.c
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
a8bb86a4
|
2009-04-25T14:51:16
|
|
Test: Keysym: Add tests for new keysym <-> string conversions
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
cdc735c8
|
2009-04-25T14:42:42
|
|
Keysym: Fix conversion for Unicode and bare numbers
Ensure that Unicode string representations are accepted and turned into
numbers, as well as hexadecimal numbers in 0xabcd1234 form; unknown
keysyms are output as 0xabcd1234 in string form.
This also ensures that strings are never returned malloc()ed.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
8e3239a7
|
2009-04-25T14:32:04
|
|
KeySym: Actually handle NoSymbol
Add NoSymbol into the keysym table, so keysym <-> string conversion works for
that, too; also eliminate special-casing of VoidSymbol.
This will require special-casing in libX11 to preserve its API.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
a5ce9754
|
2009-04-25T14:29:23
|
|
test: Fix srcdir != objdir build and test failures
filecomp would fail because it couldn't find the input files, after
compilation failed due to missing includes.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
4e854a21
|
2009-04-21T23:22:25
|
|
listing: Drop unused deviceSpec argument
The server might care about this, but ListComponents is just reading xkb
files.
|
|
|
481deea1
|
2009-04-20T06:40:34
|
|
xkbcomp: Another fairly major rewrite of the listing mode
The listing code in xkbcomp had been setup to allocate a set of buffers
with file paths and then later parse through them to find which maps were
needed.
All the allocation (with the additional allocation for the components
list) was making it really slow, so this patch makes everything simpler
by just generating the components list as we walk the directory tree.
|
|
|
18b43f8d
|
2009-04-19T16:30:36
|
|
Rewrite listing code to generate XkbComponentListPtr
In xkbcomp, the listing code printed out the xkb files to stdout and the
caller would parse the output. Here, we can just generate a
XkbComponentListPtr and pass it back.
This should be a series of smaller commits, but there was no clean way to
do it since it's basically a complete rewrite except for the core map
matching logic.
A lot of code used for special printing modes in xkbcomp has been
shedded. Callers can massage the output as they please.
|
|
|
559305a5
|
2009-04-16T21:47:28
|
|
xkbcomp: Kill unused listing code and make functions static
Much of this was only called from xkbcomp and not used to generate
listings for the server.
|
|
|
5983a4e6
|
2009-04-16T20:01:13
|
|
Scale back global variables
Some of the global variables were either not used anymore or only used
in the listing code.
|
|
|
9520ea0e
|
2009-04-12T12:30:12
|
|
Add XkbNameMatchesPattern implementation from xkbfile
The xkbcomp listing code matches a glob type pattern against installed
xkb files. This adds a Xkbc implementation of the pattern matching code.
|
|
|
fa183ce3
|
2009-04-12T12:15:05
|
|
xkbcomp: Fix use of removed macros
|
|
|
3d4c4d06
|
2009-04-12T11:13:52
|
|
Revert "xkbcomp: Remove listing sources"
This reverts commit c4c9e36fbf4019d802323d9053f54cbfa6d3d5e5. It turns
out that the listing code is used to support the X_kbListComponents
request (via XkbListComponents).
This will have to be refactored into some reasonable interface instead
of the current usage where the server reads xkbcomp stdout. Gross.
|
|
|
3dee8ac9
|
2009-04-12T12:14:36
|
|
misc: Coding-style cleanup
|
|
|
53ead9b5
|
2009-04-11T10:35:44
|
|
Use xkbpath API for locating rules
Instead of hardcoding the XKB base directory when searching for rules in
the xkbcomp code, we can extend the xkbpath API to cover rules and reuse
it. That will make it more convenient if it's ever exposed so people can
set their XKB search paths in a reasonable way.
|
|
|
c728d91b
|
2009-04-10T12:33:31
|
|
Program and files for testing CompileKeymapFromFile
A few simple test cases for verifying the operation of parsing a keymap
file and compiling a keyboard description from it.
|
|
|
abbd1419
|
2009-04-10T12:25:51
|
|
Add interface to compile keyboard description from keymap files
We need to support generating a keyboard description from a keymap file
because there are just some cases where RMLVO or ktcsg is not enough.
The map choosing logic has been refactored into its own function and now
supports choosing a named or default keymap.
|
|
|
e98eb805
|
2009-04-09T20:52:26
|
|
test: Remove extraneous includes
These programs don't actually use the internal API.
|
|
|
0280b10d
|
2009-04-09T14:29:32
|
|
Make XkbcInitAtoms externally accessible
Applications (like the server) need to initialize the atoms system
before using the rest of the library. Maybe it should just init itself
implicitly.
|
|
|
f5d37e27
|
2009-04-08T17:59:15
|
|
Constify public API
There's no reason the arguments can't be const.
|
|
|
babae389
|
2009-04-08T17:54:55
|
|
Change CompileKeymapFromRules to take XkbRMLVOSet
Let's use a nice interface now that it's available from XKBrulescommon.h.
|
|
|
6a84a34d
|
2009-04-08T07:46:25
|
|
Remove all non-public API from XKBcommon.h header
The noble intention was to expose all the new API and new generic types
in the split out kbproto headers through XKBcommon.h. It turns out that
would be a massive amount of work in the server. Someday, but first just
wedging in XkbCompileKeymap* would be good.
Most of the API is in new internal xkb*.h headers. In order to allow the
XKBcommon.h header to be used from the server, we can't pull in other
headers from kbproto since the server has its own copies. However, types
that are different (XkbDescRec, XkbAction) still have Xkbc equivalents
here, and I think they should be used in the server.
|
|
|
b4a3c39b
|
2009-04-07T19:56:41
|
|
Remove KS macros available in XKBfilecommon.h now
A couple of the XkbcKS* macros become redundant with XKBfilecommon.h
split out in kbproto.
|
|
|
5889cef8
|
2009-04-05T20:27:35
|
|
Require strdup and remove utils wrapper
This kills a couple warnings from using the uStringDup wrapper. If you
don't have strdup on your platform, you have bigger issues.
|
|
|
8b100fc0
|
2009-04-05T15:15:20
|
|
Add action datatypes as defined in the server
Some of the XkbAction types are defined differently in the server, so we
add those to XKBcommon.h and use them here like XkbcDescPtr. We'll have
to deal with the impedance mismatch on the client side later.
|
|
|
e0e77b71
|
2009-04-05T09:30:15
|
|
Coding style cleanup on key allocation functions
|
|
|
713c8f41
|
2009-04-04T12:54:44
|
|
test: Exercise compiling from components
This could probably use a lot more real world test cases, but it does
the job for now.
|
|
|
a2e59767
|
2009-04-04T12:50:27
|
|
xkbcomp: Don't say we're exiting when we're not
|
|
|
85039a0d
|
2009-04-04T12:31:55
|
|
xkbcomp: Give keymap file empty name if none supplied
Ensure that the keymap file topName is not NULL since it gets blindly
dereferenced later.
|
|
|
125ce76f
|
2009-04-04T12:21:05
|
|
xkbcomp: Ensure at least keycodes supplied in components
It seems that at least a non-empty keycodes component is required to
compile a XkbcDescPtr.
|
|
|
fdd8a9ec
|
2009-04-04T12:17:50
|
|
xkbcomp: Don't dereference NULL VarDefsPtr
|
|
|
99d2f4a5
|
2009-04-04T12:16:04
|
|
xkbcomp: Refactor keymap file generator
|
|
|
4f736db9
|
2009-04-04T11:04:35
|
|
test: Minor refactor to allow $EXEEXT in program names
|
|
|
8f9a6129
|
2009-04-04T10:52:23
|
|
test: Add logging and some intentionally failing cases
We want to log the output of the tests rather than letting them go to
stderr. This allows tests we expect to fail to be run.
|
|
|
8269cbce
|
2009-04-04T10:02:39
|
|
xkbcomp: Generating components requires rules _and_ layout
This came from trial and error, but it seems that you can generate a
valid keymap with only rules and layout.
|
|
|
fa96602d
|
2009-04-04T09:51:33
|
|
xkbcomp: Fail when converting rules to components returns an error
XkbcRF_GetComponents was returning an error but leaving the generated
components alone. This ensures that the broken XkbComponentNamesPtr is
freed and the error is passed up to the caller.
|
|
|
e72fc29f
|
2009-04-04T09:48:59
|
|
xkbcomp: Cleanup error messages
|
|
|
83367a8d
|
2009-04-04T09:46:20
|
|
xkbcomp: Ensure user has supplied a rules name
|
|
|
95dbbb8a
|
2009-04-04T09:37:53
|
|
rulescomp: Remove unneeded API
|
|
|
5d95a43a
|
2009-04-04T09:29:43
|
|
Refactor xkbpath so that it implicitly initializes
Instead of requiring the user to call XkbInitIncludePath() and
XkbAddDefaultDirectoriesToPath(), all the path entry points now implicitly
initialize the path. When initializing, the default directories are added
so it's useful.
This provides normal operation without exposing the xkbpath API. That
might happen later to allow apps to edit the XKB search path.
|
|
|
5c910623
|
2009-04-04T09:19:51
|
|
Remove trailing spaces in source files
|
|
|
5cc55d7c
|
2009-04-04T09:14:20
|
|
Test compiler to simulate xkbcomp usage
Added a test program, rulescomp, which takes a RMLVO set and generates a
XkbcDescPtr. This is essentially what the xserver will do, except that we
still need to access some xkbcomp internal API to make it work.
|
|
|
51eff3d9
|
2009-04-04T08:52:17
|
|
Fix cleanup error in names allocation
A conditional got reversed during the coding style cleanup.
|
|
|
c38cdc5d
|
2009-04-03T21:18:58
|
|
xkbcomp: Ignore generated parser
|
|
|
3a709e39
|
2009-04-03T21:16:56
|
|
xkbcomp: Don't segfault if the debug files aren't set
Another interface that needs to be cleaned up.
|
|
|
ec86ce1f
|
2009-04-03T20:34:41
|
|
xkbcomp: Declare global debugging vars
These will need to be sanitized at some point, but for now let's just get
the code running.
|
|
|
c14c60bb
|
2009-04-03T20:33:01
|
|
xkbcomp: Back out strdup warning cleanup
There are some spots in the code that use strdup without checking the
argument, so we need this to not segfault. Cleanup later...
|
|
|
71baa3d8
|
2009-04-03T19:35:01
|
|
Fix install path for XKBcommon.h
|
|
|
5216f0c9
|
2009-04-02T06:37:16
|
|
Drop keysym.h pollution from XKBcommon.h
There's really no need to pull this into a public header.
|
|
|
a9822d87
|
2009-04-01T06:22:06
|
|
Add xkbcommon pkg-config file
|
|
|
db03c9b7
|
2009-03-31T19:30:44
|
|
xkbcomp: Clean up utils prototypes
Includes using a macro for the gcc format attributes instead of repeated
ifdef's.
|
|
|
a27e56b6
|
2009-03-31T07:21:20
|
|
xkbcomp: Remove duplicated macros
|
|
|
05daf09f
|
2009-03-31T07:09:47
|
|
xkbcomp: Kill warnings about address always evaluating as true
|
|
|
a1513292
|
2009-03-31T06:57:06
|
|
Merge commit 'tilt/master'
|
|
|
a8d936bd
|
2009-03-31T05:36:52
|
|
Compile keyboard description from XKB rules, too
XkbcCompileKeymapFromRules can be used to generate a XkbDescPtr from XKB
rules instead of using components. The previous XkbcCompileKeymap has
been renamed to XkbcCompileKeymapFromComponents.
|
|
|
94fd3174
|
2009-03-29T11:25:44
|
|
Add rules file parsing from xkbfile
Copy over the Xkb_RF* rules parsing functions from xkbfile's maprules.c.
Eventually, this will be tied into xkbcomp's path searching utilities so
you don't need to supply a full path to the rules file. Also, it this
should eventually incorporate the server's RMLVOSet.
|
|
|
e1284944
|
2009-03-29T11:25:44
|
|
Add rules rules file parsing from xkbfile
Copy over the Xkb_RF* rules parsing functions from xkbfile's maprules.c.
Eventually, this will be tied into xkbcomp's path searching utilities so
you don't need to supply a full path to the rules file. Also, it this
should eventually incorporate the server's RMLVOSet.
|
|
|
3fc0dcc8
|
2009-03-29T08:55:18
|
|
Generate keyboard description from components
Finally, we can generate a XkbcDescPtr from a XkbComponentNamesPtr. This
involves turning the components into a parsed XKB file and then passing
it into the compiler. This first conversion needs more error handling.
|
|
|
1115d555
|
2009-03-29T08:17:13
|
|
xkbcomp: Include Xdefs.h for Atom in tokens.h
|
|
|
587a5d95
|
2009-03-29T08:15:27
|
|
xkbcomp: Add missing includes for Bool in xkbpath
|