xorg-server: Changes to 'upstream-experimental'
Xext/Makefile.am | 1
composite/compext.c | 2
configure.ac | 10
dix/devices.c | 1
dix/events.c | 7
fb/Makefile.am | 4
fb/fb.h | 4
fb/fbedge.c | 314 -------
fb/fbedgeimp.h | 145 ---
fb/fbpict.c | 243 +++---
fb/fbpict.h | 12
fb/fbtrap.c | 105 --
hw/kdrive/linux/agp.c | 2
hw/xfree86/common/compiler.h | 2
hw/xfree86/common/xf86xv.c | 42 -
hw/xfree86/doc/man/xorg.conf.man.pre | 1290 ++++++++++++++++++--------------
hw/xfree86/os-support/bsd/i386_video.c | 5
hw/xfree86/os-support/bus/linuxPci.c | 4
hw/xfree86/os-support/linux/lnx_video.c | 2
hw/xnest/Xnest.man.pre | 596 +++++++++-----
hw/xwin/winmultiwindowclass.c | 2
include/servermd.h | 10
os/utils.c | 14
randr/Makefile.am | 10
randr/randr.c | 3
render/renderedge.c | 119 --
render/renderedge.h | 15
27 files changed, 1356 insertions(+), 1608 deletions(-)
New commits:
commit ba0b7d47ab0c24d5a29228f8af583044060464bd
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 28 21:57:04 2007 -0400
Fix for GNU/kFreeBSD
diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c
index c2ae625..4fb0cb3 100644
--- a/hw/kdrive/linux/agp.c
+++ b/hw/kdrive/linux/agp.c
@@ -65,7 +65,7 @@ of the copyright holder.
#include <linux/agpgart.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/ioctl.h>
#include <sys/agpio.h>
#endif
commit 2267bf48b385c93243e26c3bb84ebb04c7fdb39f
Author: Bastian Blank <waldi@debian.org>
Date: Mon May 28 21:55:05 2007 -0400
Fixes for s390
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index ea995ed..becd3da 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -1365,7 +1365,7 @@ do { \
# define write_mem_barrier() /* NOP */
# if !defined(__SUNPRO_C)
-# if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__)
+# if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__)
# ifdef GCCUSESGAS
/*
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index 4b58046..02a1310 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -567,7 +567,7 @@ xf86EnableIO(void)
#endif
}
close(fd);
-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__)
if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV)
ErrorF("xf86EnableIOPorts: no I/O ports found\n");
commit 857ddbb660a21cad1c16f4fb2dc8a904d6655304
Author: Eugene Konev <ejka@imfi.kspu.ru>
Date: Mon May 28 21:53:02 2007 -0400
Allow configurable serverconfigdir for security policy location
Allow the location of the SERVERCONFIGdir variable to be defined at
compile-time. This allows us to specify where the security policy will be
located (Debian uses this to put it in /etc). The default is to the
previous location.
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 6ea3d74..d0d23b7 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -34,7 +34,6 @@ MODULE_SRCS = \
xcmisc.c
# Extra configuration files ship with some extensions
-SERVERCONFIGdir = $(libdir)/xserver
SERVERCONFIG_DATA =
# Optional sources included if extension enabled by configure.ac rules
diff --git a/configure.ac b/configure.ac
index 37199cf..7ff712f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -465,6 +465,9 @@ AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to
AC_ARG_WITH(rgb-path, AS_HELP_STRING([--with-rgb-path=PATH], [Path to RGB database (default: ${datadir}/X11/rgb)]),
[ RGBPATH="$withval" ],
[ RGBPATH="${datadir}/X11/rgb" ])
+AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH], [Path to server config (default: ${libdir}/xserver)]),
+ [ SERVERCONFIG="$withval" ],
+ [ SERVERCONFIG="${libdir}/xserver" ])
APPLE_APPLICATIONS_DIR="${bindir}/Applications"
AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], [Path to the Applications directory (default: ${bindir}/Applications)]),
[ APPLE_APPLICATIONS_DIR="${withval}" ].
@@ -938,6 +941,7 @@ VENDOR_MAN_VERSION="Version ${VENDOR_VERSION_STRING}"
AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
+AC_DEFINE_DIR(SERVERCONFIGdir, SERVERCONFIG, [Server config path])
AC_DEFINE_DIR(BASE_FONT_PATH, FONTDIR, [Default base font path])
AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
commit 78d01d1008973899d931ef44b47d5f0b5f220b0d
Author: Gerhard Tonn <gt@debian.org>
Date: Mon May 28 21:48:58 2007 -0400
Miscellaneous fixes for S/390.
diff --git a/include/servermd.h b/include/servermd.h
index e6ca11e..4f32a9d 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -515,7 +515,15 @@ SOFTWARE.
#define GLYPHPADBYTES 4
#define GETLEFTBITS_ALIGNMENT 1
#endif
-
+
+/* linux on IBM S/390 */
+#if defined (linux) && defined (__s390__)
+#define IMAGE_BYTE_ORDER MSBFirst
+#define BITMAP_BIT_ORDER MSBFirst
+#define GLYPHPADBYTES 4
+#define GETLEFTBITS_ALIGNMENT 1
+#endif /* linux/s390 */
+
/* size of buffer to use with GetImage, measured in bytes. There's obviously
* a trade-off between the amount of stack (or whatever ALLOCATE_LOCAL gives
* you) used and the number of times the ddx routine has to be called.
commit d98bd4bf908c2c51fcfd3a4c3230de17f2567244
Author: Branden Robinson <branden@debian.org>
Date: Mon May 28 21:44:59 2007 -0400
Overhaul xorg.conf manpage
Major stylistic cleanups, greatly expanded cross-reference ("SEE ALSO")
section and some typo fixes.
This patch by Branden Robinson. Forward-ported by Fabio M. Di Nitto.
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index f2cb5ef..4103974 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -3,7 +3,7 @@
.ds q \N'34'
.TH __xconfigfile__ __filemansuffix__ __vendorversion__
.SH NAME
-__xconfigfile__ - Configuration File for __xservername__
+__xconfigfile__ \- configuration File for __xservername__ X server
.SH INTRODUCTION
.B __xservername__
supports several mechanisms for supplying/obtaining configuration and
@@ -21,9 +21,10 @@ manual page.
.SH DESCRIPTION
.B __xservername__
uses a configuration file called
-.B __xconfigfile__
-for its initial setup. This configuration file is searched for in the
-following places when the server is started as a normal user:
+.I __xconfigfile__
+for its initial setup.
+This configuration file is searched for in the following places when the
+server is started as a normal user:
.PP
.RS 4
.nf
@@ -31,30 +32,31 @@ following places when the server is started as a normal user:
.IR __projectroot__/etc/X11/ <cmdline>
.IB /etc/X11/ $XORGCONFIG
.IB __projectroot__/etc/X11/ $XORGCONFIG
-.I /etc/X11/__xconfigfile__-4
+.I /etc/X11/__xconfigfile__\-4
.I /etc/X11/__xconfigfile__
.I /etc/__xconfigfile__
.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
-.I __projectroot__/etc/X11/__xconfigfile__-4
+.I __projectroot__/etc/X11/__xconfigfile__\-4
.I __projectroot__/etc/X11/__xconfigfile__
.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
-.I __projectroot__/lib/X11/__xconfigfile__-4
+.I __projectroot__/lib/X11/__xconfigfile__\-4
.I __projectroot__/lib/X11/__xconfigfile__
.fi
.RE
.PP
where
.I <cmdline>
-is a relative path (with no ".." components) specified with the
+is a relative path (with no \(lq..\(rq components) specified with the
.B \-config
command line option,
.B $XORGCONFIG
-is the relative path (with no ".." components) specified by that
+is the relative path (with no \(lq..\(rq components) specified by that
environment variable, and
.I <hostname>
-is the machine's hostname as reported by gethostname(3).
+is the machine's hostname as reported by
+.BR gethostname (__oslibmansuffix__).
.PP
-When the __xservername__ server is started by the "root" user, the config file
+When the __xservername__ server is started by the \(lqroot\(rq user, the config file
search locations are as follows:
.PP
.RS 4
@@ -66,14 +68,14 @@ search locations are as follows:
.IB /etc/X11/ $XORGCONFIG
.IB __projectroot__/etc/X11/ $XORGCONFIG
.BI $HOME /__xconfigfile__
-.I /etc/X11/__xconfigfile__-4
+.I /etc/X11/__xconfigfile__\-4
.I /etc/X11/__xconfigfile__
.I /etc/__xconfigfile__
.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
-.I __projectroot__/etc/X11/__xconfigfile__-4
+.I __projectroot__/etc/X11/__xconfigfile__\-4
.I __projectroot__/etc/X11/__xconfigfile__
.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
-.I __projectroot__/lib/X11/__xconfigfile__-4
+.I __projectroot__/lib/X11/__xconfigfile__\-4
.I __projectroot__/lib/X11/__xconfigfile__
.fi
.RE
@@ -90,13 +92,13 @@ environment variable (absolute or relative),
is the path specified by that environment variable (usually the home
directory), and
.I <hostname>
-is the machine's hostname as reported by gethostname(3).
+is the machine's hostname as reported by
+.BR gethostname (__oslibmansuffix__).
.PP
The
-.B __xconfigfile__
-file is composed of a number of sections which may be present in any
-order. Each section has
-the form:
+.I __xconfigfile__
+file is composed of a number of sections which may be present in any order.
+Each section has the form:
.PP
.RS 4
.nf
@@ -121,13 +123,14 @@ The section names are:
.BR "Modes " "Video modes descriptions"
.BR "Screen " "Screen configuration"
.BR "ServerLayout " "Overall layout"
-.BR "DRI " "DRI-specific configuration"
-.BR "Vendor " "Vendor-specific configuration"
+.BR "DRI " "DRI\-specific configuration"
+.BR "Vendor " "Vendor\-specific configuration"
.fi
.RE
.PP
The following obsolete section names are still recognised for compatibility
-purposes. In new config files, the
+purposes.
+In new config files, the
.B InputDevice
section should be used instead.
.PP
@@ -144,35 +147,38 @@ section is no longer recognised.
.PP
The
.B ServerLayout
-sections are at the highest level. They bind together the input and
-output devices that will be used in a session. The input devices
-are described in the
+sections are at the highest level.
+They bind together the input and output devices that will be used in a session.
+The input devices are described in the
.B InputDevice
-sections. Output devices usually consist of multiple independent
-components (e.g., a graphics board and a monitor). These multiple
-components are bound together in the
+sections.
+Output devices usually consist of multiple independent components (e.g.,
+a graphics board and a monitor).
+These multiple components are bound together in the
.B Screen
sections, and it is these that are referenced by the
.B ServerLayout
-section. Each
+section.
+Each
.B Screen
-section binds together a graphics board and a monitor. The graphics
-boards are described in the
+section binds together a graphics board and a monitor.
+The graphics boards are described in the
.B Device
sections, and the monitors are described in the
.B Monitor
sections.
.PP
-Config file keywords are case-insensitive, and "_" characters are
-ignored. Most strings (including
+Config file keywords are case\-insensitive, and \(lq_\(rq characters are
+ignored.
+Most strings (including
.B Option
names) are also case-insensitive, and insensitive to white space and
-"_" characters.
+\(lq_\(rq characters.
.PP
-Each config file entry usually takes up a single line in the file.
-They consist of a keyword, which is possibly followed by one or
-more arguments, with the number and types of the arguments depending
-on the keyword. The argument types are:
+Each config file entry usually takes up a single line in the file. They
+consist of a keyword, which is possibly followed by one or more arguments,
+with the number and types of the arguments depending on the keyword.
+The argument types are:
.PP
.RS 4
.nf
@@ -182,17 +188,18 @@ on the keyword. The argument types are:
.fi
.RE
.PP
-Note: hex integer values must be prefixed with "0x", and octal values
-with "0".
+Note: hex integer values must be prefixed with \(lq0x\(rq, and octal values
+with \(lq0\(rq.
.PP
A special keyword called
.B Option
-may be used to provide free-form data to various components of the server.
+may be used to provide free\-form data to various components of the server.
The
.B Option
-keyword takes either one or two string arguments. The first is the option
-name, and the optional second argument is the option value. Some commonly
-used option value types include:
+keyword takes either one or two string arguments.
+The first is the option name, and the optional second argument is the
+option value.
+Some commonly used option value types include:
.PP
.RS 4
.nf
@@ -209,8 +216,8 @@ Note that
.B Option
values, not just strings, must be enclosed in quotes.
.PP
-Boolean options may optionally have a value specified. When no value
-is specified, the option's value is
+Boolean options may optionally have a value specified.
+When no value is specified, the option's value is
.BR TRUE .
The following boolean option values are recognised as
.BR TRUE :
@@ -263,30 +270,35 @@ When the unit name is omitted, the correct units will be determined from
the value and the expectations of the appropriate range of the value.
It is recommended that the units always be specified when using frequency
option values to avoid any errors in determining the value.
-.SH FILES SECTION
+.SH "FILES SECTION"
The
.B Files
section is used to specify some path names required by the server.
-Some of these paths can also be set from the command line (see Xserver(__appmansuffix__)
-and __xservername__(__appmansuffix__)). The command line settings override the values specified
-in the config file. The
+Some of these paths can also be set from the command line (see
+.BR Xserver (__appmansuffix__)
+and
+.BR __xservername__ (__appmansuffix__)).
+The command line settings override the values specified in the config
+file.
+The
.B Files
section is optional, as are all of the entries that may appear in it.
.PP
The entries that can appear in this section are:
.TP 7
.BI "FontPath \*q" path \*q
-sets the search path for fonts. This path is a comma separated list of
-font path elements which the __xservername__ server searches for font databases.
+sets the search path for fonts.
+This path is a comma separated list of font path elements which the __xservername__
+server searches for font databases.
Multiple
.B FontPath
entries may be specified, and they will be concatenated to build up the
fontpath used by the server. Font path elements may be either absolute
-directory paths, or a font server identifier. Font server identifiers
-have the form:
+directory paths, or a font server identifier.
+Font server identifiers have the form:
.PP
.RS 11
-.IR <trans> / <hostname> : <port-number>
+.IR <trans> / <hostname> : <port\-number>
.RE
.PP
.RS 7
@@ -294,16 +306,16 @@ where
.I <trans>
is the transport type to use to connect to the font server (e.g.,
.B unix
-for UNIX-domain sockets or
+for UNIX\-domain sockets or
.B tcp
for a TCP/IP connection),
.I <hostname>
is the hostname of the machine running the font server, and
-.I <port-number>
+.I <port\-number>
is the port number that the font server is listening on (usually 7100).
.PP
When this entry is not specified in the config file, the server falls back
-to the compiled-in default font path, which contains the following
+to the compiled\-in default font path, which contains the following
font path elements:
.PP
.RS 4
@@ -338,7 +350,7 @@ font path when the server starts up.
.BI "RGBPath \*q" path \*q
sets the path name for the RGB color database.
When this entry is not specified in the config file, the server falls back
-to the compiled-in default RGB path, which is:
+to the compiled\-in default RGB path, which is:
.PP
.RS 11
.I __projectroot__/share/X11/rgb
@@ -350,9 +362,10 @@ is added to this path if the server was compiled to use text rather than
binary format RGB color databases.
.TP 7
.BI "ModulePath \*q" path \*q
-sets the search path for loadable __xservername__ server modules. This path is
-a comma separated list of directories which the __xservername__ server searches
-for loadable modules loading in the order specified. Multiple
+sets the search path for loadable __xservername__ server modules.
+This path is a comma separated list of directories which the __xservername__ server
+searches for loadable modules loading in the order specified.
+Multiple
.B ModulePath
entries may be specified, and they will be concatenated to build the
module search path used by the server.
@@ -360,8 +373,8 @@ module search path used by the server.
.ig
.TP 7
.BI "LogFile \*q" path \*q
-sets the name of the __xservername__ server log file. The default log file name
-is
+sets the name of the __xservername__ server log file.
+The default log file name is
.PP
.RS 11
.RI __logdir__/__xservername__. <n> .log
@@ -372,15 +385,18 @@ where
.I <n>
is the display number for the __xservername__ server.
..
-.SH SERVERFLAGS SECTION
+.SH "SERVERFLAGS SECTION"
In addition to options specific to this section (described below), the
.B ServerFlags
section is used to specify some global
-__xservername__ server options. All of the entries in this section are
+__xservername__ server options.
+All of the entries in this section are
.BR Options ,
although for compatibility purposes some of the old style entries are
-still recognised. Those old style entries are not documented here, and
-using them is discouraged. The
+still recognised.
+Those old style entries are not documented here, and using them is
+discouraged.
+The
.B ServerFlags
section is optional, as are the entries that may be specified in it.
.PP
@@ -392,11 +408,12 @@ may be overridden by
.B Options
specified in the active
.B ServerLayout
-section. Options with command line equivalents are overridden when their
-command line equivalent is used. The options recognised by this section
-are:
+section.
+Options with command line equivalents are overridden when their command
+line equivalent is used.
+The options recognised by this section are:
.TP 7
-.BI "Option \*qDefaultServerLayout\*q \*q" layout-id \*q
+.BI "Option \*qDefaultServerLayout\*q \*q" layout\-id \*q
This specifies the default
.B ServerLayout
section to use in the absence of the
@@ -404,148 +421,185 @@ section to use in the absence of the
command line option.
.TP 7
.BI "Option \*qNoTrapSignals\*q \*q" boolean \*q
-This prevents the __xservername__ server from trapping a range of unexpected
-fatal signals and exiting cleanly. Instead, the __xservername__ server will die
-and drop core where the fault occurred. The default behaviour is
-for the __xservername__ server to exit cleanly, but still drop a core file. In
-general you never want to use this option unless you are debugging
-an __xservername__ server problem and know how to deal with the consequences.
+This prevents the __xservername__ server from trapping a range of unexpected fatal
+signals and exiting cleanly.
+Instead, the __xservername__ server will die and drop core where the fault occurred.
+The default behaviour is for the __xservername__ server to exit cleanly, but still drop a
+core file.
+In general you never want to use this option unless you are debugging an __xservername__
+server problem and know how to deal with the consequences.
.TP 7
.BI "Option \*qDontVTSwitch\*q \*q" boolean \*q
This disallows the use of the
.BI Ctrl+Alt+F n
sequence (where
.RI F n
-refers to one of the numbered function keys). That sequence is normally
-used to switch to another \*qvirtual terminal\*q on operating systems
-that have this feature. When this option is enabled, that key sequence has
-no special meaning and is passed to clients. Default: off.
+refers to one of the numbered function keys).
+That sequence is normally used to switch to another \*qvirtual terminal\*q
+on operating systems that have this feature.
+When this option is enabled, that key sequence has no special meaning and
+is passed to clients.
+Default: off.
.TP 7
.BI "Option \*qDontZap\*q \*q" boolean \*q
This disallows the use of the
.B Ctrl+Alt+Backspace
-sequence. That sequence is normally used to terminate the __xservername__ server.
-When this option is enabled, that key sequence has no special meaning
-and is passed to clients. Default: off.
+sequence.
+That sequence is normally used to terminate the __xservername__ server.
+When this option is enabled, that key sequence has no special meaning and
+is passed to clients.
+Default: off.
.TP 7
.BI "Option \*qDontZoom\*q \*q" boolean \*q
This disallows the use of the
-.B Ctrl+Alt+Keypad-Plus
+.B Ctrl+Alt+Keypad\-Plus
and
-.B Ctrl+Alt+Keypad-Minus
-sequences. These sequences allows you to switch between video modes.
+.B Ctrl+Alt+Keypad\-Minus
+sequences.
+These sequences allows you to switch between video modes.
When this option is enabled, those key sequences have no special meaning
-and are passed to clients. Default: off.
+and are passed to clients.
+Default: off.
.TP 7
.BI "Option \*qDisableVidModeExtension\*q \*q" boolean \*q
This disables the parts of the VidMode extension used by the xvidtune client
-that can be used to change the video modes. Default: the VidMode extension
-is enabled.
+that can be used to change the video modes.
+Default: the VidMode extension is enabled.
.TP 7
.BI "Option \*qAllowNonLocalXvidtune\*q \*q" boolean \*q
This allows the xvidtune client (and other clients that use the VidMode
-extension) to connect from another host. Default: off.
+extension) to connect from another host.
+Default: off.
.TP 7
.BI "Option \*qDisableModInDev\*q \*q" boolean \*q
-This disables the parts of the __xservername__-Misc extension that can be used to
-modify the input device settings dynamically. Default: that functionality
-is enabled.
+This disables the parts of the __xservername__\-Misc extension that can be used to
+modify the input device settings dynamically.
+Default: that functionality is enabled.
.TP 7
.BI "Option \*qAllowNonLocalModInDev\*q \*q" boolean \*q
This allows a client to connect from another host and change keyboard
-and mouse settings in the running server. Default: off.
+and mouse settings in the running server.
+Default: off.
.TP 7
.BI "Option \*qAllowMouseOpenFail\*q \*q" boolean \*q
This allows the server to start up even if the mouse device can't be
-opened/initialised. Default: false.
+opened/initialised.
+Default: false.
.TP 7
.BI "Option \*qVTInit\*q \*q" command \*q
Runs
.I command
after the VT used by the server has been opened.
-The command string is passed to "/bin/sh -c", and is run with the
-real user's id with stdin and stdout set to the VT. The purpose
-of this option is to allow system dependent VT initialisation
-commands to be run. This option should rarely be needed. Default: not set.
+The command string is passed to \*q/bin/sh \-c\*q, and is run with the real
+user's id with stdin and stdout set to the VT.
+The purpose of this option is to allow system dependent VT initialisation
+commands to be run.
+This option should rarely be needed.
+Default: not set.
.TP 7
.BI "Option \*qVTSysReq\*q \*q" boolean \*q
-enables the SYSV-style VT switch sequence for non-SYSV systems
-which support VT switching. This sequence is
-.B Alt-SysRq
-followed
-by a function key
+enables the SYSV\-style VT switch sequence for non\-SYSV systems
+which support VT switching.
+This sequence is
+.B Alt\-SysRq
+followed by a function key
.RB ( Fn ).
This prevents the __xservername__ server trapping the
keys used for the default VT switch sequence, which means that clients can
-access them. Default: off.
+access them.
+Default: off.
.TP 7
.BI "Option \*qXkbDisable\*q \*q" boolean \*q
-disable/enable the XKEYBOARD extension. The \-kb command line
-option overrides this config file option. Default: XKB is enabled.
+disable/enable the XKEYBOARD extension.
+The \-kb command line option overrides this config file option.
+Default: XKB is enabled.
.\" The following four options are "undocumented".
.ig
.TP 7
.BI "Option \*qPciProbe1\*q"
-Use PCI probe method 1. Default: set.
+Use PCI probe method 1.
+Default: set.
.TP 7
.BI "Option \*qPciProbe2\*q"
-Use PCI probe method 2. Default: not set.
+Use PCI probe method 2.
+Default: not set.
.TP 7
.BI "Option \*qPciForceConfig1\*q"
-Force the use PCI config type 1. Default: not set.
+Force the use PCI config type 1.
+Default: not set.
.TP 7
.BI "Option \*qPciForceConfig2\*q"
-Force the use PCI config type 2. Default: not set.
+Force the use PCI config type 2.
+Default: not set.
..
.TP 7
.BI "Option \*qBlankTime\*q \*q" time \*q
-sets the inactivity timeout for the blanking phase of the screensaver.
+sets the inactivity timeout for the
+.B blank
+phase of the screensaver.
.I time
-is in minutes. This is equivalent to the __xservername__ server's `-s' flag,
-and the value can be changed at run-time with xset(__appmansuffix__). Default: 10
-minutes.
+is in minutes.
+This is equivalent to the __xservername__ server's
+.B \-s
+flag, and the value can be changed at run\-time with
+.BR xset(__appmansuffix__).
+Default: 10 minutes.
.TP 7
.BI "Option \*qStandbyTime\*q \*q" time \*q
-sets the inactivity timeout for the "standby" phase of DPMS mode.
+sets the inactivity timeout for the
+.B standby
+phase of DPMS mode.
.I time
-is in minutes, and the value can be changed at run-time with xset(__appmansuffix__).
-Default: 20 minutes. This is only suitable for VESA DPMS compatible
-monitors, and may not be supported by all video drivers. It is only
-enabled for screens that have the
+is in minutes, and the value can be changed at run\-time with
+.BR xset(__appmansuffix__).
+Default: 20 minutes.
+This is only suitable for VESA DPMS compatible monitors, and may not be
+supported by all video drivers.
+It is only enabled for screens that have the
.B \*qDPMS\*q
option set (see the MONITOR section below).
.TP 7
.BI "Option \*qSuspendTime\*q \*q" time \*q
-sets the inactivity timeout for the "suspend" phase of DPMS mode.
+sets the inactivity timeout for the
+.B suspend
+phase of DPMS mode.
.I time
-is in minutes, and the value can be changed at run-time with xset(__appmansuffix__).
-Default: 30 minutes. This is only suitable for VESA DPMS compatible
-monitors, and may not be supported by all video drivers. It is only
-enabled for screens that have the
+is in minutes, and the value can be changed at run\-time with
+.BR xset(__appmansuffix__).
+Default: 30 minutes.
+This is only suitable for VESA DPMS compatible monitors, and may not be
+supported by all video drivers.
+It is only enabled for screens that have the
.B \*qDPMS\*q
option set (see the MONITOR section below).
.TP 7
.BI "Option \*qOffTime\*q \*q" time \*q
-sets the inactivity timeout for the "off" phase of DPMS mode.
+sets the inactivity timeout for the
+.B off
+phase of DPMS mode.
.I time
-is in minutes, and the value can be changed at run-time with xset(__appmansuffix__).
-Default: 40 minutes. This is only suitable for VESA DPMS compatible
-monitors, and may not be supported by all video drivers. It is only
-enabled for screens that have the
+is in minutes, and the value can be changed at run\-time with
+.BR xset(__appmansuffix__).
+Default: 40 minutes.
+This is only suitable for VESA DPMS compatible monitors, and may not be
+supported by all video drivers.
+It is only enabled for screens that have the
.B \*qDPMS\*q
option set (see the MONITOR section below).
.TP 7
.BI "Option \*qPixmap\*q \*q" bpp \*q
-This sets the pixmap format to use for depth 24. Allowed values for
+This sets the pixmap format to use for depth 24.
+Allowed values for
.I bpp
-are 24 and 32. Default: 32 unless driver constraints don't allow this
-(which is rare). Note: some clients don't behave well when this value
-is set to 24.
+are 24 and 32.
+Default: 32 unless driver constraints don't allow this (which is rare).
+Note: some clients don't behave well when this value is set to 24.
.TP 7
.BI "Option \*qPC98\*q \*q" boolean \*q
-Specify that the machine is a Japanese PC-98 machine. This should not
-be enabled for anything other than the Japanese-specific PC-98
-architecture. Default: auto-detected.
+Specify that the machine is a Japanese PC\-98 machine.
+This should not be enabled for anything other than the Japanese\-specific
+PC\-98 architecture.
+Default: auto\-detected.
.\" Doubt this should be documented.
.ig
.TP 7
@@ -555,48 +609,54 @@ Default: 0.
..
.TP 7
.BI "Option \*qNoPM\*q \*q" boolean \*q
-Disables something to do with power management events. Default: PM
-enabled on platforms that support it.
+Disables something to do with power management events.
+Default: PM enabled on platforms that support it.
.TP 7
.BI "Option \*qXinerama\*q \*q" boolean \*q
-enable or disable XINERAMA extension. Default is disabled.
+enable or disable XINERAMA extension.
+Default is disabled.
.TP 7
.BI "Option \*qAllowDeactivateGrabs\*q \*q" boolean \*q
This option enables the use of the
-.B Ctrl+Alt+Keypad-Divide
-key sequence to deactivate any active keyboard and mouse grabs. Default:
-off.
+.B Ctrl+Alt+Keypad\-Divide
+key sequence to deactivate any active keyboard and mouse grabs.
+Default: off.
.TP 7
.BI "Option \*qAllowClosedownGrabs\*q \*q" boolean \*q
This option enables the use of the
-.B Ctrl+Alt+Keypad-Multiply
-key sequence to kill clients with an active keyboard or mouse grab as
-well as killing any application that may have locked the server, normally
-using the XGrabServer(__libmansuffix__) Xlib function. Default: off.
+.B Ctrl+Alt+Keypad\-Multiply
+key sequence to kill clients with an active keyboard or mouse grab as well
+as killing any application that may have locked the server, normally using
+the
+.BR XGrabServer(__libmansuffix__)
+Xlib function.
+Default: off.
.br
Note that the options
-.BI AllowDeactivateGrabs
+.B AllowDeactivateGrabs
and
-.BI AllowClosedownGrabs
+.B AllowClosedownGrabs
will allow users to remove the grab used by screen saver/locker programs.
-An API was written to such cases. If you enable this option, make sure
-your screen saver/locker is updated.
+An API was written to such cases.
+If you enable this option, make sure your screen saver/locker is updated.
+Default: off.
.TP 7
.BI "Option \*qHandleSpecialKeys\*q \*q" when \*q
This option controls when the server uses the builtin handler to process
special key combinations (such as
.BR Ctrl+Alt+Backspace ).
-Normally the XKEYBOARD extension keymaps will provide mappings for each
-of the special key combinations, so the builtin handler is not needed
-unless the XKEYBOARD extension is disabled. The value of
+Normally the XKEYBOARD extension keymaps will provide mappings for each of
+the special key combinations, so the builtin handler is not needed unless
+the XKEYBOARD extension is disabled.
+The value of
.I when
can be
.BR Always ,
.BR Never ,
or
.BR WhenNeeded .
-Default: Use the builtin handler only if needed. The server will scan
-the keymap for a mapping to the
+Default: Use the builtin handler only if needed.
+The server will scan the keymap for a mapping to the
.B Terminate
action and, if found, use XKEYBOARD for processing actions, otherwise
the builtin handler will be used.
@@ -612,21 +672,22 @@ default.
.BI "Option \*qIgnoreABI\*q \*q" boolean \*q
Allow modules built for a different, potentially incompatible version of
the X server to load. Disabled by default.
-.SH MODULE SECTION
+.SH "MODULE SECTION"
The
.B Module
section is used to specify which __xservername__ server modules should be loaded.
This section is ignored when the __xservername__ server is built in static form.
The types of modules normally loaded in this section are __xservername__ server
-extension modules, and font rasteriser modules. Most other module types
-are loaded automatically when they are needed via other mechanisms.
+extension modules, and font rasteriser modules.
+Most other module types are loaded automatically when they are needed via
+other mechanisms.
The
.B Module
section is optional, as are all of the entries that may be specified in
it.
.PP
-Entries in this section may be in two forms. The first and most commonly
-used form is an entry that uses the
+Entries in this section may be in two forms.
+The first and most commonly used form is an entry that uses the
.B Load
keyword, as described here:
.TP 7
@@ -634,8 +695,9 @@ keyword, as described here:
This instructs the server to load the module called
.IR modulename .
The module name given should be the module's standard name, not the
-module file name. The standard name is case-sensitive, and does not
-include the "lib" prefix, or the ".a", ".o", or ".so" suffixes.
+module file name.
+The standard name is case\-sensitive, and does not include the \(lqlib\(rq
+prefix, or the \(lq.a\(rq, \(lq.o\(rq, or \(lq.so\(rq suffixes.
.PP
.RS 7
Example: the Type 1 font rasteriser can be loaded with the following entry:
@@ -668,13 +730,13 @@ being
that are passed to the module when it is loaded.
.PP
Example: the extmod module (which contains a miscellaneous group of
-server extensions) can be loaded, with the XFree86-DGA extension
+server extensions) can be loaded, with the XFree86\-DGA extension
disabled by using the following entry:
.PP
.RS 4
.nf
.B "SubSection \*qextmod\*q"
-.B " Option \*qomit XFree86-DGA\*q"
+.B " Option \*qomit XFree86\-DGA\*q"
.B EndSubSection
.fi
.RE
@@ -696,17 +758,20 @@ __projectroot__/lib/modules/extensions
.fi
.RE
.PP
-The "bitmap" font modules is loaded automatically. It is recommended
-that at very least the "extmod" extension module be loaded. If it isn't
-some commonly used server extensions (like the SHAPE extension) will not be
-available.
-.SH INPUTDEVICE SECTION
+The \(lqbitmap\(rq font module is loaded automatically.
+It is recommended
+that at very least the \(lqextmod\(rq extension module be loaded.
+If it isn't, some commonly used server extensions (like the SHAPE
+extension) will not be available.
+.SH "INPUTDEVICE SECTION"
The config file may have multiple
.B InputDevice
-sections. There will normally be at least two: one for the core (primary)
-keyboard, and one of the core pointer. If either of these two is missing,
-a default configuration for the missing ones will be used. Currently the
-default configuration may not work as expected on all platforms.
+sections.
+There will normally be at least two: one for the core (primary) keyboard,
+and one of the core pointer.
+If either of these two is missing, a default configuration for the missing
+ones will be used.
+Currently the default configuration may not work as expected on all platforms.
.PP
.B InputDevice
sections have the following format:
@@ -728,18 +793,21 @@ and
.B Driver
entries are required in all
.B InputDevice
-sections. All other entries are optional.
+sections.
+All other entries are optional.
.PP
The
.B Identifier
-entry specifies the unique name for this input device. The
+entry specifies the unique name for this input device.
+The
.B Driver
entry specifies the name of the driver to use for this input device.
When using the loadable server, the input driver module
.RI \*q inputdriver \*q
will be loaded for each active
.B InputDevice
-section. An
+section.
+An
.B InputDevice
section is considered active if it is referenced by an active
.B ServerLayout
@@ -749,7 +817,10 @@ or
.B \-pointer
command line options, or if it is selected implicitly as the core pointer
or keyboard device in the absence of such explicit references.
-The most commonly used input drivers are "keyboard" and "mouse".
+The most commonly used input drivers are
+.BR keyboard (__drivermansuffix__)
+and
+.BR mouse (__drivermansuffix__).
.PP
In the absence of an explicitly specified core input device, the first
.B InputDevice
@@ -757,21 +828,24 @@ marked as
.B CorePointer
(or
.BR CoreKeyboard )
-is used. If there is no match there, the first
+is used.
+If there is no match there, the first
.B InputDevice
-that uses the "mouse" (or "keyboard" or "kbd") driver is used. The final
-fallback is to use built-in default configurations.
+that uses the \(lqmouse\(rq (or \(lqkeyboard\(rq or \(lqkbd\(rq) driver is used.
+The final fallback is to use built\-in default configurations.
.PP
.B InputDevice
-sections recognise some driver-independent
+sections recognise some driver\-independent
.BR Options ,
-which are described here. See the individual input driver manual pages
-for a description of the device-specific options.
+which are described here.
+See the individual input driver manual pages for a description of the
+device\-specific options.
.TP 7
.BI "Option \*qCorePointer\*q"
When this is set, the input device is installed as the core (primary)
-pointer device. There must be exactly one core pointer. If this option
-is not set here, or in the
+pointer device.
+There must be exactly one core pointer.
+If this option is not set here, or in the
.B ServerLayout
section, or from the
Reply to: