chromiumos/third_party/libxkbcommon.git
3 years agoAdd prototype for CheckDefaultMap(). master
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>
3 years agoAlso update required kbproto version in .pc.in file
Kristian Høgsberg [Mon, 4 Apr 2011 13:21:55 +0000 (09:21 -0400)]
Also update required kbproto version in .pc.in file

3 years agoconfigure: Lower kbproto requirement to 1.0.4
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.

3 years agoRevert "config: remove incorrectly implemented visibility compiler option"
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>
3 years agoGet rid of unneeded <X11/Xlib.h> include.
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>
3 years agoRename XkbcInternAtom() to xkb_intern_atom() and export
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>
3 years agoconfig: update COPYING for software licensing
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>
3 years agoconfig: set the default xkb config root based on xkeyboard-config module
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>
3 years agoconfig: distribute the .sh test programs and test data
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>
3 years agoconfig: make it easier to add TEST programs
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>
3 years agoconfig: include: use nobase_include_HEADERS
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>
3 years agoconfig: add keysymdef and xf86keysym as dependencies of ks_tables.h
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>
3 years agoconfig: makekeys prog should stand alone in the makekeys directory
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>
3 years agoconfig: use existing variables KEYSYMDEF_H and XF86KEYSYM_H
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>
3 years agoconfig: remove incorrectly implemented visibility compiler option
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>
3 years agoconfig: use xproto pkgconfig includex11dir variable
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>
3 years agoconfig: relocate library functions check and comment
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>
3 years agoconfig: remove PKG_PROG_PKG_CONFIG test
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>
3 years agoconfig: let Automake handle Lex and Yacc dist and cleaning
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>
3 years agoconfig: allow to build tarball when yacc is missing
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>
3 years agoconfig: add the default README file.
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>
3 years agoconfig: add the INSTALL target for installation instructions
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>
3 years agoconfig: replace deprecated INCLUDES with AM_CPPFLAGS
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>
3 years agoconfig: update subdirs .gitignore
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>
3 years agoconfig: remove m4/.gitignore now that toplevel one handles it all
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>
3 years agoconfig: .gitignore: template with default values for components #24239
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>
3 years agoconfig: remove AC_PROG_CC as it overrides AC_PROG_C_C99
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>
3 years agoconfig: initialize autoconf, automake and libtool
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>
3 years agoconfig: use XORG_DEFAULT_OPTION from util-macros version 1.8
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>
3 years agoconfig: set Autoconf minimum version required to 2.60
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>
3 years agoUpdate .gitignore
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>
3 years agoxkbscan: resolve build warning/rpmlint error
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>
3 years agobuild: run autoupdate
Jan Engelhardt [Thu, 11 Nov 2010 22:05:33 +0000 (23:05 +0100)]
build: run autoupdate

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
3 years agobuild: use proper quoting in autogen.sh
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>
3 years agobuild: use AC_CONFIG_MACRO_DIR as per libtoolize warning
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>
3 years agoLink with -no-undefined
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>
3 years agoDon't check for xlib, we don't need it
Kristian Høgsberg [Fri, 22 Oct 2010 01:34:41 +0000 (21:34 -0400)]
Don't check for xlib, we don't need it

3 years agoUpdate xkb->ctrls->num_groups when copying the keysyms
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.

3 years agoRestore compatible action structs
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...

3 years agoUse flex for generating the scanner, add support for parsing from strings
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>
3 years agoAdd struct xkb_state
Kristian Høgsberg [Tue, 19 Oct 2010 19:16:50 +0000 (15:16 -0400)]
Add struct xkb_state

3 years agoDon't return a static buffer in public API
Kristian Høgsberg [Fri, 8 Oct 2010 19:33:18 +0000 (15:33 -0400)]
Don't return a static buffer in public API

3 years agoPull in XKB_COMMON_* version of modifier masks
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.

3 years agoDead code removal and static markup
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>
3 years agoRemove libxkbfile dependency for real this time
Kristian Høgsberg [Sat, 4 Sep 2010 00:35:28 +0000 (20:35 -0400)]
Remove libxkbfile dependency for real this time

3 years agoUse const char * in struct xkb_rule_names
Kristian Høgsberg [Mon, 30 Aug 2010 01:30:10 +0000 (21:30 -0400)]
Use const char * in struct xkb_rule_names

3 years agoPull in a few #defines from libxkbfile and lower kbproto requirement
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

4 years agoDrop Bool type
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.

4 years agoGet rid of a few unused #defines in public header
Kristian Høgsberg [Fri, 2 Jul 2010 16:26:43 +0000 (12:26 -0400)]
Get rid of a few unused #defines in public header

4 years agoRename XkbRMLVOSet to struct xkb_rule_names
Kristian Høgsberg [Fri, 2 Jul 2010 16:14:03 +0000 (12:14 -0400)]
Rename XkbRMLVOSet to struct xkb_rule_names

4 years agoMove private structs and defines to private headers
Kristian Høgsberg [Fri, 2 Jul 2010 16:10:05 +0000 (12:10 -0400)]
Move private structs and defines to private headers

4 years agoRename public entry points to lowercase and underscore
Kristian Høgsberg [Fri, 2 Jul 2010 15:50:01 +0000 (11:50 -0400)]
Rename public entry points to lowercase and underscore

4 years agoCompile with -fvisibility=hidden when possible
Kristian Høgsberg [Fri, 2 Jul 2010 15:43:56 +0000 (11:43 -0400)]
Compile with -fvisibility=hidden when possible

4 years agoPull in enough structs and defines from XKBstr.h to only need XKB.h
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.

4 years agoDrop Xmd.h include now that we're using uint32_t
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

4 years agoFix warning from CARD32 -> uint32_t conversion
Kristian Høgsberg [Wed, 30 Jun 2010 21:31:34 +0000 (17:31 -0400)]
Fix warning from CARD32 -> uint32_t conversion

4 years agoConstify XkbcAtomText()
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.

4 years agoMake XkbcInitAtoms() call optional
Kristian Høgsberg [Wed, 30 Jun 2010 21:13:21 +0000 (17:13 -0400)]
Make XkbcInitAtoms() call optional

4 years agoDrop more malloc/free wrappers
Kristian Høgsberg [Wed, 30 Jun 2010 20:56:24 +0000 (16:56 -0400)]
Drop more malloc/free wrappers

4 years agoUse the right action structs
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).

4 years agoCopy over missing 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

4 years agoRename Xkbc*Action to struct xkb_*_action
Kristian Høgsberg [Wed, 30 Jun 2010 17:31:21 +0000 (13:31 -0400)]
Rename Xkbc*Action to struct xkb_*_action

4 years agoDrop malloc wrappers
Kristian Høgsberg [Mon, 28 Jun 2010 10:58:01 +0000 (06:58 -0400)]
Drop malloc wrappers

4 years agoDrop CARD32 and Opaque types
Kristian Høgsberg [Mon, 28 Jun 2010 10:50:12 +0000 (06:50 -0400)]
Drop CARD32 and Opaque types

4 years agoCopy and duplicate XkbModsRec and XkbKTMapEntryRec
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>
4 years agofix mod size confusion
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>
4 years agoAdd really rudimentary rules caching support
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>
4 years agoUse CARD32 instead of Atom, move geom headers in
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>
4 years agoInterp: More lazy keysym resolution
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>
4 years agoAllow external atom databases
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>
4 years agoCopy in XkbCompatMapRec and XkbSymInterpretRec
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>
4 years agoUse CARD32 instead of Atom, drag in XkbClientMapRec
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>
4 years agoRegroup actions into current vs. deprecated, resize vmod
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>
4 years agoxkbcomp: Don't malloc() and free() most scanned tokens
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>
4 years agoFix compilation with DEBUG
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>
4 years agoxkbcomp: Use fread() instead of getc()
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>
4 years agoxkbcomp: Lazy keysym parsing (avoid XStringToKeysym)
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>
4 years agoAtoms: Avoid allocations in XkbAtomText()
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>
4 years agoconfigure.ac: Enable automake silent rules by default
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>
4 years agoExpose tbGetBuffer to the rest of libxkbcommon
Daniel Stone [Tue, 15 Jun 2010 15:42:06 +0000 (16:42 +0100)]
Expose tbGetBuffer to the rest of libxkbcommon

This will let us implement XkbAtomGetString on top of XkbAtomText,
instead of having the latter get a duplicated string, dump it into a
temporary buffer, and subsequently free it (sigh).

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoxkbcomp: keycodes: Silence gcc warnings
Daniel Stone [Tue, 15 Jun 2010 15:41:10 +0000 (16:41 +0100)]
xkbcomp: keycodes: Silence gcc warnings

It was right to warn us: some of these were actually bogus.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoxkbcomp: geometry: Plug numerous atom text & expr leaks
Daniel Stone [Tue, 15 Jun 2010 14:27:12 +0000 (15:27 +0100)]
xkbcomp: geometry: Plug numerous atom text & expr leaks

This code is absolute misery.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoxkbcomp: Atom text and expr leak fixes part #973
Daniel Stone [Tue, 15 Jun 2010 14:25:40 +0000 (15:25 +0100)]
xkbcomp: Atom text and expr leak fixes part #973

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoxkbcomp: Don't leak atom text and string exprs, again
Daniel Stone [Tue, 15 Jun 2010 14:23:23 +0000 (15:23 +0100)]
xkbcomp: Don't leak atom text and string exprs, again

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoxkbcomp: expr: Use XkbcAtomText instead of GetString
Daniel Stone [Tue, 15 Jun 2010 14:22:05 +0000 (15:22 +0100)]
xkbcomp: expr: Use XkbcAtomText instead of GetString

This returns us a temporary string, rather than leaking the atom.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoxkbcomp: Don't leak atom text and string exprs
Daniel Stone [Tue, 15 Jun 2010 14:20:32 +0000 (15:20 +0100)]
xkbcomp: Don't leak atom text and string exprs

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoxkbcomp: vmod: Don't get and immediately intern atoms
Daniel Stone [Tue, 15 Jun 2010 14:14:58 +0000 (15:14 +0100)]
xkbcomp: vmod: Don't get and immediately intern atoms

XkbcInternAtom(XkbcAtomGetString(atom)) has to be the most spectacularly
broken antipattern I've yet seen.  Just compare the atoms directly.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoxkbcomp: Replace open-coded strdup
Daniel Stone [Tue, 15 Jun 2010 14:13:56 +0000 (15:13 +0100)]
xkbcomp: Replace open-coded strdup

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoAdd testcase for XkbcCanonicaliseComponents
Daniel Stone [Sat, 25 Apr 2009 08:15:02 +0000 (18:15 +1000)]
Add testcase for XkbcCanonicaliseComponents

Should be reasonably thorough; the shell part is, however, quite
unpleasant.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoAdd XkbcCanonicaliseComponents
Daniel Stone [Sat, 25 Apr 2009 08:13:52 +0000 (18:13 +1000)]
Add XkbcCanonicaliseComponents

Canonicalises two sets of components (new and old), e.g.:
new: +bar
old: foo
result: foo+bar

This is required as part of the spec, so clients can reuse part of the
device's old keymap.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoXKBcommon.h: Make header self-contained
Daniel Stone [Sat, 25 Apr 2009 08:13:24 +0000 (18:13 +1000)]
XKBcommon.h: Make header self-contained

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoKeysym: Add apallingly bad API documentation for keysym <-> string
Daniel Stone [Sat, 25 Apr 2009 04:55:59 +0000 (14:55 +1000)]
Keysym: Add apallingly bad API documentation for keysym <-> string

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoMake keysym <-> string conversion public API
Daniel Stone [Sat, 25 Apr 2009 04:52:51 +0000 (14:52 +1000)]
Make keysym <-> string conversion public API

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoXKB: Text: Use keysym <-> string conversion from keysym.c
Daniel Stone [Sat, 25 Apr 2009 04:51:46 +0000 (14:51 +1000)]
XKB: Text: Use keysym <-> string conversion from keysym.c

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoTest: Keysym: Add tests for new keysym <-> string conversions
Daniel Stone [Sat, 25 Apr 2009 04:51:16 +0000 (14:51 +1000)]
Test: Keysym: Add tests for new keysym <-> string conversions

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
4 years agoKeysym: Fix conversion for Unicode and bare numbers
Daniel Stone [Sat, 25 Apr 2009 04:42:42 +0000 (14:42 +1000)]
Keysym: Fix conversion for Unicode and bare numbers

Ensure that Unicode string representations are accepted and turned into
numbers, as well as hexadecimal numbers in 0xabcd1234 form; unknown
keysyms are output as 0xabcd1234 in string form.

This also ensures that strings are never returned malloc()ed.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
5 years agoKeySym: Actually handle NoSymbol
Daniel Stone [Sat, 25 Apr 2009 04:32:04 +0000 (14:32 +1000)]
KeySym: Actually handle NoSymbol

Add NoSymbol into the keysym table, so keysym <-> string conversion works for
that, too; also eliminate special-casing of VoidSymbol.

This will require special-casing in libX11 to preserve its API.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
5 years agotest: Fix srcdir != objdir build and test failures
Daniel Stone [Sat, 25 Apr 2009 04:29:23 +0000 (14:29 +1000)]
test: Fix srcdir != objdir build and test failures

filecomp would fail because it couldn't find the input files, after
compilation failed due to missing includes.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
5 years agolisting: Drop unused deviceSpec argument
Dan Nicholson [Wed, 22 Apr 2009 06:22:25 +0000 (23:22 -0700)]
listing: Drop unused deviceSpec argument

The server might care about this, but ListComponents is just reading xkb
files.

5 years agoxkbcomp: Another fairly major rewrite of the listing mode
Dan Nicholson [Mon, 20 Apr 2009 13:40:34 +0000 (06:40 -0700)]
xkbcomp: Another fairly major rewrite of the listing mode

The listing code in xkbcomp had been setup to allocate a set of buffers
with file paths and then later parse through them to find which maps were
needed.

All the allocation (with the additional allocation for the components
list) was making it really slow, so this patch makes everything simpler
by just generating the components list as we walk the directory tree.