51eff3d939
Fix cleanup error in names allocation
...
A conditional got reversed during the coding style cleanup.
2009-04-04 08:55:23 -07:00
c38cdc5ded
xkbcomp: Ignore generated parser
2009-04-03 21:18:58 -07:00
3a709e399e
xkbcomp: Don't segfault if the debug files aren't set
...
Another interface that needs to be cleaned up.
2009-04-03 21:17:52 -07:00
ec86ce1f1a
xkbcomp: Declare global debugging vars
...
These will need to be sanitized at some point, but for now let's just get
the code running.
2009-04-03 20:34:41 -07:00
c14c60bb37
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...
2009-04-03 20:34:19 -07:00
71baa3d85a
Fix install path for XKBcommon.h
2009-04-03 19:35:01 -07:00
5216f0c92f
Drop keysym.h pollution from XKBcommon.h
...
There's really no need to pull this into a public header.
2009-04-02 06:37:16 -07:00
a9822d8720
Add xkbcommon pkg-config file
2009-04-01 06:22:06 -07:00
db03c9b7e9
xkbcomp: Clean up utils prototypes
...
Includes using a macro for the gcc format attributes instead of repeated
ifdef's.
2009-03-31 19:32:49 -07:00
a27e56b6fb
xkbcomp: Remove duplicated macros
2009-03-31 07:21:20 -07:00
05daf09f18
xkbcomp: Kill warnings about address always evaluating as true
2009-03-31 07:09:47 -07:00
a151329266
Merge commit 'tilt/master'
2009-03-31 06:57:06 -07:00
a8d936bda5
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.
2009-03-31 05:43:08 -07:00
94fd317463
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.
2009-03-30 06:31:26 -07:00
e1284944cf
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.
2009-03-29 11:31:54 -07:00
3fc0dcc816
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.
2009-03-29 08:55:18 -07:00
1115d55549
xkbcomp: Include Xdefs.h for Atom in tokens.h
2009-03-29 08:17:13 -07:00
587a5d956f
xkbcomp: Add missing includes for Bool in xkbpath
2009-03-29 08:15:27 -07:00
e86b31ce92
Add XKBlib resizing functions
...
These were originally in XKBMalloc.c.
2009-03-29 08:11:25 -07:00
d43a7bf02f
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.
2009-03-28 20:22:28 -07:00
eff1c53873
Copy XkbEnsureSafeMapName from xkbfile
2009-03-28 19:00:13 -07:00
c4c9e36fbf
xkbcomp: Remove listing sources
...
The xkbcomp listing APIs were only needed for the "xkblist" mode, which
won't be supported here.
2009-03-28 18:50:29 -07:00
fe94593d02
malloc/misc/xkb: Coding style cleanup
2009-03-28 18:17:34 -07:00
5315e5d14a
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
2009-03-28 17:55:46 -07:00
baa9581d81
geom: Coding-style cleanup
2009-03-28 16:21:25 -07:00
62482b9614
Add geometry Compute API from XKBlib
...
A small needed subset from libX11/src/xkb/XKBGeom.c.
2009-03-28 16:08:46 -07:00
28de09e515
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.
2009-03-28 15:51:06 -07:00
a53b9b1ed3
Add XkbModIndexText replacement
...
Now, I think we should have all the *Text functions we need.
2009-03-28 15:32:51 -07:00
a59ce8f525
Drop another unneeded format argument
...
Almost cleared of XkbMessage...
2009-03-28 15:24:06 -07:00
54aea7fe8b
Add VMod Text functions from xkbfile
2009-03-28 15:12:30 -07:00
46e5e164d6
Copy XkbAddGeom* functions from XKBlib
...
These are needed by the geometry compiler in xkbcomp.
2009-03-28 14:22:42 -07:00
b0acc97a93
xkbcomp: s/XStringToKeysym/XkbcStringToKeysym/
2009-03-28 14:22:41 -07:00
1f08ae1e56
Expose all the geometry allocation subroutines
...
We need a couple in xkbcomp, but they might also be needed externally,
too.
2009-03-28 14:22:41 -07:00
39d7be43c8
xkbcomp: Use xkbcommon allocation functions
...
s/XkbAlloc/XkbcAlloc/ so we don't know XKBlib.
2009-03-28 14:22:41 -07:00
b9335d5810
Kill off usage of Display
...
The use of Display in xkbcomp always boiled down to passing it to
XkbInternAtom and XkbAtomGetString. This shouldn't be a problem here.
2009-03-28 14:22:41 -07:00
2671b777cf
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.
2009-03-28 14:22:41 -07:00
8544cde52e
xkbcomp: Drop unused Display argument in Atom functions
...
The xkbcommon Atom implementation doesn't take Display into account.
2009-03-28 14:22:35 -07:00
72df9bb35f
Move *Text APIs into libxkbcommon
...
These seem like they might be generally useful, and more will be needed
from xkbfile.
2009-03-28 12:01:36 -07:00
18337008b5
libxkbcomp: Use the internal Atom implementation
...
s/XkbInternAtom/XkbcInternAtom/ and s/XkbAtomGetString/XkbcAtomGetString/
2009-03-28 12:01:36 -07:00
c277d3d438
libxkbcomp: s/Status/int/ since we don't have Xlib.h
2009-03-28 12:01:36 -07:00
d5a9be653b
libxkbcomp: Drop unused format field for *Text functions
2009-03-28 12:01:36 -07:00
6a578de9cb
libxkbcomp: Add non-xkbfile XkbActionTypeText
2009-03-28 12:01:36 -07:00
4fe322aa99
libxkbcomp: s/XPointer/char */
...
Replace XPointer with its definition since we don't have the privilege
of using Xlib.h. Why this is char * and not void *, I'll never know.
2009-03-28 12:01:36 -07:00
37769b5a10
libxkbcomp: s/XkbDescPtr/XkbcDescPtr/
...
We need to use the keyboard description structure from XKBcommon.h since
it doesn't have the Display field.
2009-03-28 12:01:35 -07:00
dd25bbc9ac
libxkbcomp: Eradicate XkbFileInfo usage
...
The only real usage was in the frontend to generate a .xkm file. The
rest of the code just operated on the attached XkbDescPtr. Note that
here we've replaced the usage of the defined field in CompileKeymap with
the equivalent field in a XkbcDescPtr.
2009-03-28 12:01:28 -07:00
f3677538f4
libxkbcomp: Include X.h and Xdefs.h for Atom and Bool
2009-03-27 19:30:11 -07:00
30e0103216
libxkbcomp: Remove usage of client-side headers
...
This will surely break things. Let's see just what we need to replace.
2009-03-27 19:25:14 -07:00
a3809b1340
xkbcomp: Add non-xkbfile XkbConfigText
2009-03-27 18:55:13 -07:00
f2308e7e55
Ignore files for xkbcomp
2009-03-27 18:44:39 -07:00
23caa60fa9
Ignore ks_tables.h in makekeys directory now
2009-03-27 18:43:12 -07:00
Dan Nicholson