[PATCH 1/2] Xdmx.man: Show actual configured XKB defaults instead of old hardcoded values
Gaetan Nadon
memsize at videotron.ca
Sat Jun 11 14:09:36 PDT 2011
On Sat, 2011-06-11 at 10:59 -0700, Alan Coopersmith wrote:
> Passed through from configure.ac via manpages.am
>
> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
> ---
> configure.ac | 5 +++++
> hw/dmx/man/Xdmx.man | 16 ++++++++--------
> manpages.am | 5 +++++
> 3 files changed, 18 insertions(+), 8 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 22566c9..6c6d721 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1203,6 +1203,11 @@ AC_DEFINE_UNQUOTED(XKB_DFLT_MODEL, ["$XKB_DFLT_MODEL"], [Default XKB model])
> AC_DEFINE_UNQUOTED(XKB_DFLT_LAYOUT, ["$XKB_DFLT_LAYOUT"], [Default XKB layout])
> AC_DEFINE_UNQUOTED(XKB_DFLT_VARIANT, ["$XKB_DFLT_VARIANT"], [Default XKB variant])
> AC_DEFINE_UNQUOTED(XKB_DFLT_OPTIONS, ["$XKB_DFLT_OPTIONS"], [Default XKB options])
> +AC_SUBST([XKB_DFLT_RULES])
> +AC_SUBST([XKB_DFLT_MODEL])
> +AC_SUBST([XKB_DFLT_LAYOUT])
> +AC_SUBST([XKB_DFLT_VARIANT])
> +AC_SUBST([XKB_DFLT_OPTIONS])
>
> XKB_LIB='$(top_builddir)/xkb/libxkb.la'
> XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
> diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man
> index 9c8bdea..df148dd 100644
> --- a/hw/dmx/man/Xdmx.man
> +++ b/hw/dmx/man/Xdmx.man
> @@ -140,7 +140,7 @@ the "xfree86" keycodes and the "pc104" symbols should be used to
> initialize the keyboard. For an SGI keyboard, ",xkb,sgi/indy(pc102)"
> might be useful. A list of keycodes, symbols, and geometries can be
> found in
> -.IR /usr/X11R6/lib/X11/xkb .
> +.IR __xkbdir__ .
> If this option is not specified, the input device will be queried,
> perhaps using the XKEYBOARD extension.
> .RE
> @@ -352,31 +352,31 @@ This option specifies parameters on the command line. Currently, only
> parameters dealing with XKEYBOARD configuration are supported. These
> parameters apply only to the core keyboard. Parameter values are
> installation-dependent. Please see
> -.I /usr/X11R6/lib/X11/xkb
> +.I __xkbdir__
> or a similar directory for complete information.
> .RS
> .TP 8
> .B XkbRules
> -Defaults to "xfree86". Other values may include "sgi" and "sun".
> +Defaults to "__XKB_DFLT_RULES__". Other values may include "sgi" and "sun".
> .sp
> .TP 8
> .B XkbModel
> -Defaults to "pc101". When used with "xfree86" rules, other values may
> -include "pc102", "pc104", "pc105", "microsoft", and many others. When
> +Defaults to "__XKB_DFLT_MODEL__". When used with "xfree86" rules, other values
> +may include "pc102", "pc104", "microsoft", and many others. When
> used with "sun" rules, other values may include "type4" and "type5".
> .sp
> .TP 8
> .B XkbLayout
> -Defaults to "us". Other country codes and "dvorak" are usually
> +Defaults to "__XKB_DFLT_LAYOUT__". Other country codes and "dvorak" are usually
> available.
> .sp
> .TP 8
> .B XkbVariant
> -Defaults to "".
> +Defaults to "__XKB_DFLT_VARIANT__".
> .sp
> .TP 8
> .B XkbOptions
> -Defaults to "".
> +Defaults to "__XKB_DFLT_OPTIONS__".
> .RE
> .SH "CONFIGURATION FILE GRAMMAR"
> The following words and tokens are reserved:
> diff --git a/manpages.am b/manpages.am
> index ea969cc..dfd6719 100644
> --- a/manpages.am
> +++ b/manpages.am
> @@ -24,6 +24,11 @@ MAN_SUBSTS += -e 's|__logdir__|$(logdir)|g' \
> -e 's|__sysconfdir__|$(sysconfdir)|g' \
> -e 's|__xconfigdir__|$(__XCONFIGDIR__)|g' \
> -e 's|__xkbdir__|$(XKB_BASE_DIRECTORY)|g' \
> + -e 's|__XKB_DFLT_RULES__|$(XKB_DFLT_RULES)|g' \
> + -e 's|__XKB_DFLT_MODEL__|$(XKB_DFLT_MODEL)|g' \
> + -e 's|__XKB_DFLT_LAYOUT__|$(XKB_DFLT_LAYOUT)|g' \
> + -e 's|__XKB_DFLT_VARIANT__|$(XKB_DFLT_VARIANT)|g' \
> + -e 's|__XKB_DFLT_OPTIONS__|$(XKB_DFLT_OPTIONS)|g' \
> -e 's|__bundle_id_prefix__|$(BUNDLE_ID_PREFIX)|g' \
> -e 's|__modulepath__|$(DEFAULT_MODULE_PATH)|g' \
> -e 's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' \
Exactly what it was designed for.
Reviewed-by: Gaetan Nadon <memsize at videotron.ca>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110611/cd9e1985/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110611/cd9e1985/attachment.pgp>
More information about the xorg-devel
mailing list