|
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
|
|
|
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
|
|
|
c4c9e36f
|
2009-03-28T18:50:29
|
|
xkbcomp: Remove listing sources
The xkbcomp listing APIs were only needed for the "xkblist" mode, which
won't be supported here.
|
|
|
fe94593d
|
2009-03-28T18:17:34
|
|
malloc/misc/xkb: Coding style cleanup
|
|
|
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
|
|
|
baa9581d
|
2009-03-28T16:21:25
|
|
geom: Coding-style cleanup
|
|
|
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.
|
|
|
a59ce8f5
|
2009-03-28T15:24:06
|
|
Drop another unneeded format argument
Almost cleared of XkbMessage...
|
|
|
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.
|
|
|
b0acc97a
|
2009-03-28T12:03:35
|
|
xkbcomp: s/XStringToKeysym/XkbcStringToKeysym/
|
|
|
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.
|
|
|
39d7be43
|
2009-03-28T11:45:05
|
|
xkbcomp: Use xkbcommon allocation functions
s/XkbAlloc/XkbcAlloc/ so we don't know XKBlib.
|
|
|
b9335d58
|
2009-03-28T14:09:36
|
|
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.
|
|
|
8544cde5
|
2009-03-28T06:56:26
|
|
xkbcomp: Drop unused Display argument in Atom functions
The xkbcommon Atom implementation doesn't take Display into account.
|
|
|
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.
|
|
|
18337008
|
2009-03-27T20:58:27
|
|
libxkbcomp: Use the internal Atom implementation
s/XkbInternAtom/XkbcInternAtom/ and s/XkbAtomGetString/XkbcAtomGetString/
|
|
|
c277d3d4
|
2009-03-27T20:53:26
|
|
libxkbcomp: s/Status/int/ since we don't have Xlib.h
|
|
|
d5a9be65
|
2009-03-27T20:32:33
|
|
libxkbcomp: Drop unused format field for *Text functions
|
|
|
6a578de9
|
2009-03-27T20:20:01
|
|
libxkbcomp: Add non-xkbfile XkbActionTypeText
|
|
|
4fe322aa
|
2009-03-27T20:13:22
|
|
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.
|
|
|
37769b5a
|
2009-03-27T20:01:32
|
|
libxkbcomp: s/XkbDescPtr/XkbcDescPtr/
We need to use the keyboard description structure from XKBcommon.h since
it doesn't have the Display field.
|
|
|
dd25bbc9
|
2009-03-27T19:54:50
|
|
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.
|
|
|
f3677538
|
2009-03-27T19:30:11
|
|
libxkbcomp: Include X.h and Xdefs.h for Atom and Bool
|
|
|
30e01032
|
2009-03-27T19:25:14
|
|
libxkbcomp: Remove usage of client-side headers
This will surely break things. Let's see just what we need to replace.
|
|
|
a3809b13
|
2009-03-27T18:55:13
|
|
xkbcomp: Add non-xkbfile XkbConfigText
|
|
|
f2308e7e
|
2009-03-27T18:43:29
|
|
Ignore files for xkbcomp
|
|
|
23caa60f
|
2009-03-27T18:43:12
|
|
Ignore ks_tables.h in makekeys directory now
|
|
|
0c1bbb05
|
2009-03-27T06:55:32
|
|
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.
|
|
|
f4d8e293
|
2009-03-26T06:50:33
|
|
Move ks_tables.h build into makekeys subdirectory
This avoids the BUILT_SOURCES weirdness and forcing the build into the
makekeys subdirectory. Added a new make variable KS_HEADERS that lists
all the keysym headers we're going to parse.
|
|
|
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
|
|
|
433a405c
|
2009-03-25T19:17:33
|
|
atom: Coding-style cleanup and refactor
Some coding style nits were cleaned up. Additionally, most of the
functions have been collapsed from the libxkbfile version where there's
distinction with the Xlib atom functions when Display was set. Finally,
the InitAtoms function tests whether the table has already been created
by testing the pointer rather than using a static int.
|
|
|
46faf56d
|
2009-03-25T15:41:21
|
|
alloc/galloc: Coding style cleanup
Mostly tab-to-space conversion plus a few style nits. Dropped the
register keywords as I'm pretty sure modern compilers can be trusted to
do the right thing.
|
|
|
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.
|
|
|
d4ddac2b
|
2009-03-19T15:10:14
|
|
Use XKB alloc macros internally
These are used throughout the XKB code, but are defined in XKBsrv.h,
which we'd like to avoid. Internal definitions for True/False have also
been added since they're in Xlib.h
|
|
|
a45cdf4b
|
2009-01-23T18:12:04
|
|
makekeys: Fix warning about not returning from function
If we've gotten through the for loop in the alias functions, then we
don't have a match.
|
|
|
6aa78ded
|
2009-03-05T18:21:57
|
|
Ignore generated ChangeLog
|
|
|
ffa0ccfa
|
2009-01-23T18:09:31
|
|
Use XORG_CWARNFLAGS for more warnings
|
|
|
036c23ea
|
2009-01-20T07:33:14
|
|
Use generated config.h header
|
|
|
d60166b5
|
2009-01-23T18:05:12
|
|
makekeys: No need for strncat
|
|
|
49a06f92
|
2009-01-22T20:10:19
|
|
test: Add convenience functions for xkey.sh
|
|
|
ba0b312a
|
2009-01-22T20:20:02
|
|
test: Add tests for XFree86 special keys
Since the XFree86 special keysyms contain an underscore after the XF86
prefix, check to make sure they're handled correctly.
|
|
|
c005d63c
|
2009-01-22T18:09:51
|
|
makekeys: Always continue when no alias match found
|
|
|
e8c7f685
|
2009-01-22T19:59:24
|
|
makekeys: Handle XFree86 special action keys
For some reason, there are a set of keys that have an underscore after
the XF86 prefix when Xlib gets them from XKeysymDB.
|
|
|
176b9cf5
|
2009-01-22T20:18:33
|
|
test: Consistently use upper case hex
|
|
|
d0a4291e
|
2009-01-16T07:28:30
|
|
makekeys: Handle XF86XK_ keysyms in addition to XK_ keysyms
|
|
|
b2737e9b
|
2009-01-20T18:57:22
|
|
Testing harness for keysym functions
A test program and script have been added for checking the XkbCommon
keysym functions. This has already highlighted an error in handling of
keysyms from XF86keysym.h.
|
|
|
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
|