summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-06-02configure: Drop AM_MAINTAINER_MODEAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-06-02config: Add missing AC_CONFIG_SRCDIRAlan Coopersmith
Regroup AC statements under the Autoconf initialization section. Regroup AM statements under the Automake initialization section. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-08-30Fixing a small mistake in the man page -- s/comp/map/.Benno Schulenberg
And seizing the opportunity to tweak some of the wording. Signed-off-by: Benno Schulenberg <bensberg@justemail.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-08-30Printing the program's version number on -version.Benno Schulenberg
Also unwrap a help-text line, as it looks neater and stays within 80 characters, and alphabetize the -help option in the man page. Signed-off-by: Benno Schulenberg <bensberg@justemail.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> [squashed in: include "config.h" directive] Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-07-02Ensure consistency between the manpage and the output of the -h optionStéphane Aulery
This is in addition to the correction [1] for bug #524510 reported by Debian [2]. [1] http://cgit.freedesktop.org/xorg/app/setxkbmap/commit/?id=2011f509c56b73cc62105c689d702f279f522017 [2] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524510 Signed-off-by: Stéphane Aulery <lkppo@free.fr> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-02-12Use C99 struct initializer for cmdNames in applyComponentNamesAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-02-12Make len a size_t instead of converting back & forth to an intAlan Coopersmith
Gets rid of a number of clang warnings: setxkbmap.c:689:28: warning: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Wshorten-64-to-32] len = strlen(orig) + 1; ~ ~~~~~~~~~~~~~^~~ setxkbmap.c:701:39: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] orig = (char *) realloc(orig, len); ~~~~~~~ ^~~ setxkbmap.c:707:32: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] orig = (char *) calloc(len, 1); ~~~~~~ ^~~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-02-12Move global rules variable into applyRules, the only function that uses itAlan Coopersmith
Clears gcc warning: setxkbmap.c: In function `tryLoadRules': setxkbmap.c:811: warning: declaration of 'rules' shadows a global declaration setxkbmap.c:132: warning: shadowed declaration is here No longer marked static, since the function is called exactly once, so storing the value across calls seems pointless. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-03-22setxkbmap 1.3.0setxkbmap-1.3.0Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-03-05Mention xkeyboard-config(7) in setxkbmap(1)Mehdi Dogguy
xkeyboard-config lists known keyboard models, layouts, variants, etc... which are needed to be able to correctly use setxkbmap. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-09-28Add const attributes to fix gcc -Wwrite-strings warningsAlan Coopersmith
Fixes many, but not all, of the warnings raised by this option Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-28Minor style changes in help message.Van de Bugger
1. `args' renamed to `options'. (xkbcomp and gcc name these entities `options'). 2. `Where legal args are:' replaced with `Options:'. (Short and correct. As I remember, GNU does not recommend to use word `legal' unless it related to law and lawyers). 3. Option descriptions shifted right by 2 space. (Like gcc.) Signed-off-by: Van de Bugger <van.de.bugger@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-28Few messages added for easier troubleshooting.Van de Bugger
If setxkbmap fails to load rules file, it is not possible to find out where setxkbmap looks for it. Increasing verbosity level does not help: $ ./setxkbmap -v 10 Setting verbose level to 10 locale is C Couldn't find rules file (evdev) The problem fixed by adding two messages: before loading file and after successful loading. Messages are displayed if verbosity level is 8 or higher: $ ./setxkbmap -v 10 Setting verbose level to 10 locale is C Trying to load rules file ./rules/evdev... Trying to load rules file /usr/local/share/X11/xkb/rules/evdev... Couldn't find rules file (evdev) Signed-off-by: Van de Bugger <van.de.bugger@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-28Consistent handling of memory allocation errors.Van de Bugger
Macro `OOM' ("Out of memory") introduced for checking and reporting memory allocation errors. The same macro is used in all the cases. One check was missed in original source; fixed. Changes after patch review: 1. `OOM' macro uses `do ... while (0)'. 2. `exit(-1)', not `abort()'. Signed-off-by: Van de Bugger <van.de.bugger@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-25Removed unused arg subdir in function findFileInPath()Alexandr Shadchin
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-23Minor style fixes.Van de Bugger
Few tabs replaced with spaces; pointers are written as "list_t *list" (no space between asterisk and variable name). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-23Set of macros converted to enum type.Lev Nezhdanov
Signed-off-by: Van de Bugger <van.de.bugger@gmail.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-23man: multiple layouts can be specified (#34118)Peter Hutterer
Same applies to variant. X.Org Bug 34118 <http://bugs.freedesktop.org/show_bug.cgi?id=34118> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2011-02-17Refactoring the help message.Van de Bugger
1. Entire help message is printed at once (not line-by-line). 2. Brackets around argumnets of -I option removed, since argument is mandatory. 3. Added a space after comma in. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 18:32:31 +0000