summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-16Bug in searching config files fixed.Van de Bugger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-15Data refactored: list_t introduced to keep list and its sizes together.Van de Bugger
From 49380ed12a0c451207cf5a12ca2c1e0c9c16c9e6 Mon Sep 17 00:00:00 2001 From: Van de Bugger <van.de.bugger@gmail.com> Date: Mon, 14 Feb 2011 01:45:23 +0300 Subject: [PATCH setxkbmap] Data refactored: list_t introduced to keep list and its sizes together. In older code there were 3 separate global variables: szOptions, numOptions, and options. All 3 variables are related: options is a list (array) of items, szOptions is the allocated size and numOptions is the number of used elements. 3 more variables (szInclPath, numInclPath, inclPath) represent another list. list_t structure combines related info (pointer to array, allocated size, and number of used elements) together. Few functions changed to accept list_t argument instead of separated list and sizes. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-15Data refactored: 3 separate arrays and set of macros merged into a struct.Van de Bugger
Bunch of XXX_NDX defines, and 3 arrays: `svName', `svSrc' and `svValue' are merged into one structure. Interace of 2 functions `trySetString' and `setOptString' changed: instead of receiving `which' argument of `int' type (an index to those arrays) the functions now receive `setting' argument, which hold everything about the setting: `name', `src', and `value', so the functions do not use global variables any more. Signed-off-by: Van de Bugger <van.de.bugger@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-15Tabs replaced with spaces; trailing spaces deleted.Van de Bugger
Signed-off-by: Van de Bugger <van.de.bugger@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-13assigned value never used: "next" set at setxkbmap.c(654)Alan Coopersmith
If we go through the loop, next is overwritten on the very first line. If we don't go through the loop, next is never referenced again. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
2011-02-13Use snprintf instead of trying to pre-measure sprintf result sizes.Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
2011-02-13Bug 34151: Potential bug and buffer overflow due to misused rules filenameAlan Coopersmith
https://bugs.freedesktop.org/show_bug.cgi?id=34151 Use rfName consistently, instead of sometimes reverting to svValue[RULES_NDX] Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
2011-02-13Bug 34117: setxkbmap -I dir not accepted, despite man pageAlan Coopersmith
Easy enough to accept the syntax documented in the man page, so accept the -I flag with or without a space between -I and the directory argument. https://bugs.freedesktop.org/show_bug.cgi?id=34117 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
2011-01-20config: move man pages into their own directoryGaetan Nadon
Use services provided by XORG_MANPAGE_SECTIONS. Use standard Makefile for man pages. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-19Fix crash when when -device is specified without argumentStuart Kreitman
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6971649 Signed-off-by: Stuart Kreitman <stuart.kreitman@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-01-13man: remove trailing spaces and tabsGaetan Nadon
Using s/[ \t]*$// Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-12config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERSGaetan Nadon
This silences an Autoconf warning
2011-01-12config: replace deprecated AC_HELP_STRING with AS_HELP_STRINGGaetan Nadon
This silences an Automake warning. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-09-22setxkbmap 1.2.0setxkbmap-1.2.0Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-09-22config: remove AC_SUBST of CFLAGS & LIBS that PKG_CHECK_MODULES handlesAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-09-22config: Remove AC_PROG_CC & AC_PROG_INSTALL that XORG_DEFAULT_OPTIONS provideAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-09-22config: update AC_PREREQ statement to 2.60Gaetan Nadon
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>
2010-07-23config: upgrade to util-macros 1.8 for additional man page supportAlan Coopersmith
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 Use platform appropriate version of sed. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-01-13COPYING: replace stub with actual copyright noticeGaetan Nadon
Refer to setxkbmap.c Silicon Graphics Computer Systems, Inc. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2009-11-26Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILESGaetan Nadon
Now that the INSTALL file is generated. Allows running make maintainer-clean.
2009-10-28INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206Gaetan Nadon
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.
2009-10-26Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432Gaetan Nadon
ChangeLog filename is known to Automake and requires no further coding in the makefile.
2009-10-22.gitignore: use common defaults with custom section # 24239Gaetan Nadon
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.
2009-10-21This is not a GNU project, so declare it foreign.Jeremy Huddleston
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>
2009-10-08Change default XKB rules file from "xorg" to "base"Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-10-08Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONSAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-10-08Add -query option to print current RLMVO settingsAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-01Add README with pointers to mailing lists, bugzilla, & gitAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-07-31Comment typo fixAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-07-09Bump to 1.1.0setxkbmap-1.1.0Peter Hutterer
2009-01-19Ansification and compile warning fixes.Paulo Cesar Pereira de Andrade
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects make distcheck and all gcc 4.3 and sparse warnings.
2008-12-01Check return value of calloc and realloc. #18759 and #18760Peter Hutterer
X.Org Bug <http://bugs.freedesktop.org/show_bug.cgi?id=18759> X.Org Bug <http://bugs.freedesktop.org/show_bug.cgi?id=18760> Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-08-12Adding some explanatory comments.Peter Hutterer
2008-08-12Indent consistently.Peter Hutterer
indent -cbi 0 -nprs -nut -npcs -i4 -bli 0 *.c *.h
2008-08-12Remove RCS tags.Peter Hutterer
2007-12-06Add missing PHONY line for automatic ChangeLog generationJames Cloos
2007-07-23Version bump: 1.0.4setxkbmap-1.0.4Alan Coopersmith
2007-07-23lint target needs to use AM_CFLAGS tooAlan Coopersmith
2007-07-23Use AM_CFLAGS instead of setxkbmap_CFLAGS to avoid automake-1.10 warningAlan Coopersmith
Makefile.am:31: compiling `setxkbmap.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
2007-04-17Minor code cleanups (remove unused static and opencoding of strdup)Alan Coopersmith
2007-04-17Add rules for checking code with sparse/lint/etc.Alan Coopersmith
2007-04-16Replace static ChangeLog with dist-hook to generate from git logAlan Coopersmith
2007-04-16More man page cleanups (grammatical nits, etc.)Alan Coopersmith
2007-04-16Bug 7841: setxkbmap man page doesn't describe all switchesAlan Coopersmith
Added descriptions for -device, -I, -keycodes, and -verbose/-v. X.Org Bugzilla #7841 <https://bugs.freedesktop.org/show_bug.cgi?id=7841> Reported upstream from Debian BTS #252631 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=252631>
2007-04-16renamed: .cvsignore -> .gitignoreAlan Coopersmith
2007-04-16Correct XKB data files path in man pageAlan Coopersmith
Use path found by configure instead of hardcoding __projectroot__/lib/X11/xkb
2006-11-02bump to 1.0.3setxkbmap-1.0.3Daniel Stone
2006-10-15add support for extended devicesDaniel Stone
Add a -device parameter, which allows setting the map on arbitary extended devices.
2006-10-15defaults: make the defaults a bit more modernDaniel Stone
Fix default path, bump default model from pc101 to pc105.
2006-03-10Bump to 1.0.2; release.setxkbmap-1_0_2XORG-7_1XORG-7_0_99_901Daniel Stone
Initialise vd.variant and vd.variant to NULL when failing to get the active RMLVO components from the server.