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
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
0c1bbb05d9
Import xkbcomp sources for CompileKeymap
...
A copy of the xkbcomp sources (except the frontend) have been copied in
to provide a means to compile a XkbDescPtr. This definitely doesn't
build or do the right thing yet.
2009-03-27 06:55:32 -07:00
Dan Nicholson