Daniel Stone [Mon, 20 Feb 2012 14:15:08 +0000 (14:15 +0000)]
Remove priv arguments from ExprResolveString
They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Mon, 20 Feb 2012 14:10:41 +0000 (14:10 +0000)]
Remove priv arguments from ExprResolveKeySym
They've never been used by its one caller.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Mon, 20 Feb 2012 14:08:55 +0000 (14:08 +0000)]
Remove priv arguments from ExprResolveKeyName
They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Mon, 20 Feb 2012 13:44:27 +0000 (13:44 +0000)]
Remove priv arguments from ExprResolveBoolean
They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Mon, 20 Feb 2012 13:40:34 +0000 (13:40 +0000)]
Remove priv arguments from ExprResolveFloat
They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Mon, 20 Feb 2012 13:34:36 +0000 (13:34 +0000)]
Remove priv arguments from ExprResolveModMask
What with them now being unused and all.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Mon, 20 Feb 2012 13:32:09 +0000 (13:32 +0000)]
Introduce ExprResolveVModMask
Which is just a slightly more typesafe wrapper around the chained
ExprResolveModMask everyone was using earlier.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Thu, 16 Feb 2012 11:18:49 +0000 (11:18 +0000)]
Respect explicit minimum/maximum keycodes
Make sure we carry over an explicit minimum/maximum keycode setting,
rather than just using the computed minimum/maximum; this got broken
while changing the keycode range to be unsigned.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Pekka Paalanen <ppaalanen@gmail.com>
Daniel Stone [Thu, 16 Feb 2012 00:22:11 +0000 (00:22 +0000)]
Still more memory leak fixes
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 15 Feb 2012 19:39:33 +0000 (19:39 +0000)]
Fix xkbparse.y compilation
Thanks to autotools happily building stale generated sources, I hadn't
actually ever built my xkbparse.y changes. Fix that so it not only
compiles, but works. This seems to parse long keycodes correctly,
although I very much would not recommend testing this by declaring
0x1fffffff as your highest keycode.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 15 Feb 2012 16:42:45 +0000 (16:42 +0000)]
Don't leak SymbolsInfo
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 15 Feb 2012 16:37:31 +0000 (16:37 +0000)]
tests: Free returned XKB map
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 15 Feb 2012 16:24:07 +0000 (16:24 +0000)]
Enable stderr debugging by default
(If debugFlags is set to non-zero.)
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 15 Feb 2012 16:23:47 +0000 (16:23 +0000)]
Raise keycode range to 32 bits
\o/
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 15 Feb 2012 15:58:14 +0000 (15:58 +0000)]
vmod: Pass xkb_desc explicitly to vmod functions
Some error paths don't set info->xkb correctly, so just do like most
utility functions and pass the xkb_desc explicitly.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 15 Feb 2012 14:34:08 +0000 (14:34 +0000)]
Introduce xkb_keycode_t for keycodes
And use it consistently everywhere, including with a special long-safe
internal keycode type, to ease the transition to large keycodes.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 15 Feb 2012 12:54:11 +0000 (12:54 +0000)]
xkbscan: Copy, rather than assign, file name
For some reason, lex decided to reduce a strcpy into an assignment,
leading to entirely justified valgrind warnings about invalid reads,
when scanFile was set to a string which may have only ever lived on the
stack of a now-exited function.
Make it a strdup() instead.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Wed, 15 Feb 2012 11:49:10 +0000 (11:49 +0000)]
Move include path from X11/extensions/ to xkbcommon/
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Rob Bradford [Thu, 5 Jan 2012 14:20:35 +0000 (14:20 +0000)]
xkbcomp: Silence warning of return of uninitialised value
Some routes through HandleGeometryVar do not set a return value. Set a default
value for the return variable to avoid returning an uninitialised value.
Pekka Paalanen [Fri, 16 Dec 2011 12:52:00 +0000 (12:52 +0000)]
Add xkbc_free_keymap helper
Which just calls XkbcFreeKeyboard with the only arguments you'd ever
pass it.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Rob Bradford [Thu, 27 Oct 2011 13:30:21 +0000 (14:30 +0100)]
xkbcomp: Copy the string into the buffer rather than updating pointer
Avoids assigning the global pointer to a value that may only have a stack
lifetime:
Fixes valgrind warnings such as:
==24795== Invalid read of size 1
==24795== at 0x4A06E9A: strcpy (mc_replace_strmem.c:311)
==24795== by 0x4E54D68: ProcessIncludeFile (misc.c:73)
==24795== by 0x4E59726: HandleIncludeSymbols.constprop.3 (symbols.c:829)
==24795== by 0x4E59D8E: HandleSymbolsFile (symbols.c:1673)
==24795== by 0x4E5A068: CompileSymbols (symbols.c:2211)
==24795== by 0x4E51A61: CompileKeymap (keymap.c:155)
==24795== by 0x4E5B410: xkb_compile_keymap_from_components (xkbcomp.c:236)
==24795== by 0x4E5B587: xkb_compile_keymap_from_rules (xkbcomp.c:161)
==24795== by 0x405ED2: display_create (window.c:2007)
==24795== by 0x403732: main (desktop-shell.c:320)
==24795== Address 0x7fefff0a0 is just below the stack ptr. To suppress, use:
--workaround-gcc296-bugs=yes
==24795==
==24795== Source and destination overlap in strcpy(0x7fefff430, 0x7fefff430)
==24795== at 0x4A06F3D: strcpy (mc_replace_strmem.c:311)
==24795== by 0x4E54D68: ProcessIncludeFile (misc.c:73)
==24795== by 0x4E59726: HandleIncludeSymbols.constprop.3 (symbols.c:829)
==24795== by 0x4E59D8E: HandleSymbolsFile (symbols.c:1673)
==24795== by 0x4E5A068: CompileSymbols (symbols.c:2211)
==24795== by 0x4E51A61: CompileKeymap (keymap.c:155)
==24795== by 0x4E5B410: xkb_compile_keymap_from_components (xkbcomp.c:236)
==24795== by 0x4E5B587: xkb_compile_keymap_from_rules (xkbcomp.c:161)
==24795== by 0x405ED2: display_create (window.c:2007)
==24795== by 0x403732: main (desktop-shell.c:320)
Cyril Brulebois [Fri, 3 Jun 2011 15:19:09 +0000 (17:19 +0200)]
Add prototype for CheckDefaultMap().
Those warnings disappear accordingly:
| CC parseutils.lo
| parseutils.c:742: warning: no previous prototype for ‘CheckDefaultMap’
| CC xkbscan.lo
| xkbscan.l: In function ‘XKBParseString’:
| xkbscan.l:220: warning: implicit declaration of function ‘CheckDefaultMap’
| xkbscan.l:220: warning: nested extern declaration of ‘CheckDefaultMap’
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Kristian Høgsberg [Mon, 4 Apr 2011 13:21:55 +0000 (09:21 -0400)]
Also update required kbproto version in .pc.in file
Kristian Høgsberg [Fri, 18 Mar 2011 04:33:48 +0000 (00:33 -0400)]
configure: Lower kbproto requirement to 1.0.4
There's nothing in 1.0.5 that we need.
Kristian Høgsberg [Sat, 29 Jan 2011 19:06:39 +0000 (14:06 -0500)]
Revert "config: remove incorrectly implemented visibility compiler option"
This reverts commit
bf9fdceef63507da889a22eb1a583d2b6376f5ea.
We really only want to expose symbols that we explicitly mark as part of
the API. This may not work with other platforms or compilers, but the
fact that private symbols are not available on Linux+GCC is enough of an
incentive to not use those.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Cyril Brulebois [Sat, 29 Jan 2011 13:24:46 +0000 (14:24 +0100)]
Get rid of unneeded <X11/Xlib.h> include.
There's no need for this xlib include:
| YACC xkbparse.c
| CC xkbparse.lo
| xkbparse.y:98:22: error: X11/Xlib.h: No such file or directory
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Kristian Høgsberg [Sat, 18 Dec 2010 02:14:54 +0000 (21:14 -0500)]
Rename XkbcInternAtom() to xkb_intern_atom() and export
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Gaetan Nadon [Sun, 12 Dec 2010 00:25:09 +0000 (19:25 -0500)]
config: update COPYING for software licensing
The Copyright statements must appear in full.
When only the year was different, I added it in an existing
Copyright statement.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Sat, 11 Dec 2010 23:56:21 +0000 (18:56 -0500)]
config: set the default xkb config root based on xkeyboard-config module
The default value ${dataroot}/X11/xkb only works if xkeyboard-config
has created the keymaps in that directory. Let's obtain the true final
value of where the keymaps are and use that as a default. In a production
environment this is the only value that can work.
This new default value also has the merit of making the 'check' target
to work in distcheck which does not have a copy of the xkeyboard-config
keymaps in its sandbox based on ${dataroot}/X11/xkb. The test data
cannot find the "include" keymaps it needs.
.../libxkbcommon-0.1.0/_inst/share/X11/xkb
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Fri, 10 Dec 2010 00:51:41 +0000 (19:51 -0500)]
config: distribute the .sh test programs and test data
The test programs and the test data are required in the tarball
and needed for distcheck.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Fri, 10 Dec 2010 00:45:26 +0000 (19:45 -0500)]
config: make it easier to add TEST programs
LDADD is a Makefile wide variable.
Automake matches prog name with .c file by default
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Thu, 9 Dec 2010 23:25:18 +0000 (18:25 -0500)]
config: include: use nobase_include_HEADERS
Slightly simpler.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Thu, 9 Dec 2010 21:28:52 +0000 (16:28 -0500)]
config: add keysymdef and xf86keysym as dependencies of ks_tables.h
This would cover the scenario where these headers file are updated,
for example, a new version is installed. Running 'make' again
on libxkbcommon should rebuild ks_tables.h.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Thu, 9 Dec 2010 21:22:17 +0000 (16:22 -0500)]
config: makekeys prog should stand alone in the makekeys directory
This program is a utility to generated a header file.
The header file it generates should not be located in the
directory where this utility program is compiled.
Move the /makekeys dir as a sibling of /src.
This reduces the number of bi-directional relationships
between directories.
Make corresponding makefiles simplifications.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Thu, 9 Dec 2010 02:20:46 +0000 (21:20 -0500)]
config: use existing variables KEYSYMDEF_H and XF86KEYSYM_H
These automake variables are not currently used.
The variable KS_HEADERS is not required anymore.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Thu, 9 Dec 2010 01:37:26 +0000 (20:37 -0500)]
config: remove incorrectly implemented visibility compiler option
CFLAGS is a user variable which should never be set by the configuration.
It allows the user to alter the configuration compiler options.
The visibility is only set for GNU compiler, leaving libraries built
with other compilers with the wrong visibility.
All other xorg libraries set visibilty using _X_EXPORT or _X_HIDDEN.
For the time being, all the symbols will have the default visibility
which does not break anything.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Tue, 7 Dec 2010 23:22:38 +0000 (18:22 -0500)]
config: use xproto pkgconfig includex11dir variable
Rather than appending X11 to the include dir.
It should be safe to use as it has been added in 2005.
Use a local variable name matching the pkgconfig name.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Tue, 7 Dec 2010 23:17:29 +0000 (18:17 -0500)]
config: relocate library functions check and comment
No functional changes.
Follow Automake suggested order.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Tue, 7 Dec 2010 19:32:57 +0000 (14:32 -0500)]
config: remove PKG_PROG_PKG_CONFIG test
If pkg-config is missing, the configuration fails while initializing
XORG_* macros:
warning: PKG_PROG_PKG_CONFIG is m4_require'd but not m4_defun'd
line 11622: PKG_PROG_PKG_CONFIG: command not found
The output is sufficient to locate the problem.
It is not possible, or very difficult, to not have pkg-config
installed as the whole desktop and countless other software
depends on it.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Tue, 7 Dec 2010 16:09:13 +0000 (11:09 -0500)]
config: let Automake handle Lex and Yacc dist and cleaning
BUILT_SOURCES and MAINTAINERCLEAN are not needed for lex and yacc
Note that xkbscan was missing on those lines.
Automake generates all the rules to handle building, distribution
and cleaning.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Tue, 7 Dec 2010 15:59:13 +0000 (10:59 -0500)]
config: allow to build tarball when yacc is missing
Autoconf does not handle this scenario as well as Automake does.
If xkbparse.c is already there, do not abort the configuration
if yacc is missing as it is not needed.
If both xkbparse.c and yacc are missing, abort configuration.
Yacc is a required tool to build the package.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Tue, 7 Dec 2010 15:42:21 +0000 (10:42 -0500)]
config: add the default README file.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Tue, 7 Dec 2010 15:39:16 +0000 (10:39 -0500)]
config: add the INSTALL target for installation instructions
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Tue, 7 Dec 2010 15:33:23 +0000 (10:33 -0500)]
config: replace deprecated INCLUDES with AM_CPPFLAGS
Fixes automake warning.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Tue, 7 Dec 2010 15:23:18 +0000 (10:23 -0500)]
config: update subdirs .gitignore
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Fri, 3 Dec 2010 20:13:01 +0000 (15:13 -0500)]
config: remove m4/.gitignore now that toplevel one handles it all
The -Im4 in Makefile.am will have to wait until the day
there is an m4 macro checked-in git in the m4 directory.
This does not prevent libtool to install its macros in m4.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Fri, 3 Dec 2010 19:50:14 +0000 (14:50 -0500)]
config: .gitignore: template with default values for components #24239
This toplevel .gitignore covers all possible generated files
from autotools, compiler, linker, etc...
It has been in use for over a year in all xorg modules and has
prevented a good number of patches.
For example, in this module, src/stamp-h1 was not ignored even
if the .gitignore had just been updated. Files with a .patch
extension were not ignored which sometimes cause a patch to be
checked-in git accidentally.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Fri, 3 Dec 2010 19:39:13 +0000 (14:39 -0500)]
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Fri, 3 Dec 2010 01:52:34 +0000 (20:52 -0500)]
config: initialize autoconf, automake and libtool
Add missing AM_MAINTAINER_MODE, matching --enable-maintainer-mode
option in autogen.sh.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Fri, 3 Dec 2010 01:42:34 +0000 (20:42 -0500)]
config: use XORG_DEFAULT_OPTION from util-macros version 1.8
This will handle AM_SILENT_RULES such that it will not break
on earlier Autoconf versions.
It provides a host of other configuration items
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon [Fri, 3 Dec 2010 01:35:35 +0000 (20:35 -0500)]
config: set Autoconf minimum version required to 2.60
This is the current minimum version required for all X.Org modules.
The module can be configured with any higher version.
Autoconf features from version > 2.60 cannot be used.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Jan Engelhardt [Thu, 11 Nov 2010 22:28:29 +0000 (23:28 +0100)]
Update .gitignore
Limit exclusion of files to their respective directory
that they can appear in.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Jan Engelhardt [Thu, 11 Nov 2010 22:27:21 +0000 (23:27 +0100)]
xkbscan: resolve build warning/rpmlint error
xkbscan.l: In function 'setScanState':
xkbscan.l:201:1: warning: control reaches end of non-void function
I: Program returns random data in a function
E: libxkbcommon no-return-in-nonvoid-function xkbscan.l:201
Change return type of setScanState to void, since a return value is
never used by its callers.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Jan Engelhardt [Thu, 11 Nov 2010 22:05:33 +0000 (23:05 +0100)]
build: run autoupdate
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Jan Engelhardt [Thu, 11 Nov 2010 22:03:43 +0000 (23:03 +0100)]
build: use proper quoting in autogen.sh
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Jan Engelhardt [Thu, 11 Nov 2010 22:02:11 +0000 (23:02 +0100)]
build: use AC_CONFIG_MACRO_DIR as per libtoolize warning
libtoolize: Consider adding "AC_CONFIG_MACRO_DIR([m4])" to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding "-I m4" to ACLOCAL_AMFLAGS in Makefile.am.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Jon TURNEY [Tue, 26 Oct 2010 15:21:28 +0000 (16:21 +0100)]
Link with -no-undefined
Use -no-undefined to assure libtool that the libxkbcommon library has
no unresolved symbols at link time, so that libtool will build a shared
library on platforms require that all symbols are resolved when the
library is linked.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Kristian Høgsberg [Fri, 22 Oct 2010 01:34:41 +0000 (21:34 -0400)]
Don't check for xlib, we don't need it
Kristian Høgsberg [Thu, 21 Oct 2010 02:27:07 +0000 (22:27 -0400)]
Update xkb->ctrls->num_groups when copying the keysyms
This used to be set when we read an XKM file.
Kristian Høgsberg [Wed, 20 Oct 2010 19:57:45 +0000 (15:57 -0400)]
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...
Kristian Høgsberg [Wed, 20 Oct 2010 01:57:59 +0000 (21:57 -0400)]
Use flex for generating the scanner, add support for parsing from strings
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Kristian Høgsberg [Tue, 19 Oct 2010 19:16:50 +0000 (15:16 -0400)]
Add struct xkb_state
Kristian Høgsberg [Fri, 8 Oct 2010 19:33:18 +0000 (15:33 -0400)]
Don't return a static buffer in public API
Kristian Høgsberg [Fri, 8 Oct 2010 19:07:44 +0000 (15:07 -0400)]
Pull in XKB_COMMON_* version of modifier masks
This way we can use libxkbcommon without having to include X.h.
Adam Jackson [Mon, 27 Sep 2010 20:05:52 +0000 (16:05 -0400)]
Dead code removal and static markup
Signed-off-by: Adam Jackson <ajax@redhat.com>
Kristian Høgsberg [Sat, 4 Sep 2010 00:35:28 +0000 (20:35 -0400)]
Remove libxkbfile dependency for real this time
Kristian Høgsberg [Mon, 30 Aug 2010 01:30:10 +0000 (21:30 -0400)]
Use const char * in struct xkb_rule_names
Kristian Høgsberg [Wed, 25 Aug 2010 18:51:52 +0000 (14:51 -0400)]
Pull in a few #defines from libxkbfile and lower kbproto requirement
Kristian Høgsberg [Fri, 2 Jul 2010 19:05:21 +0000 (15:05 -0400)]
Drop Bool type
It's a nightmare trying to avoid double definitions.
Kristian Høgsberg [Fri, 2 Jul 2010 16:26:43 +0000 (12:26 -0400)]
Get rid of a few unused #defines in public header
Kristian Høgsberg [Fri, 2 Jul 2010 16:14:03 +0000 (12:14 -0400)]
Rename XkbRMLVOSet to struct xkb_rule_names
Kristian Høgsberg [Fri, 2 Jul 2010 16:10:05 +0000 (12:10 -0400)]
Move private structs and defines to private headers
Kristian Høgsberg [Fri, 2 Jul 2010 15:50:01 +0000 (11:50 -0400)]
Rename public entry points to lowercase and underscore
Kristian Høgsberg [Fri, 2 Jul 2010 15:43:56 +0000 (11:43 -0400)]
Compile with -fvisibility=hidden when possible
Kristian Høgsberg [Thu, 1 Jul 2010 18:35:24 +0000 (14:35 -0400)]
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.
Kristian Høgsberg [Wed, 30 Jun 2010 21:32:54 +0000 (17:32 -0400)]
Drop Xmd.h include now that we're using uint32_t
Kristian Høgsberg [Wed, 30 Jun 2010 21:31:34 +0000 (17:31 -0400)]
Fix warning from CARD32 -> uint32_t conversion
Kristian Høgsberg [Wed, 30 Jun 2010 21:20:56 +0000 (17:20 -0400)]
Constify XkbcAtomText()
Atoms aren't mutable and this lets us put tbGetBuffer() back in the box.
Kristian Høgsberg [Wed, 30 Jun 2010 21:13:21 +0000 (17:13 -0400)]
Make XkbcInitAtoms() call optional
Kristian Høgsberg [Wed, 30 Jun 2010 20:56:24 +0000 (16:56 -0400)]
Drop more malloc/free wrappers
Kristian Høgsberg [Wed, 30 Jun 2010 20:33:25 +0000 (16:33 -0400)]
Use the right action structs
We were casting the union members to the wrong action structs (from kbproto).
Kristian Høgsberg [Wed, 30 Jun 2010 19:48:39 +0000 (15:48 -0400)]
Copy over missing action structs from kbproto
Kristian Høgsberg [Wed, 30 Jun 2010 17:31:21 +0000 (13:31 -0400)]
Rename Xkbc*Action to struct xkb_*_action
Kristian Høgsberg [Mon, 28 Jun 2010 10:58:01 +0000 (06:58 -0400)]
Drop malloc wrappers
Kristian Høgsberg [Mon, 28 Jun 2010 10:50:12 +0000 (06:50 -0400)]
Drop CARD32 and Opaque types
Daniel Stone [Wed, 23 Jun 2010 15:25:10 +0000 (16:25 +0100)]
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>
Daniel Stone [Wed, 23 Jun 2010 15:25:02 +0000 (16:25 +0100)]
fix mod size confusion
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 22 Jun 2010 14:54:52 +0000 (15:54 +0100)]
Add really rudimentary rules caching support
Keep the parsed form of the last-used rules file around, and reuse that
if we get asked for the same ruleset. If not, bin it and cache the
other one.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Mon, 21 Jun 2010 13:28:34 +0000 (14:28 +0100)]
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>
Daniel Stone [Mon, 21 Jun 2010 13:27:58 +0000 (14:27 +0100)]
Interp: More lazy keysym resolution
Resolve the keysyms when we create an InterpDef, rather than directly
in the parser.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Mon, 21 Jun 2010 13:22:26 +0000 (14:22 +0100)]
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>
Daniel Stone [Thu, 17 Jun 2010 04:56:08 +0000 (05:56 +0100)]
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>
Daniel Stone [Thu, 17 Jun 2010 02:16:09 +0000 (03:16 +0100)]
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>
Daniel Stone [Wed, 16 Jun 2010 23:51:49 +0000 (00:51 +0100)]
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>
Daniel Stone [Tue, 15 Jun 2010 18:43:14 +0000 (19:43 +0100)]
xkbcomp: Don't malloc() and free() most scanned tokens
Use a constant buffer instead. Sigh.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 15 Jun 2010 18:40:31 +0000 (19:40 +0100)]
Fix compilation with DEBUG
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 15 Jun 2010 18:39:15 +0000 (19:39 +0100)]
xkbcomp: Use fread() instead of getc()
So, it turns out that if you're parsing a fairly large amount of data,
using getc() to get all the input rather than, say, read(), is some kind
of remarkably daft and unperformant idea.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 15 Jun 2010 18:38:16 +0000 (19:38 +0100)]
xkbcomp: Lazy keysym parsing (avoid XStringToKeysym)
Instead of calling XStringToKeysym on every keysym we parse, store it as
a string until we need to store it in an actual keymap.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 15 Jun 2010 18:30:30 +0000 (19:30 +0100)]
Atoms: Avoid allocations in XkbAtomText()
XkbAtomGetString() returns a freshly-allocated string, whereas
XkbAtomText() returns the same in a temporary buffer. XkbAtomText used
to call XkbAtomGetString() and then free the result, which seems quite
spectacularly pointless when you think about it. Shuffle the atom code
around so we don't have to allocate for XkbAtomText().
This changes semantics slightly wrt non-printable characters, but I
haven't been able to see any effect so far. And it may well be ever so
slightly quicker.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone [Tue, 15 Jun 2010 15:43:10 +0000 (16:43 +0100)]
configure.ac: Enable automake silent rules by default
This allows us to spot warnings much more easily. Also, drop the
now-deprecated AM_MAINTAINER_MODE.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>