Age | Commit message (Collapse) | Author |
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Signed-off-by: Van de Bugger <van.de.bugger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
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>
|
|
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>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
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>
|
|
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>
|
|
Signed-off-by: Van de Bugger <van.de.bugger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
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>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
|
|
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>
|
|
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>
|
|
Use services provided by XORG_MANPAGE_SECTIONS.
Use standard Makefile for man pages.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
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>
|
|
Using s/[ \t]*$//
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
This silences an Autoconf warning
|
|
This silences an Automake warning.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
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>
|
|
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>
|
|
Refer to setxkbmap.c
Silicon Graphics Computer Systems, Inc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
|
|
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.
|
|
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
|
|
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.
|
|
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>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
|
|
|
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and all gcc 4.3 and sparse warnings.
|
|
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>
|
|
|
|
indent -cbi 0 -nprs -nut -npcs -i4 -bli 0 *.c *.h
|
|
|
|
|
|
|
|
|
|
Makefile.am:31: compiling `setxkbmap.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
|