summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump to 1.2.2xkbcomp-1.2.2Daniel Stone2011-06-211-1/+1
| | | | | | | | Emergency bugfix for the syminterp declarations. They've been broken since the beginning of time, but I guess we just haven't added new interpreted symbols since around then. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* Interp: Ignore NoSymbol definitionsDaniel Stone2011-06-211-0/+7
| | | | | | | | | | | | | | | | | | | | | A NoSymbol syminterp leads to a Any+AnyOfOrAll(None) definition, which is never what anyone would actually ever want in a sym interp. The failure mode here was: interpret XF86SomeKeysymYouDontHaveYet { action=Something() } leading to: interpret Any+AnyOfOrAll(None) { action=Something() } leading to every single non-action key triggering your shiny new action that was only supposed to come from a new keysym. At least you could VT switch or zap, I guess. Later, more invasive, revisions will bring a more useful error message. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* Interp: Don't make modifier lookup failure fatalDaniel Stone2011-06-211-1/+1
| | | | | | | If we can't look up a modifier in a SymInterp declaration, don't make that fatal enough to kill the entire file, just ignore it and move on. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* config: move pre-processor flags to AM_CPPFLAGSGaetan Nadon2011-06-151-1/+2
| | | | Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* config: let Automake handle Yacc dist and cleaningGaetan Nadon2011-06-151-3/+0
| | | | | | | | | BUILT_SOURCES and MAINTAINERCLEANFILES are already handled by Automake. Automake generates all the rules to handle building, distribution and cleaning. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* Replace repeated checks for gcc with _X_ATTRIBUTE_PRINTF from xprotoAlan Coopersmith2011-06-081-54/+9
| | | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
* xkbcomp: Stop possible overflow in yyGetnumber. #31647Alistair Leslie-Hughes2011-04-041-3/+6
| | | | | | | | Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=31647 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Inline the oiText macro in the only place it's usedJulien Cristau2011-02-131-2/+2
| | | | | | | | | | | Gets rid of a compiler warning: geometry.c: In function 'HandleOverlayDef': geometry.c:2578: warning: the address of 'ol' will always evaluate as 'true' X.Org bug#34219 <https://bugs.freedesktop.org/show_bug.cgi?id=34219> Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
* xkbcomp 1.2.1xkbcomp-1.2.1Peter Hutterer2011-02-111-1/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* config: move man pages into their own directoryGaetan Nadon2011-01-194-17/+17
| | | | | | | Use services provided by XORG_MANPAGE_SECTIONS. Use standard Makefile for man pages. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* man: remove trailing spaces and tabsGaetan Nadon2011-01-131-7/+7
| | | | | | Using s/[ \t]*$// Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERSGaetan Nadon2011-01-121-1/+1
| | | | This silences an Autoconf warning
* config: replace deprecated AC_HELP_STRING with AS_HELP_STRINGGaetan Nadon2011-01-121-1/+1
| | | | | | This silences an Automake warning. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* Remove out-of-date copies of README.config & README.enhancingAlan Coopersmith2011-01-044-714/+3
| | | | | | | | | | | The up-to-date master copies of those documents are found in the xorg-docs module, and posted on the X.Org website. Also, x-docs.org no longer carries X11 docs, so point to X.Org's website instead in the README. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
* config: replace AC_CHECK_FILE with test -f as it fails to cross-compileGaetan Nadon2010-11-011-3/+6
| | | | | | | | | Testing for the presence of xkbparse.c is legitimate as this is a build file, but the Autoconf macro assumes it is testing on the host system and fails. Tested-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* man: Improve description of device selection optionDirk Wallenstein2010-11-011-1/+2
| | | | | | | The device selection option takes effect when loading keymaps, too. Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Allow uploading a keymap to a single deviceDirk Wallenstein2010-11-011-0/+2
| | | | | | Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xkbcomp 1.2.0xkbcomp-1.2.0Alan Coopersmith2010-10-301-1/+2
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* config: Remove unnecessary calls from configure.acAlan Coopersmith2010-09-231-4/+0
| | | | | | | AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* config: upgrade to util-macros 1.8 for additional man page supportAlan Coopersmith2010-09-232-23/+5
| | | | | | | | | | | | | Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS The value of MAN_SUBST is the same for all X.Org packages. Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS The existing statement can now be removed from the configuration file. Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) Enables silent rule and use platform appropriate version of sed. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* config: update AC_PREREQ statement to 2.60Gaetan Nadon2010-09-231-1/+1
| | | | | | | | | | Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* config: allow to build tarball when yacc is missingGaetan Nadon2010-07-121-1/+2
| | | | | | | | | | | | | 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. Reported-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* limits.h is mandated by C89, no need to check for itDaniel Stone2010-07-122-3/+0
| | | | | | | | Alan Coopersmith pointed out that C89 mandates limits.h, so for once in X's life, checking for a system header is just being unnecessarily paranoid. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* Fix signedness issue with getc() return valueJulien Cristau2010-07-121-2/+2
| | | | | | | getc() and ungetc() return and take, respectively, an int rather than a char to allow for error values as well. Oops. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* Fix parsing of 0x1a2b3c4d-style symbolsDaniel Stone2010-07-093-1/+14
| | | | | | | | Raw keysyms were not getting parsed correctly, due to forgetting to add the code to libX11, forgetting to add the backwards-compat code for old libX11s, and then stuffing the lexing up anyway. Yeesh. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* Fix gcc warningsDaniel Stone2010-06-151-9/+7
| | | | | | It was right too: printf was being misused in some spots. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* Don't malloc() and free() most scanned symbolsDaniel Stone2010-06-153-38/+26
| | | | | | Use a constant buffer. Sigh. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* Fix compilation with DEBUGDaniel Stone2010-06-152-0/+4
| | | | Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* Use fread() instead of getc()Daniel Stone2010-06-151-44/+76
| | | | | | | | 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>
* Lazy keysym parsing (avoid XStringToKeysym)Daniel Stone2010-06-155-37/+25
| | | | | | | 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>
* config: add check for yacc to insure it is installed #27973Gaetan Nadon2010-06-021-0/+2
| | | | | | | | | | | Unlike other macros AC_PROG_YACC sets the YACC variable to "yacc" as a last resort, even if no programs have been found. Improve error checking by issuing an error message if yacc is not found. The module cannot build anyway. Reported-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* config: move CWARNFLAGS from configure.ac to Makefile.amGaetan Nadon2010-02-112-2/+1
| | | | | | | Compiler warning flags should be explicitly set in the makefile rather than being merged with other packages compiler flags. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
* Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILESGaetan Nadon2009-11-261-1/+2
| | | | | Now that the INSTALL file is generated. Allows running make maintainer-clean.
* INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206Gaetan Nadon2009-10-284-2/+5
| | | | | | | Add missing INSTALL file. Use standard GNU file on building tarball README may have been updated Remove AUTHORS file as it is empty and no content available yet. Remove NEWS file as it is empty and no content available yet.
* Deploy the new XORG_DEFAULT_OPTIONS #24242Gaetan Nadon2009-10-271-7/+5
| | | | | | This macro aggregate a number of existing macros that sets commmon X.Org components configuration options. It shields the configuration file from future changes.
* Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432Gaetan Nadon2009-10-261-2/+0
| | | | | ChangeLog filename is known to Automake and requires no further coding in the makefile.
* .gitignore: use common defaults with custom section # 24239Gaetan Nadon2009-10-221-13/+66
| | | | | | Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults.
* This is not a GNU project, so declare it foreign.Jeremy Huddleston2009-10-211-1/+1
| | | | | | | | | | | | | | | | | | On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: > > I noticed an INSTALL file in xlsclients and libXvMC today, and it > > was quite annoying to work around since 'autoreconf -fvi' replaces > > it and git wants to commit it. Should these files even be in git? > > Can I nuke them for the betterment of humanity and since they get > > created by autoreconf anyways? > > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation of the INSTALL file. It is also part of the 24206 solution. Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
* xkbcomp 1.1.1xkbcomp-1.1.1Peter Hutterer2009-10-031-1/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xkbcomp: Remove output file if closing fails.Rami Ylimaki2009-08-061-2/+10
| | | | | | | | | Without the fix xkbcomp may leave a truncated file in the filesystem if there is not enough disk space. Using the truncated file leads to problems. Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Bump to 1.1.0.xkbcomp-1.1.0Peter Hutterer2009-07-091-1/+1
|
* Use temporary buffer for generating Uxxx names to avoid overflowAlan Coopersmith2009-05-111-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | Instead of sprintf()'ing a 4 character string to a char [4] buffer, and leaving the trailing '\0' to overwrite into the next entry, snprintf() to a 5 character temp buffer and memcpy the 4 characters to the right place. Fixes parfait errors: Error: Buffer overflow at xkbcomp-1.0.4/misc.c:393 in function 'ComputeKbdDefaults' [Standard C Library pattern matching] In sprintf related dereference of xkb->names->keys[i].name with index not less than '4' Destination array size is 4 bytes, data to be written is 4 bytes Error: Buffer overflow at xkbcomp-1.0.4/misc.c:402 in function 'ComputeKbdDefaults' [Standard C Library pattern matching] In sprintf related dereference of xkb->names->keys[i].name with index not less than '4' Destination array size is 4 bytes, data to be written is 4 bytes [This bug was found by the Parfait bug checking tool. For more information see http://research.sun.com/projects/parfait ] Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
* Allow the default XKB config root to be set from configureDan Nicholson2009-03-072-1/+8
| | | | | | | | The default was hardcoded in the Makefile as $(datadir)/share/X11/xkb. This could cause a problem if you are installing xkbcomp to an alternate location but want to continue using the system's XKB data. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
* Correct a remaining of a wrong change to make some DEBUG_VAR's static.Paulo Cesar Pereira de Andrade2009-01-221-1/+1
|
* Correct make distcheck and most gcc and sparse warnings.Paulo Cesar Pereira de Andrade2009-01-2120-31/+42
| | | | | | | | | | | | | | | | | | | | Remaining warnings are due to macros that check address or vectors on the stack and auto generated yacc code. Compiled with default flags and also as: % make CFLAGS=-DENTRY_TRACKING_ON -DDEBUG_ON -DASSERTIONS_ON to ensure the "simplification" of code like: foo.c: <hash>define DEBUG_VAR foo_VAR <hash>include "foo.h" ... foo.h: <hash>ifdef DEBUG_VAR_NOT_LOCAL extern <hash>endif int DEBUG_VAR; ... did not change the author's "intended" logic.
* Check for NULL strings before calling strdup.Peter Hutterer2008-09-111-1/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
* sprintf -> snprintf conversionsAlan Coopersmith2008-09-057-73/+75
|
* Remove #if 0'd typedef that appears nowhere else.Alan Coopersmith2008-09-051-10/+0
|
* Remove X_NOT_POSIX #ifdefsAlan Coopersmith2008-09-051-27/+12
| | | | POSIX.1-1990 is well below the current minimum bar
* Check for strdup & strcasecmp before assuming we need to provide our ownAlan Coopersmith2008-09-052-0/+3
|
View Lorry Controller Status