Commit 7dc78db7 authored by Keith Packard's avatar Keith Packard
Browse files

Merge remote branch 'whot/master'

parents 81a623f0 b44c9be2
......@@ -421,25 +421,18 @@ The
.B __xservername__
server is normally configured to recognize various special combinations
of key presses that instruct the server to perform some action, rather
than just sending the key press event to a client application. The
default XKEYBOARD keymap defines the key combinations listed below.
The kbd (__drivermansuffix__) driver also has these key combinations
builtin to its event handler
for cases where the XKEYBOARD extension is not being used. When using
the XKEYBOARD extension, which key combinations perform which actions
is completely configurable.
than just sending the key press event to a client application. These actions
depend on the XKB keymap loaded by a particular keyboard device and may or
may not be available on a given configuration.
.PP
The special combinations of key presses recognized directly
by
.B __xservername__
are:
The following key combinations are commonly part of the default XKEYBOARD
keymap.
.TP 8
.B Ctrl+Alt+Backspace
Immediately kills the server -- no questions asked. This is disabled by
default. It can be enabled with the -retro command line flag or by setting
the
Immediately kills the server -- no questions asked. It can be disabled by
setting the
.B DontZap
__xconfigfile__(__filemansuffix__) file option to a FALSE value.
__xconfigfile__(__filemansuffix__) file option to a TRUE value.
.TP 8
.B Ctrl+Alt+Keypad-Plus
Change video mode to next one specified in the configuration file.
......
......@@ -769,11 +769,28 @@ Example: the MIT-SHM extension can be disabled with the following entry:
The config file may have multiple
.B InputDevice
sections.
If HAL is not being used for input device configuration, there will normally
be at least two: one for the core (primary) keyboard,
and one of the core pointer.
Recent X servers employ input hotplugging to add input devices, with the HAL
backend being the default backend for X servers since 1.4. It is usually not
necessary to provide
.B InputDevice
sections in the xorg.conf if hotplugging is enabled.
.PP
If hotplugging is disabled, there will normally
be at least two: one for the core (primary) keyboard
and one for the core pointer.
If either of these two is missing, a default configuration for the missing
ones will be used.
ones will be used. In the absence of an explicitly specified core input
device, the first
.B InputDevice
marked as
.B CorePointer
(or
.BR CoreKeyboard )
is used.
If there is no match there, the first
.B InputDevice
that uses the \(lqmouse\(rq (or \(lqkbd\(rq) driver is used.
The final fallback is to use built\-in default configurations.
Currently the default configuration may not work as expected on all platforms.
.PP
.B InputDevice
......@@ -828,17 +845,6 @@ and
.BR mousedrv (__drivermansuffix__)
on other platforms.
.PP
In the absence of an explicitly specified core input device, the first
.B InputDevice
marked as
.B CorePointer
(or
.BR CoreKeyboard )
is used.
If there is no match there, the first
.B InputDevice
that uses the \(lqmouse\(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
......@@ -848,44 +854,31 @@ 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
.B ServerLayout
section, or from the
.B \-pointer
command line option, then the first input device that is capable of
being used as a core pointer will be selected as the core pointer.
This option is implicitly set when the obsolete
.B Pointer
section is used.
Deprecated, use
.B SendCoreEvents
instead.
.TP 7
.BI "Option \*qCoreKeyboard\*q"
When this is set, the input device is to be installed as the core
(primary) keyboard device.
There must be exactly one core keyboard.
If this option is not set here, in the
.B ServerLayout
section, or from the
.B \-keyboard
command line option, then the first input device that is capable of
being used as a core keyboard will be selected as the core keyboard.
This option is implicitly set when the obsolete
.B Keyboard
section is used.
Deprecated, use
.B SendCoreEvents
instead.
.TP 7
.BI "Option \*qAlwaysCore\*q \*q" boolean \*q
.B
Deprecated, use
.B SendCoreEvents
instead.
.TP 7
.BI "Option \*qSendCoreEvents\*q \*q" boolean \*q
Both of these options are equivalent, and when enabled cause the
input device to always report core events.
This can be used, for example, to allow an additional pointer device to
generate core pointer events (like moving the cursor, etc).
.TP 4
.BI "Option \*qHistorySize\*q \*q" number \*q
Sets the motion history size.
Default: 0.
input device to report core events through the master device. They are
enabled by default. Any device configured to send core events will be
attached to the virtual core pointer or keyboard and control the cursor by
default. Devices with
.B SendCoreEvents
disabled will be \*qfloating\*q and only accessible by clients employing the
X Input extension. This option controls the startup behavior only, a device
may be reattached or set floating at runtime.
.TP 7
.BI "Option \*qSendDragEvents\*q \*q" boolean \*q
???
......
......@@ -834,7 +834,7 @@ static void test_convert_XIDeviceChangedEvent(void)
in.keys.max_keycode = 1 << 8;
test_XIDeviceChangedEvent(&in);
in.keys.max_keycode = 0xFFFD; /* highest range, above that the length
in.keys.max_keycode = 0xFFFC; /* highest range, above that the length
field gives up */
test_XIDeviceChangedEvent(&in);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment