libxkbcommon: Changes to 'upstream-experimental'
New branch 'upstream-experimental' available with the following commits:
commit b9b0011994c2887625cdb23633d67a8fefd6b7cb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 11 19:25:09 2010 -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>
commit 1b6e022c97df129b7106a54a366faee64062cfb3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 11 18:56:21 2010 -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>
commit 5e43e7b46c9b231742d7cb4ac2473879756aefd9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Dec 9 19:51:41 2010 -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>
commit f424bd8f5ffb9c5fb26f52ed70bdfbebf28bcc7a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Dec 9 19:45:26 2010 -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>
commit ff8e8f696a111ed8db51bdb9707f6cad564aaec1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Dec 9 18:25:18 2010 -0500
config: include: use nobase_include_HEADERS
Slightly simpler.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 2422c41b8ecec5ca8a461a247bbe3c75f440d1e2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Dec 9 16:28:52 2010 -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>
commit 69e52ad901d6bb323c11b01ac1745233a9521b68
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Dec 9 16:22:17 2010 -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>
commit 89377d5cd1ea1dc0d5ce925cddf3260e08ba3b6a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Dec 8 21:20:46 2010 -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>
commit bf9fdceef63507da889a22eb1a583d2b6376f5ea
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Dec 8 20:37:26 2010 -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>
commit ec3fbfdf6dd53e531c53b79f634ed89cd4e776f5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 7 18:22:38 2010 -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>
commit 3c570b7ce99d1d9fe8d0d696176c8c0d6cd5b171
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 7 18:17:29 2010 -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>
commit 41664ba237e073efe16d88e7ff6593677b6ce6c3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 7 14:32:57 2010 -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>
commit f507660421c3f005dfba591166d5545464a5c282
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 7 11:09:13 2010 -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>
commit e2f9f51667cf88c398d4536cfcc6996e9d0aa62a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 7 10:59:13 2010 -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>
commit 2c51e4b1957d331ec82019282d2f35f2ef19496d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 7 10:42:21 2010 -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>
commit 7ce1a6dca2ff55a0cda00c754a007f757fb5e37b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 7 10:39:16 2010 -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>
commit 63e2719a8f1d61a4678207e9abcecd67087c31ac
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 7 10:33:23 2010 -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>
commit ceba14dc3eebb288862f1e6c8a7863895af859cb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 7 10:23:18 2010 -0500
config: update subdirs .gitignore
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit f75ff7d921d5807d1e5b0aaa248a4d86d8eccfc4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Dec 3 15:13:01 2010 -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>
commit 0bfae4149c684391e16b3b80443954691a209dff
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Dec 3 14:50:14 2010 -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>
commit 83f64da99332a2ccb1c4641a8a3848ef523d7f58
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Dec 3 14:39:13 2010 -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>
commit a0512b28de3348d0e32295a77959fd2ed01ffb36
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Dec 2 20:52:34 2010 -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>
commit 971d9a99556c66571b7eba3407c02178016248cd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Dec 2 20:42:34 2010 -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>
commit 8562d9780813513a47bb7ff38acb6d7c2e45f3cc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Dec 2 20:35:35 2010 -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>
commit f0456a832fd406d7d0c6bbcceccfc57e78160279
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Thu Nov 11 23:28:29 2010 +0100
Update .gitignore
Limit exclusion of files to their respective directory
that they can appear in.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
commit f8301ebc5697ce6c865b5a7007aca72f31fd9686
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Thu Nov 11 23:27:21 2010 +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>
commit d84da95f69562c4801fa16b5fb797d28841c2ab1
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Thu Nov 11 23:05:33 2010 +0100
build: run autoupdate
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
commit b86fc752727a82547b4a06959658f9e5dfa886a9
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Thu Nov 11 23:03:43 2010 +0100
build: use proper quoting in autogen.sh
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
commit 2b36543ab1e7ed4a2c7d49dce1da043e6984cded
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Thu Nov 11 23:02:11 2010 +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>
commit f94a64cc08b47cdbfdfea5b5756340246fc391ed
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Oct 26 16:21:28 2010 +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>
commit 8d2c522f3156c3381d8530ce2346d1ec84fafe8d
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Oct 21 21:34:41 2010 -0400
Don't check for xlib, we don't need it
commit c88439dbf076ade1f6500d04b2db30e28a81c2d3
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Oct 20 22:27:07 2010 -0400
Update xkb->ctrls->num_groups when copying the keysyms
This used to be set when we read an XKM file.
commit 125691573ce4b28a2c65a234c612f91ce573f838
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Oct 20 15:57:45 2010 -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...
commit a84c08795e1090905d8ca349c1c1773db2fde065
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue Oct 19 21:57:59 2010 -0400
Use flex for generating the scanner, add support for parsing from strings
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
commit a2f115581d14a02d93c2803d992ddb37a209fd6d
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue Oct 19 15:16:50 2010 -0400
Add struct xkb_state
commit e879828717a8b7bdf12efbbf9a1baeb20e1fcdd2
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Oct 8 15:33:18 2010 -0400
Don't return a static buffer in public API
commit d202bc4462b4cca91d438b19c3293671f62e15a3
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Oct 8 15:07:44 2010 -0400
Pull in XKB_COMMON_* version of modifier masks
This way we can use libxkbcommon without having to include X.h.
commit 73ca959d7b1832b266fce7a18d12b74d95180343
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 27 16:05:52 2010 -0400
Dead code removal and static markup
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fb05ee47bf02950aec63533587880461b70418fc
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Sep 3 20:35:28 2010 -0400
Remove libxkbfile dependency for real this time
commit 20bfe1280d69702ea730bfe7ef6ee671deb923a1
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Sun Aug 29 21:30:10 2010 -0400
Use const char * in struct xkb_rule_names
commit be2bd66181ce4b55a64d087ea875e99e1e3b856e
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Aug 25 14:51:52 2010 -0400
Pull in a few #defines from libxkbfile and lower kbproto requirement
commit 351f8c6587bed26753370f8f5c351dd339aadbb0
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Jul 2 15:05:21 2010 -0400
Drop Bool type
It's a nightmare trying to avoid double definitions.
commit b3805a2360c9dd7c73333a91245762e66a38c2cb
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Jul 2 12:26:43 2010 -0400
Get rid of a few unused #defines in public header
commit 97fbc348b00bd30faa934a8ae8145cbaac9db881
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Jul 2 12:14:03 2010 -0400
Rename XkbRMLVOSet to struct xkb_rule_names
commit 15f259993ec63c2ea692ae1b1eb52a20c4983c1b
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Jul 2 12:10:05 2010 -0400
Move private structs and defines to private headers
commit 3f0034a990acfa3587c975306a37f7b455fb3d62
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Jul 2 11:50:01 2010 -0400
Rename public entry points to lowercase and underscore
commit 5669e1a82d24af8ebb6653f75a80f8b11279a6fc
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Jul 2 11:43:56 2010 -0400
Compile with -fvisibility=hidden when possible
commit 9f6026867a7a3543efdee5d3051f160e67c0edd3
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Jul 1 14:35:24 2010 -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.
commit 9d55d5bbf647d23ffdffeecc9111481d3f37d422
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Jun 30 17:32:54 2010 -0400
Drop Xmd.h include now that we're using uint32_t
commit 8e653493d0b485eb96ae1191fab2b5814b209f73
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Jun 30 17:31:34 2010 -0400
Fix warning from CARD32 -> uint32_t conversion
commit e10e16ad2fc37d2941c0d2cb4cfdb61891a380e1
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Jun 30 17:20:56 2010 -0400
Constify XkbcAtomText()
Atoms aren't mutable and this lets us put tbGetBuffer() back in the box.
commit d95b289367c4c6cd95042db35c88a6deb20c925b
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Jun 30 17:13:21 2010 -0400
Make XkbcInitAtoms() call optional
commit 0ece2cdbaf776a16f8864a7314ad2089a4b9980f
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Jun 30 16:56:24 2010 -0400
Drop more malloc/free wrappers
commit a76df86572a3227f118bfd2f9bbda7e731a31752
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Jun 30 16:33:25 2010 -0400
Use the right action structs
We were casting the union members to the wrong action structs (from kbproto).
commit 1723ef1bc73fc24f242ac6fb428e8c9f3d29d98d
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Jun 30 15:48:39 2010 -0400
Copy over missing action structs from kbproto
commit 9258cc3dca504479233bcd4eaefb5a0930c998cb
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Jun 30 13:31:21 2010 -0400
Rename Xkbc*Action to struct xkb_*_action
commit 399d4bd6780778579c641d9c60040524327efeb7
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon Jun 28 06:58:01 2010 -0400
Drop malloc wrappers
commit 47d3b3969b22aa8b59922363d1ca086d3c4156e6
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon Jun 28 06:50:12 2010 -0400
Drop CARD32 and Opaque types
commit 2fb329c9649a6e743416b6457bb0af9633ac1064
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 23 16:25:10 2010 +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>
commit b74223eb50410941ec7589bffdc12183f4a23229
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 23 16:25:02 2010 +0100
fix mod size confusion
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 8693c2652c62211d98885bcaebb73877acbb125f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 22 15:54:52 2010 +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>
commit 7257d4c89e52aa727df25564109cecc4d33b9543
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jun 21 14:28:34 2010 +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>
commit b38525421f5b6f28b7f441ff8b2c3a97b047aae2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jun 21 14:27:58 2010 +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>
commit 2c4a045aca7c680a0315850a0e69784ac08f96a3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jun 21 14:22:26 2010 +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>
commit 15b0db5492a2725d45011b8fef70006cc96fee0c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 17 05:56:08 2010 +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>
commit 60e7eeeba1d6c1b17cc71c36381251e633d6716e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 17 03:16:09 2010 +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>
commit d2d787df65d51c085dff0f9c4daf14bfffcaeeec
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 17 00:51:49 2010 +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>
commit e564235b436159f23a77270752ffdee1867f27c8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 19:43:14 2010 +0100
xkbcomp: Don't malloc() and free() most scanned tokens
Use a constant buffer instead. Sigh.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit f246db20f4d824b4286c00714b0c7e1b5a3d5b8f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 19:40:31 2010 +0100
Fix compilation with DEBUG
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit acc467de9f8d96beea6d93a31fdb95b3a551cd11
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 19:39:15 2010 +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>
commit 240a0c3409f2cd81394188175499087c37793a55
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 19:38:16 2010 +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>
commit 48baabeb38c0afc3dc071038662f43419b058cf4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 19:30:30 2010 +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>
commit 080a083fd26a05176b40f810f36ebe22b77d477c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 16:43:10 2010 +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>
commit a0e180b08382bb62415f2cd37c61ecfd99b00773
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 16:42:06 2010 +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>
commit 4346e0065b558a41957bcca670484cbe408717d3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 16:41:10 2010 +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>
commit 5df3dff7412b3fafe1046880ed2356abd63fef0e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 15:27:12 2010 +0100
xkbcomp: geometry: Plug numerous atom text & expr leaks
This code is absolute misery.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 18039a6c0b7a20b05e1fff663981deb8473da218
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 15:25:40 2010 +0100
xkbcomp: Atom text and expr leak fixes part #973
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit a22386d402d9e40ca1a04406068458412d52b221
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 15:23:23 2010 +0100
xkbcomp: Don't leak atom text and string exprs, again
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 8904c6eea747628a93afcfc3017df537ab43223c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 15:22:05 2010 +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>
commit ad0a3d7c52f94af306a29145560c9400fabf9f33
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 15:20:32 2010 +0100
xkbcomp: Don't leak atom text and string exprs
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit d20bdd3b9add0eae367dd666fba06378c195d687
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 15:14:58 2010 +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>
commit 50a037cacf75b106a2ee31680fb4588a8873a262
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jun 15 15:13:56 2010 +0100
xkbcomp: Replace open-coded strdup
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 5140250273ff02621ae286a68cd75b47a2695e43
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 18:15:02 2009 +1000
Add testcase for XkbcCanonicaliseComponents
Should be reasonably thorough; the shell part is, however, quite
unpleasant.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 85b7f47d8a544dab204214de9c248f03e78261fe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 18:13:52 2009 +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>
commit 8ffa371395ac0f3c3942d60dd63509c534c877c0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 18:13:24 2009 +1000
XKBcommon.h: Make header self-contained
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 8b5af79b7b3358783b3cfe5f023d01b58ce208e4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 14:55:59 2009 +1000
Keysym: Add apallingly bad API documentation for keysym <-> string
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 70b64213ca620c0f4c50cd05b9a0667357b7d297
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 14:52:51 2009 +1000
Make keysym <-> string conversion public API
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 62eb167d56f021a1aa151c9431d320b16a0a3794
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 14:51:46 2009 +1000
XKB: Text: Use keysym <-> string conversion from keysym.c
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit a8bb86a48a9823ae1c0facfa3970e0854136b5a3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 14:51:16 2009 +1000
Test: Keysym: Add tests for new keysym <-> string conversions
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit cdc735c8ca9ebc270429074cdf0205407d4b5d29
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 14:42:42 2009 +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>
commit 8e3239a78f7e47321535a4917bddf4ce00d3d244
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 14:32:04 2009 +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>
commit a5ce9754dc3c8313e9d35bf86d31d78e8bf9653c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 14:29:23 2009 +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>
commit 4e854a21aa3d0dbb281db911849ed3d7cb73303c
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue Apr 21 23:22:25 2009 -0700
listing: Drop unused deviceSpec argument
The server might care about this, but ListComponents is just reading xkb
files.
commit 481deea178259dddd3f07ed22d525796d1a2648e
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Apr 20 06:40:34 2009 -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.
commit 18b43f8dfe641bf951b92d074b1cc6cee71d9869
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sun Apr 19 16:30:36 2009 -0700
Rewrite listing code to generate XkbComponentListPtr
In xkbcomp, the listing code printed out the xkb files to stdout and the
caller would parse the output. Here, we can just generate a
XkbComponentListPtr and pass it back.
This should be a series of smaller commits, but there was no clean way to
do it since it's basically a complete rewrite except for the core map
matching logic.
A lot of code used for special printing modes in xkbcomp has been
shedded. Callers can massage the output as they please.
commit 559305a5cb3e9735203d8fd8fc10d8ec487b101f
Author: Dan Nicholson <dbn.lists@gmail.com>
Reply to: