andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Xdmx.man: Show actual configured XKB defaults instead of old hardcoded values

Browse Source 
Passed through from configure.ac via manpages.am

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Alan Coopersmith 2011-06-11 10:41:48 -07:00
parent acf2173b32
commit 19e3706713
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -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_LAYOUT, ["$XKB_DFLT_LAYOUT"], [Default XKB layout])
AC_DEFINE_UNQUOTED(XKB_DFLT_VARIANT, ["$XKB_DFLT_VARIANT"], [Default XKB variant]) 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_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_LIB='$(top_builddir)/xkb/libxkb.la'
XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'

16
hw/dmx/man/Xdmx.man
View File

@ -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)" initialize the keyboard. For an SGI keyboard, ",xkb,sgi/indy(pc102)"
might be useful. A list of keycodes, symbols, and geometries can be might be useful. A list of keycodes, symbols, and geometries can be
found in found in
.IR /usr/X11R6/lib/X11/xkb . .IR __xkbdir__ .
If this option is not specified, the input device will be queried, If this option is not specified, the input device will be queried,
perhaps using the XKEYBOARD extension. perhaps using the XKEYBOARD extension.
.RE .RE
@ -352,31 +352,31 @@ This option specifies parameters on the command line. Currently, only
parameters dealing with XKEYBOARD configuration are supported. These parameters dealing with XKEYBOARD configuration are supported. These
parameters apply only to the core keyboard. Parameter values are parameters apply only to the core keyboard. Parameter values are
installation-dependent. Please see installation-dependent. Please see
.I /usr/X11R6/lib/X11/xkb .I __xkbdir__
or a similar directory for complete information. or a similar directory for complete information.
.RS .RS
.TP 8 .TP 8
.B XkbRules .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 .sp
.TP 8 .TP 8
.B XkbModel .B XkbModel
Defaults to "pc101". When used with "xfree86" rules, other values may Defaults to "__XKB_DFLT_MODEL__". When used with "xfree86" rules, other values
include "pc102", "pc104", "pc105", "microsoft", and many others. When may include "pc102", "pc104", "microsoft", and many others. When
used with "sun" rules, other values may include "type4" and "type5". used with "sun" rules, other values may include "type4" and "type5".
.sp .sp
.TP 8 .TP 8
.B XkbLayout .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. available.
.sp .sp
.TP 8 .TP 8
.B XkbVariant .B XkbVariant
Defaults to "". Defaults to "__XKB_DFLT_VARIANT__".
.sp .sp
.TP 8 .TP 8
.B XkbOptions .B XkbOptions
Defaults to "". Defaults to "__XKB_DFLT_OPTIONS__".
.RE .RE
.SH "CONFIGURATION FILE GRAMMAR" .SH "CONFIGURATION FILE GRAMMAR"
The following words and tokens are reserved: The following words and tokens are reserved:

5
manpages.am
View File

@ -24,6 +24,11 @@ MAN_SUBSTS += -e 's|__logdir__|$(logdir)|g' \
-e 's|__sysconfdir__|$(sysconfdir)|g' \ -e 's|__sysconfdir__|$(sysconfdir)|g' \
-e 's|__xconfigdir__|$(__XCONFIGDIR__)|g' \ -e 's|__xconfigdir__|$(__XCONFIGDIR__)|g' \
-e 's|__xkbdir__|$(XKB_BASE_DIRECTORY)|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|__bundle_id_prefix__|$(BUNDLE_ID_PREFIX)|g' \
-e 's|__modulepath__|$(DEFAULT_MODULE_PATH)|g' \ -e 's|__modulepath__|$(DEFAULT_MODULE_PATH)|g' \
-e 's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' \ -e 's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' \