xserver pixman git update 7-12-2010

2 files changed, 31 insertions, 18 deletions

diff --git a/xorg-server/hw/xfree86/doc/devel/Registry b/xorg-server/hw/xfree86/doc/devel/Registry
index 613b50c7b..89a5f10fa 100644
--- a/xorg-server/hw/xfree86/doc/devel/Registry
+++ b/xorg-server/hw/xfree86/doc/devel/Registry
@@ -243,6 +243,7 @@ DemandLoad                O     I    ??
 Device                    S     I    Device file name

 DeviceName                S     I    Input device name

 FlowControl               S     I    Serial flow control ("xon", "none")

+Floating                  B     I    Device initialised as floating

 HistorySize               I     I    ??

 MaxX                      I     I    Maximum X coordinate

 MaxY                      I     I    Maximum Y coordinate

diff --git a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
index 6547d38aa..2267a0a1a 100644
--- a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -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.

 .TP 7

 .BI "Option \*qCorePointer\*q"

-Deprecated, use

-.B SendCoreEvents

-instead.

+Deprecated, see

+.B Floating

 .TP 7

 .BI "Option \*qCoreKeyboard\*q"

-Deprecated, use

-.B SendCoreEvents

-instead.

+Deprecated, see

+.B Floating

 .TP 7

 .BI "Option \*qAlwaysCore\*q  \*q" boolean \*q

-.B

-Deprecated, use

-.B SendCoreEvents

-instead.

+Deprecated, see

+.B Floating

 .TP 7

 .BI "Option \*qSendCoreEvents\*q  \*q" boolean \*q

-Both of these options are equivalent, and when enabled cause the

-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

+Deprecated, see

+.B Floating

+

+.TP 7

+.BI "Option \*qFloating\*q  \*q" boolean \*q

+When enabled, the input device is set up floating and does not

+report events through any master device or control a cursor. The device is

+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.

 .PP

 For pointing devices, the following options control how the pointer