frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: add option "Floating", deprecate SendCoreEvents and friends. 

Some devices should be initialised as floating from the start (e.g.
Joysticks and accelerometers benefit from this). Currently users use the
"SendCoreEvents" "off" flag for this, which isn't the most appropriate
naming.

Add an option "Floating", deprecate the others. Still parsed and handled by
the server.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Peter Hutterer 2010-12-06 15:44:50 +10:00
parent 36b614dedf
commit 8f3fa8fb0b
3 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/common/xf86Xinput.c
View File

@ -280,7 +280,8 @@ void
xf86ProcessCommonOptions(InputInfoPtr pInfo, xf86ProcessCommonOptions(InputInfoPtr pInfo,
pointer list) pointer list)
{ {
if (!xf86SetBoolOption(list, "AlwaysCore", 1) || if (xf86SetBoolOption(list, "Floating", 0) ||
!xf86SetBoolOption(list, "AlwaysCore", 1) ||
!xf86SetBoolOption(list, "SendCoreEvents", 1) || !xf86SetBoolOption(list, "SendCoreEvents", 1) ||
!xf86SetBoolOption(list, "CorePointer", 1) || !xf86SetBoolOption(list, "CorePointer", 1) ||
!xf86SetBoolOption(list, "CoreKeyboard", 1)) { !xf86SetBoolOption(list, "CoreKeyboard", 1)) {

1
hw/xfree86/doc/devel/Registry
View File

@ -243,6 +243,7 @@ DemandLoad O I ??
Device S I Device file name Device S I Device file name
DeviceName S I Input device name DeviceName S I Input device name
FlowControl S I Serial flow control ("xon", "none") FlowControl S I Serial flow control ("xon", "none")
Floating B I Device initialised as floating
HistorySize I I ?? HistorySize I I ??
MaxX I I Maximum X coordinate MaxX I I Maximum X coordinate
MaxY I I Maximum Y coordinate MaxY I I Maximum Y coordinate

48
hw/xfree86/doc/man/xorg.conf.man.pre
View File

@ -904,30 +904,42 @@ the server. This affects implied layouts as well as explicit layouts
specified in the configuration and/or on the command line. specified in the configuration and/or on the command line.
.TP 7 .TP 7
.BI "Option \*qCorePointer\*q" .BI "Option \*qCorePointer\*q"
Deprecated, use Deprecated, see
.B SendCoreEvents .B Floating
instead.
.TP 7 .TP 7
.BI "Option \*qCoreKeyboard\*q" .BI "Option \*qCoreKeyboard\*q"
Deprecated, use Deprecated, see
.B SendCoreEvents .B Floating
instead.
.TP 7 .TP 7
.BI "Option \*qAlwaysCore\*q \*q" boolean \*q .BI "Option \*qAlwaysCore\*q \*q" boolean \*q
.B Deprecated, see
Deprecated, use .B Floating
.B SendCoreEvents
instead.
.TP 7 .TP 7
.BI "Option \*qSendCoreEvents\*q \*q" boolean \*q .BI "Option \*qSendCoreEvents\*q \*q" boolean \*q
Both of these options are equivalent, and when enabled cause the Deprecated, see
input device to report core events through the master device. They are .B Floating
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 .TP 7
default. Devices with .BI "Option \*qFloating\*q \*q" boolean \*q
.B SendCoreEvents When enabled, the input device is set up floating and does not
disabled will be \*qfloating\*q and only accessible by clients employing the report events through any master device or control a cursor. The device is
X Input extension. This option controls the startup behavior only, a device only available to clients using the X Input Extension API. This option is
disabled by default.
The options
.B CorePointer,
.B CoreKeyboard,
.B AlwaysCore,
and
.B SendCoreEvents,
are the inverse of option
.B Floating
(i.e.
.B SendCoreEvents \*qon\*q
is equivalent to
.B Floating \*qoff\*q
).
This option controls the startup behavior only, a device
may be reattached or set floating at runtime. may be reattached or set floating at runtime.
.PP .PP
For pointing devices, the following options control how the pointer For pointing devices, the following options control how the pointer