summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Dan Nicholson [Sun, 29 Mar 2009 15:55:18 +0000 (08:55 -0700)]
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.
Dan Nicholson [Sun, 29 Mar 2009 15:17:13 +0000 (08:17 -0700)]
xkbcomp: Include Xdefs.h for Atom in tokens.h
Dan Nicholson [Sun, 29 Mar 2009 15:15:27 +0000 (08:15 -0700)]
xkbcomp: Add missing includes for Bool in xkbpath
Dan Nicholson [Sun, 29 Mar 2009 15:11:25 +0000 (08:11 -0700)]
Add XKBlib resizing functions
These were originally in XKBMalloc.c.
Dan Nicholson [Sun, 29 Mar 2009 02:21:18 +0000 (19:21 -0700)]
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.
Dan Nicholson [Sun, 29 Mar 2009 02:00:13 +0000 (19:00 -0700)]
Copy XkbEnsureSafeMapName from xkbfile
Dan Nicholson [Sun, 29 Mar 2009 01:50:29 +0000 (18:50 -0700)]
xkbcomp: Remove listing sources
The xkbcomp listing APIs were only needed for the "xkblist" mode, which
won't be supported here.
Dan Nicholson [Sun, 29 Mar 2009 01:17:34 +0000 (18:17 -0700)]
malloc/misc/xkb: Coding style cleanup
Dan Nicholson [Sun, 29 Mar 2009 00:55:46 +0000 (17:55 -0700)]
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
Dan Nicholson [Sat, 28 Mar 2009 23:21:25 +0000 (16:21 -0700)]
geom: Coding-style cleanup
Dan Nicholson [Sat, 28 Mar 2009 23:08:46 +0000 (16:08 -0700)]
Add geometry Compute API from XKBlib
A small needed subset from libX11/src/xkb/XKBGeom.c.
Dan Nicholson [Sat, 28 Mar 2009 22:51:06 +0000 (15:51 -0700)]
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.
Dan Nicholson [Sat, 28 Mar 2009 22:32:51 +0000 (15:32 -0700)]
Add XkbModIndexText replacement
Now, I think we should have all the *Text functions we need.
Dan Nicholson [Sat, 28 Mar 2009 22:24:06 +0000 (15:24 -0700)]
Drop another unneeded format argument
Almost cleared of XkbMessage...
Dan Nicholson [Sat, 28 Mar 2009 22:12:30 +0000 (15:12 -0700)]
Add VMod Text functions from xkbfile
Dan Nicholson [Sat, 28 Mar 2009 19:39:21 +0000 (12:39 -0700)]
Copy XkbAddGeom* functions from XKBlib
These are needed by the geometry compiler in xkbcomp.
Dan Nicholson [Sat, 28 Mar 2009 19:03:35 +0000 (12:03 -0700)]
xkbcomp: s/XStringToKeysym/XkbcStringToKeysym/
Dan Nicholson [Sat, 28 Mar 2009 18:56:35 +0000 (11:56 -0700)]
Expose all the geometry allocation subroutines
We need a couple in xkbcomp, but they might also be needed externally,
too.
Dan Nicholson [Sat, 28 Mar 2009 18:45:05 +0000 (11:45 -0700)]
xkbcomp: Use xkbcommon allocation functions
s/XkbAlloc/XkbcAlloc/ so we don't know XKBlib.
Dan Nicholson [Sat, 28 Mar 2009 21:09:36 +0000 (14:09 -0700)]
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.
Dan Nicholson [Sat, 28 Mar 2009 21:06:26 +0000 (14:06 -0700)]
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.
Dan Nicholson [Sat, 28 Mar 2009 13:56:26 +0000 (06:56 -0700)]
xkbcomp: Drop unused Display argument in Atom functions
The xkbcommon Atom implementation doesn't take Display into account.
Dan Nicholson [Sat, 28 Mar 2009 13:32:08 +0000 (06:32 -0700)]
Move *Text APIs into libxkbcommon
These seem like they might be generally useful, and more will be needed
from xkbfile.
Dan Nicholson [Sat, 28 Mar 2009 03:58:27 +0000 (20:58 -0700)]
libxkbcomp: Use the internal Atom implementation
s/XkbInternAtom/XkbcInternAtom/ and s/XkbAtomGetString/XkbcAtomGetString/
Dan Nicholson [Sat, 28 Mar 2009 03:53:26 +0000 (20:53 -0700)]
libxkbcomp: s/Status/int/ since we don't have Xlib.h
Dan Nicholson [Sat, 28 Mar 2009 03:32:33 +0000 (20:32 -0700)]
libxkbcomp: Drop unused format field for *Text functions
Dan Nicholson [Sat, 28 Mar 2009 03:20:01 +0000 (20:20 -0700)]
libxkbcomp: Add non-xkbfile XkbActionTypeText
Dan Nicholson [Sat, 28 Mar 2009 03:13:22 +0000 (20:13 -0700)]
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.
Dan Nicholson [Sat, 28 Mar 2009 03:01:32 +0000 (20:01 -0700)]
libxkbcomp: s/XkbDescPtr/XkbcDescPtr/
We need to use the keyboard description structure from XKBcommon.h since
it doesn't have the Display field.
Dan Nicholson [Sat, 28 Mar 2009 02:54:50 +0000 (19:54 -0700)]
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.
Dan Nicholson [Sat, 28 Mar 2009 02:30:11 +0000 (19:30 -0700)]
libxkbcomp: Include X.h and Xdefs.h for Atom and Bool
Dan Nicholson [Sat, 28 Mar 2009 02:25:14 +0000 (19:25 -0700)]
libxkbcomp: Remove usage of client-side headers
This will surely break things. Let's see just what we need to replace.
Dan Nicholson [Sat, 28 Mar 2009 01:55:13 +0000 (18:55 -0700)]
xkbcomp: Add non-xkbfile XkbConfigText
Dan Nicholson [Sat, 28 Mar 2009 01:43:29 +0000 (18:43 -0700)]
Ignore files for xkbcomp
Dan Nicholson [Sat, 28 Mar 2009 01:43:12 +0000 (18:43 -0700)]
Ignore ks_tables.h in makekeys directory now
Dan Nicholson [Fri, 27 Mar 2009 13:55:32 +0000 (06:55 -0700)]
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.
Dan Nicholson [Thu, 26 Mar 2009 13:50:33 +0000 (06:50 -0700)]
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.
Dan Nicholson [Tue, 17 Mar 2009 13:19:56 +0000 (06:19 -0700)]
Use X extern "C" guards around function declarations for public header
Dan Nicholson [Thu, 26 Mar 2009 02:17:33 +0000 (19:17 -0700)]
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.
Dan Nicholson [Thu, 26 Mar 2009 02:00:49 +0000 (19:00 -0700)]
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
Dan Nicholson [Wed, 25 Mar 2009 22:41:21 +0000 (15:41 -0700)]
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.
Dan Nicholson [Fri, 6 Mar 2009 02:20:15 +0000 (18:20 -0800)]
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.
Dan Nicholson [Thu, 19 Mar 2009 23:57:01 +0000 (16:57 -0700)]
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
Dan Nicholson [Fri, 20 Mar 2009 00:16:13 +0000 (17:16 -0700)]
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.
Dan Nicholson [Thu, 19 Mar 2009 22:10:14 +0000 (15:10 -0700)]
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
Dan Nicholson [Fri, 6 Mar 2009 02:21:57 +0000 (18:21 -0800)]
Ignore generated ChangeLog
Dan Nicholson [Tue, 20 Jan 2009 15:33:14 +0000 (07:33 -0800)]
Use generated config.h header
Dan Nicholson [Sat, 24 Jan 2009 02:12:04 +0000 (18:12 -0800)]
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.
Dan Nicholson [Sat, 24 Jan 2009 02:09:31 +0000 (18:09 -0800)]
Use XORG_CWARNFLAGS for more warnings
Dan Nicholson [Sat, 24 Jan 2009 02:05:12 +0000 (18:05 -0800)]
makekeys: No need for strncat
Dan Nicholson [Fri, 23 Jan 2009 04:20:02 +0000 (20:20 -0800)]
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.
Dan Nicholson [Fri, 23 Jan 2009 04:18:33 +0000 (20:18 -0800)]
test: Consistently use upper case hex
Dan Nicholson [Fri, 23 Jan 2009 04:10:19 +0000 (20:10 -0800)]
test: Add convenience functions for xkey.sh
Dan Nicholson [Fri, 23 Jan 2009 03:59:24 +0000 (19:59 -0800)]
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.
Dan Nicholson [Fri, 23 Jan 2009 02:09:51 +0000 (18:09 -0800)]
makekeys: Always continue when no alias match found
Dan Nicholson [Fri, 23 Jan 2009 02:06:48 +0000 (18:06 -0800)]
makekeys: Handle aliases in convenience functions
There's no need to pass the alias buffer down.
Dan Nicholson [Fri, 23 Jan 2009 02:01:13 +0000 (18:01 -0800)]
makekeys: Prepend XF86 to XFree86 keysyms
Dan Nicholson [Thu, 22 Jan 2009 16:25:39 +0000 (08:25 -0800)]
Refactor makekeys with some convenience functions
All the nested ifs in the parsing code were confusing me.
Dan Nicholson [Thu, 22 Jan 2009 15:16:12 +0000 (07:16 -0800)]
Move makekeys to separate subdir
The build is a little cleaner when makekeys has its own Makefile.
Dan Nicholson [Wed, 21 Jan 2009 02:57:22 +0000 (18:57 -0800)]
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.
Dan Nicholson [Wed, 21 Jan 2009 02:52:04 +0000 (18:52 -0800)]
Fix CC_FOR_BUILD detection
Dan Nicholson [Thu, 19 Mar 2009 18:34:54 +0000 (11:34 -0700)]
keysym: 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.
Dan Nicholson [Tue, 20 Jan 2009 15:46:12 +0000 (07:46 -0800)]
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
Dan Nicholson [Fri, 16 Jan 2009 15:28:30 +0000 (07:28 -0800)]
makekeys: Handle XF86XK_ keysyms in addition to XK_ keysyms
Dan Nicholson [Thu, 15 Jan 2009 02:00:10 +0000 (18:00 -0800)]
Generate keysym tables from X and XF86 keysym definitions
The keysym hash table ks_tables.h is generated by makekeys from
keysymdef.h and XF86keysym.h.
Dan Nicholson [Thu, 15 Jan 2009 02:07:06 +0000 (18:07 -0800)]
ks_tables: Remove table-specific #ifdefs and add header guard
Since we'll be including ks_tables.h in a single file, we don't need to
make parts conditional. A header guard has been added just to be safe.
Dan Nicholson [Thu, 19 Mar 2009 17:59:32 +0000 (10:59 -0700)]
makekeys: Coding style cleanup
Mostly tab-to-space conversion, but a couple other nits, too.
Dan Nicholson [Wed, 14 Jan 2009 15:35:10 +0000 (07:35 -0800)]
Add makekeys for creating keysym hash tables
The makekeys utility is used to generate the keysym hash tables during
the build. We try to detect a build machine native compiler so the
tables can be generated when cross compiling.
Dan Nicholson [Wed, 14 Jan 2009 02:25:35 +0000 (18:25 -0800)]
Initial autotools commit