Log

Author Commit Date CI Message
Daniel Stone b7b49eb0 2012-02-20T14:10:41 Remove priv arguments from ExprResolveKeySym They've never been used by its one caller. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 70033b13 2012-02-20T14:08:55 Remove priv arguments from ExprResolveKeyName They've never been used. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 482d4faa 2012-02-20T13:44:27 Remove priv arguments from ExprResolveBoolean They've never been used. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 94041575 2012-02-20T13:40:34 Remove priv arguments from ExprResolveFloat They've never been used. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 3151ce36 2012-02-20T13:34:36 Remove priv arguments from ExprResolveModMask What with them now being unused and all. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 67605d2c 2012-02-20T13:32:09 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 fbb82199 2012-02-16T11:18:49 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 c45cdb0c 2012-02-16T00:22:11 Still more memory leak fixes Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 83f18b1c 2012-02-15T19:39:33 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 eb8c96cb 2012-02-15T16:42:45 Don't leak SymbolsInfo Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 3077e97e 2012-02-15T16:37:31 tests: Free returned XKB map Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 67c874d7 2012-02-15T16:24:07 Enable stderr debugging by default (If debugFlags is set to non-zero.) Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone f57dcfeb 2012-02-15T16:23:47 Raise keycode range to 32 bits \o/ Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 8f01b144 2012-02-15T12:54:11 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 ead9d0cb 2012-02-15T11:49:10 Move include path from X11/extensions/ to xkbcommon/ Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 1a6c3807 2012-02-15T15:58:14 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 4e228511 2012-02-15T14:34:08 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>
Rob Bradford 615291f1 2012-01-05T14:20:35 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 c19661b9 2011-12-16T12:52:00 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 99e29de2 2011-10-27T14:30:21 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 f91afe4f 2011-06-03T17:19:09 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 05f5be9f 2011-04-04T09:21:55 Also update required kbproto version in .pc.in file
Kristian Høgsberg 9dd7dc6d 2011-03-18T00:33:48 configure: Lower kbproto requirement to 1.0.4 There's nothing in 1.0.5 that we need.
Kristian Høgsberg dd0e8b70 2011-01-29T14:06:39 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 621c2a7a 2011-01-29T14:24:46 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 a63e82be 2010-12-17T21:14:54 Rename XkbcInternAtom() to xkb_intern_atom() and export Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Gaetan Nadon b9b00119 2010-12-11T19:25:09 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 1b6e022c 2010-12-11T18:56:21 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 5e43e7b4 2010-12-09T19:51:41 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 f424bd8f 2010-12-09T19:45:26 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 2422c41b 2010-12-09T16:28:52 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 69e52ad9 2010-12-09T16:22:17 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 89377d5c 2010-12-08T21:20:46 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 bf9fdcee 2010-12-08T20:37:26 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 ec3fbfdf 2010-12-07T18:22:38 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 3c570b7c 2010-12-07T18:17:29 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 ff8e8f69 2010-12-09T18:25:18 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 41664ba2 2010-12-07T14:32:57 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 f5076604 2010-12-07T11:09:13 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 e2f9f516 2010-12-07T10:59:13 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 2c51e4b1 2010-12-07T10:42:21 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 7ce1a6dc 2010-12-07T10:39:16 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 63e2719a 2010-12-07T10:33:23 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 ceba14dc 2010-12-07T10:23:18 config: update subdirs .gitignore Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Gaetan Nadon f75ff7d9 2010-12-03T15:13:01 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 0bfae414 2010-12-03T14:50:14 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 83f64da9 2010-12-03T14:39:13 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 a0512b28 2010-12-02T20:52:34 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 971d9a99 2010-12-02T20:42:34 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 8562d978 2010-12-02T20:35:35 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 f0456a83 2010-11-11T23:28:29 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 f8301ebc 2010-11-11T23:27:21 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 d84da95f 2010-11-11T23:05:33 build: run autoupdate Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Jan Engelhardt b86fc752 2010-11-11T23:03:43 build: use proper quoting in autogen.sh Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Jan Engelhardt 2b36543a 2010-11-11T23:02:11 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 f94a64cc 2010-10-26T16:21:28 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 8d2c522f 2010-10-21T21:34:41 Don't check for xlib, we don't need it
Kristian Høgsberg c88439db 2010-10-20T22:27:07 Update xkb->ctrls->num_groups when copying the keysyms This used to be set when we read an XKM file.
Kristian Høgsberg 12569157 2010-10-20T15:57:45 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 a84c0879 2010-10-19T21:57:59 Use flex for generating the scanner, add support for parsing from strings Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Kristian Høgsberg a2f11558 2010-10-19T15:16:50 Add struct xkb_state
Kristian Høgsberg e8798287 2010-10-08T15:33:18 Don't return a static buffer in public API
Kristian Høgsberg d202bc44 2010-10-08T15:07:44 Pull in XKB_COMMON_* version of modifier masks This way we can use libxkbcommon without having to include X.h.
Adam Jackson 73ca959d 2010-09-27T16:05:52 Dead code removal and static markup Signed-off-by: Adam Jackson <ajax@redhat.com>
Kristian Høgsberg fb05ee47 2010-09-03T20:35:28 Remove libxkbfile dependency for real this time
Kristian Høgsberg 20bfe128 2010-08-29T21:30:10 Use const char * in struct xkb_rule_names
Kristian Høgsberg be2bd661 2010-08-25T14:51:52 Pull in a few #defines from libxkbfile and lower kbproto requirement
Kristian Høgsberg 351f8c65 2010-07-02T15:05:21 Drop Bool type It's a nightmare trying to avoid double definitions.
Kristian Høgsberg b3805a23 2010-07-02T12:26:43 Get rid of a few unused #defines in public header
Kristian Høgsberg 97fbc348 2010-07-02T12:14:03 Rename XkbRMLVOSet to struct xkb_rule_names
Kristian Høgsberg 15f25999 2010-07-02T12:10:05 Move private structs and defines to private headers
Kristian Høgsberg 3f0034a9 2010-07-02T11:50:01 Rename public entry points to lowercase and underscore
Kristian Høgsberg 5669e1a8 2010-07-02T11:43:56 Compile with -fvisibility=hidden when possible
Kristian Høgsberg 9f602686 2010-07-01T14:35:24 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 9d55d5bb 2010-06-30T17:32:54 Drop Xmd.h include now that we're using uint32_t
Kristian Høgsberg 8e653493 2010-06-30T17:31:34 Fix warning from CARD32 -> uint32_t conversion
Kristian Høgsberg e10e16ad 2010-06-30T17:20:56 Constify XkbcAtomText() Atoms aren't mutable and this lets us put tbGetBuffer() back in the box.
Kristian Høgsberg d95b2893 2010-06-30T17:13:21 Make XkbcInitAtoms() call optional
Kristian Høgsberg 0ece2cdb 2010-06-30T16:56:24 Drop more malloc/free wrappers
Kristian Høgsberg a76df865 2010-06-30T16:33:25 Use the right action structs We were casting the union members to the wrong action structs (from kbproto).
Kristian Høgsberg 1723ef1b 2010-06-30T15:48:39 Copy over missing action structs from kbproto
Kristian Høgsberg 9258cc3d 2010-06-30T13:31:21 Rename Xkbc*Action to struct xkb_*_action
Kristian Høgsberg 399d4bd6 2010-06-28T06:58:01 Drop malloc wrappers
Kristian Høgsberg 47d3b396 2010-06-28T06:50:12 Drop CARD32 and Opaque types
Daniel Stone 2fb329c9 2010-06-23T16:25:10 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 b74223eb 2010-06-23T16:25:02 fix mod size confusion Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone 8693c265 2010-06-22T15:54:52 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 7257d4c8 2010-06-21T14:28:34 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 b3852542 2010-06-21T14:27:58 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 2c4a045a 2010-06-21T14:22:26 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 15b0db54 2010-06-17T05:56:08 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 60e7eeeb 2010-06-17T03:16:09 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 d2d787df 2010-06-17T00:51:49 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 e564235b 2010-06-15T19:43:14 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 f246db20 2010-06-15T19:40:31 Fix compilation with DEBUG Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Daniel Stone acc467de 2010-06-15T19:39:15 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 240a0c34 2010-06-15T19:38:16 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 48baabeb 2010-06-15T19:30:30 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 080a083f 2010-06-15T16:43:10 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>
Daniel Stone a0e180b0 2010-06-15T16:42:06 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>