From 19e37067131175219eca7d2b11c2ee59af280575 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 11 Jun 2011 10:41:48 -0700 Subject: [PATCH 1/4] Xdmx.man: Show actual configured XKB defaults instead of old hardcoded values Passed through from configure.ac via manpages.am Signed-off-by: Alan Coopersmith Reviewed-by: Matthieu Herrb Reviewed-by: Gaetan Nadon Reviewed-by: Daniel Stone --- 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 145e4c32c..a53ab5038 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 9c8bdea00..df148dd87 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 ea969cc5f..dfd671915 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' \ From c3278f3c1786e66019a39e2612761f74782a48ee Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 11 Jun 2011 10:56:08 -0700 Subject: [PATCH 2/4] Xdmx.man: additional updates to modernize XKB information Signed-off-by: Alan Coopersmith Reviewed-by: Matthieu Herrb Reviewed-by: Gaetan Nadon Reviewed-by: Daniel Stone --- hw/dmx/man/Xdmx.man | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man index df148dd87..652b24fc6 100644 --- a/hw/dmx/man/Xdmx.man +++ b/hw/dmx/man/Xdmx.man @@ -1,4 +1,3 @@ -.\" $XFree86$ .\" .\" Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. .\" All Rights Reserved. @@ -11,7 +10,7 @@ .\" and to permit persons to whom the Software is furnished to do so, .\" subject to the following conditions: .\" -.\" he above copyright notice and this permission notice (including the +.\" The above copyright notice and this permission notice (including the .\" next paragraph) shall be included in all copies or substantial .\" portions of the Software. .\" @@ -141,6 +140,9 @@ 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 __xkbdir__ . +Use of keycodes, symbols and geometries for XKB configuration is +deprecated in favor of the rules, layout, model, variant and options +settings available via the -param command line switch. If this option is not specified, the input device will be queried, perhaps using the XKEYBOARD extension. .RE @@ -361,7 +363,7 @@ Defaults to "__XKB_DFLT_RULES__". Other values may include "sgi" and "sun". .sp .TP 8 .B XkbModel -Defaults to "__XKB_DFLT_MODEL__". When used with "xfree86" rules, other values +Defaults to "__XKB_DFLT_MODEL__". When used with "base" rules, other values may include "pc102", "pc104", "microsoft", and many others. When used with "sun" rules, other values may include "type4" and "type5". .sp From cfbe471b586282aea89f7b4802c051f22301bf59 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 20 Jun 2011 22:06:00 -0700 Subject: [PATCH 3/4] Xdmx.man: convert section references to substituted forms Signed-off-by: Alan Coopersmith Reviewed-by: Gaetan Nadon Reviewed-by: Peter Hutterer --- hw/dmx/man/Xdmx.man | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man index 652b24fc6..ee03539c3 100644 --- a/hw/dmx/man/Xdmx.man +++ b/hw/dmx/man/Xdmx.man @@ -48,7 +48,7 @@ communicates to the back-end X servers using the standard X11 protocol, and standard and/or commonly available X server extensions. .SH OPTIONS In addition to the normal X server options described in the -.I Xserver(1) +.I Xserver(__appmansuffix__) manual page, .I Xdmx accepts the following command line switches: @@ -724,8 +724,10 @@ translated if it was the first core keyboard. .SH FILES .. .SH "SEE ALSO" -.BR DMX "(3X), " X "(__miscmansuffix__), " Xserver "(1), " xdmxconfig "(1), " -.BR vdltodmx "(1), " xfs "(1), " xkbcomp (1) +.BR DMX "(__libmansuffix__), " X "(__miscmansuffix__), " +.BR Xserver "(__appmansuffix__), " xdmxconfig "(__appmansuffix__), " +.BR vdltodmx "(__appmansuffix__), " xfs "(__appmansuffix__), " +.BR xkbcomp (__appmansuffix__) .SH AUTHORS Kevin E. Martin .I , From 47b6ba3204d650393a7255ce2af27b8c018bb586 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 20 Jun 2011 22:17:03 -0700 Subject: [PATCH 4/4] Add xkeyboard-config to See Also of man pages referencing xkb Signed-off-by: Alan Coopersmith Reviewed-by: Peter Hutterer --- hw/dmx/man/Xdmx.man | 2 +- hw/xfree86/man/Xorg.man | 1 + hw/xwin/man/XWin.man | 3 ++- man/Xserver.man | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man index ee03539c3..bbce85608 100644 --- a/hw/dmx/man/Xdmx.man +++ b/hw/dmx/man/Xdmx.man @@ -727,7 +727,7 @@ translated if it was the first core keyboard. .BR DMX "(__libmansuffix__), " X "(__miscmansuffix__), " .BR Xserver "(__appmansuffix__), " xdmxconfig "(__appmansuffix__), " .BR vdltodmx "(__appmansuffix__), " xfs "(__appmansuffix__), " -.BR xkbcomp (__appmansuffix__) +.BR xkbcomp "(__appmansuffix__), " xkeyboard-config "(__miscmansuffix__)" .SH AUTHORS Kevin E. Martin .I , diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man index 6fa334cc3..c89b5ee68 100644 --- a/hw/xfree86/man/Xorg.man +++ b/hw/xfree86/man/Xorg.man @@ -574,6 +574,7 @@ Initial access control list for display .SH "SEE ALSO" X(__miscmansuffix__), Xserver(__appmansuffix__), xdm(__appmansuffix__), xinit(__appmansuffix__), __xconfigfile__(__filemansuffix__), xvidtune(__appmansuffix__), +xkeyboard-config (__miscmansuffix__), apm(__drivermansuffix__), ati(__drivermansuffix__), chips(__drivermansuffix__), diff --git a/hw/xwin/man/XWin.man b/hw/xwin/man/XWin.man index aad29cf25..7975fd30d 100644 --- a/hw/xwin/man/XWin.man +++ b/hw/xwin/man/XWin.man @@ -372,7 +372,8 @@ Need some examples .SH "SEE ALSO" -X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), XWinrc(__filemansuffix__), setxkbmap(1) +X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1), XWinrc(__filemansuffix__), +setxkbmap(1), xkeyboard-config (__miscmansuffix__). .SH BUGS diff --git a/man/Xserver.man b/man/Xserver.man index b7259490d..f74391212 100644 --- a/man/Xserver.man +++ b/man/Xserver.man @@ -561,6 +561,8 @@ Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1), \fIxfs\fP(1), \fIxlsfonts\fP(1), \fIxfontsel\fP(1), \fIxfd\fP(1), .I "X Logical Font Description Conventions" .PP +Keyboards: \fIxkeyboard-config\fP(__miscmansuffix__) +.PP Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1), \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1), .I "Security Extension Specification"