|
a63e82be
|
2010-12-17T21:14:54
|
|
Rename XkbcInternAtom() to xkb_intern_atom() and export
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
|
|
ff8e8f69
|
2010-12-09T18:25:18
|
|
config: include: use nobase_include_HEADERS
Slightly simpler.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
|
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>
|
|
|
a2f11558
|
2010-10-19T15:16:50
|
|
Add struct xkb_state
|
|
|
e8798287
|
2010-10-08T15:33:18
|
|
Don't return a static buffer in public API
|
|
|
d202bc44
|
2010-10-08T15:07:44
|
|
Pull in XKB_COMMON_* version of modifier masks
This way we can use libxkbcommon without having to include X.h.
|
|
|
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
|
|
|
351f8c65
|
2010-07-02T15:05:21
|
|
Drop Bool type
It's a nightmare trying to avoid double definitions.
|
|
|
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
|
|
|
5669e1a8
|
2010-07-02T11:43:56
|
|
Compile with -fvisibility=hidden when possible
|
|
|
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
|
|
|
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
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
4e854a21
|
2009-04-21T23:22:25
|
|
listing: Drop unused deviceSpec argument
The server might care about this, but ListComponents is just reading xkb
files.
|
|
|
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.
|
|
|
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.
|
|
|
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.
|
|
|
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.
|
|
|
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.
|
|
|
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.
|
|
|
e86b31ce
|
2009-03-29T08:11:25
|
|
Add XKBlib resizing functions
These were originally in XKBMalloc.c.
|
|
|
d43a7bf0
|
2009-03-28T19:21:18
|
|
Copy xkbfile IsUpper/IsLower macros
xkbcomp was using Xlib's XConvertCase to check upper/lowercase. That's a
lot of code, so hopefully the xkbfile macros using _XkbKSCheckCase are
good enough. This also required that <X11/keysym.h> is included to get
all the XK_* definitions.
|
|
|
eff1c538
|
2009-03-28T19:00:13
|
|
Copy XkbEnsureSafeMapName from xkbfile
|
|
|
5315e5d1
|
2009-03-28T17:55:46
|
|
Add XKBlib API to support keytypes
Added common variants of XkbComputeEffectiveMap, XkbInitCanonicalKeyTypes
and all their needed functions. A couple functions that were in alloc.c
moved to malloc.c to mirror the libX11 sources better.
Original code in
libX11/src/xkb/XKBMalloc.c
libX11/src/xkb/XKBMisc.c
libX11/src/xkb/XKB.c
|
|
|
62482b96
|
2009-03-28T16:08:46
|
|
Add geometry Compute API from XKBlib
A small needed subset from libX11/src/xkb/XKBGeom.c.
|
|
|
28de09e5
|
2009-03-28T15:51:06
|
|
Add xkbcommon macro for XkbKSIsKeypad and XkbKSIsDeadKey(k)
IsKeypad is used in symbols, but we'll just grab them both. It might be
better to split parts of XKBfile.h out eventually.
|
|
|
a53b9b1e
|
2009-03-28T15:32:51
|
|
Add XkbModIndexText replacement
Now, I think we should have all the *Text functions we need.
|
|
|
54aea7fe
|
2009-03-28T15:12:30
|
|
Add VMod Text functions from xkbfile
|
|
|
46e5e164
|
2009-03-28T12:39:21
|
|
Copy XkbAddGeom* functions from XKBlib
These are needed by the geometry compiler in xkbcomp.
|
|
|
2671b777
|
2009-03-28T14:06:26
|
|
Add more *Text functions from xkbfile
This should cover all the usage in xkbcomp. The format arguments were
dropped except for the special case of XkbModMaskText, which needs to
write in XkbCFile format in HandleVModDef. This was just changed to a
Bool to avoid the need for the macros in XKBfile.h.
The function prefixes have been renamed to be unique from xkbfile.
|
|
|
1f08ae1e
|
2009-03-28T11:56:35
|
|
Expose all the geometry allocation subroutines
We need a couple in xkbcomp, but they might also be needed externally,
too.
|
|
|
72df9bb3
|
2009-03-28T06:32:08
|
|
Move *Text APIs into libxkbcommon
These seem like they might be generally useful, and more will be needed
from xkbfile.
|
|
|
c88c0ba7
|
2009-03-25T19:00:49
|
|
Borrow atom implementation from libxkbfile
We need an atom implementation not relying on XInternAtom and friends.
The original code is in
libxkbfile/src/xkbatom.c
|
|
|
4859304f
|
2009-03-17T06:19:56
|
|
Use X extern "C" guards around function declarations for public header
|
|
|
1ff77ecd
|
2009-03-05T18:20:15
|
|
Rename headers to XKBcommon* and install in extensions directory
Following the kbproto convention, the headers will be named XKBcommon.h
and XKBcommonint.h. Furthermore, they'll be installed in X11/extensions
directory with the rest of the XKB headers.
|
|
|
74173104
|
2009-03-19T16:57:01
|
|
Add XkbDescRec initializers and destructors
Copies the code to initialize and destroy an XkbDescRec from libX11. The
original code is in
libX11/src/xkb/XKBAlloc.c
libX11/src/xkb/XKBGAlloc.c
libX11/src/xkb/XKBMAlloc.c
|
|
|
3a700f81
|
2009-03-19T17:16:13
|
|
Use common XKB headers and add common type XkbcDescRec
Switched to the common XKB headers which don't contain Xlib pollution.
A new common keyboard description type, XkbcDescRec, has been added.
This is the XkbDescRec definitions in xkbstr.h in the xserver since it
contains the defined field we'll need.
|
|
|
83f198f1
|
2009-01-20T07:46:12
|
|
Initial implementation of keysym handlers
Add the xkbcommon implementations of XKeysymToString and XStringToKeysym.
These symbols have the namespace prefix of Xkbc and are declared in
X11/XkbCommon.h.
The implementation is taken directly from Xlib, but does not include the
XKeysymDB parsing and hashing yet (if it ever will). A couple type
conversions were needed to keep from using Xlib.h. See original files:
libX11/src/KeysymStr.c
libX11/src/StrKeysym.c
|