Only try to print XIPointerEmulated flag if it is defined.

[xorg-xinput] / man / xinput.man

diff --git a/man/xinput.man b/man/xinput.man
index 6705373aa4181ae37ba63db91c575980de795481..085a5fce05207c4a635e7328f27f2d1b9dee8175 100644 (file)
--- a/man/xinput.man
+++ b/man/xinput.man
@@ -17,12 +17,18 @@ of the program and the version supported by the server. This option does not
 require a device name.
 .PP
 .TP 8
 require a device name.
 .PP
 .TP 8

-.B --list [--short || --long] [\fIdevice\fP]
+.B --list [--short || --long || --name-only || --id-only] [\fIdevice\fP]

 If no argument is given list all the input devices. If an argument is given,
 If no argument is given list all the input devices. If an argument is given,

-show all the features of \fIdevice\fP. Uses XListInputDevices(3).
+show all the features of \fIdevice\fP.

 If --long is provided, the output includes detailed information about the
 capabilities of each devices. Otherwise, or if --short is provided, only the
 device names and some minimal information is listed.
 If --long is provided, the output includes detailed information about the
 capabilities of each devices. Otherwise, or if --short is provided, only the
 device names and some minimal information is listed.

+If --name-only is provided, the output is limited to the device names. One
+device name is listed per line. Note that the order the devices are listed
+is undefined.
+If --id-only is provided, the output is limited to the device IDs. One
+device ID is listed per line. Note that the order the devices are listed is
+undefined.

 .PP
 .TP 8
 .B --get-feedbacks \fIdevice\fP
 .PP
 .TP 8
 .B --get-feedbacks \fIdevice\fP


@@ -40,7 +46,7 @@ Change the mode of \fIdevice\fP.
 .TP 8
 .B --set-ptr-feedback \fIdevice\fP \fIthreshold\fP \fInum\fP \fIdenom\fP
 Change the pointer acceleration (or feedback) parameters of \fIdevice\fP.
 .TP 8
 .B --set-ptr-feedback \fIdevice\fP \fIthreshold\fP \fInum\fP \fIdenom\fP
 Change the pointer acceleration (or feedback) parameters of \fIdevice\fP.

-The xset(1) man page has more details. For X.Org Server 1.7
+The xset(__appmansuffix__) man page has more details. For X.Org Server 1.7

 and above, there are additional device properties pertaining to pointer
 acceleration. These do not replace, but complement the pointer feedback
 setting.
 and above, there are additional device properties pertaining to pointer
 acceleration. These do not replace, but complement the pointer feedback
 setting.


@@ -98,28 +104,78 @@ loop displaying events received. If the -proximity is given, ProximityIn
 and ProximityOut are registered.
 .PP
 .TP 8
 and ProximityOut are registered.
 .PP
 .TP 8

-.B --test_xi2
-Register for a number of XI2 events and display them. This option does not
-take a device argument.
+.B --test-xi2 [\fIdevice\fP]
+Register for a number of XI2 events and display them. If a device is given,
+only events on this device are displayed.
+.PP
+.TP 8
+.B --create-master \fIprefix\fP [sendCore] [enable]
+Create a new pair of master devices on an XI2-enabled server with the given
+\fIprefix\fP. The server will create one master pointer named "\fIprefix\fP
+pointer" and one master keyboard named "\fIprefix\fP keyboard".  If
+\fIsendCore\fP is 1, this pair of master devices is set to send core events
+(default).  If \fIenable\fP is 1, this master device pair will be enabled
+immediately (default).
+.PP
+.TP 8
+.B --remove-master \fImaster\fP [Floating|AttachToMaster] [returnPointer] [returnKeyboard]
+Remove \fImaster\fP  and its paired master device. Attached slave devices
+are set floating if \fIFloating\fP is specified or the argument is omitted.
+If the second argument is \fIAttachToMaster\fP, \fIreturnPointer\fP
+specifies the master pointer to attach all slave pointers to and
+\fIreturnKeyboard\fP specifies the master keyboard to attach all slave
+keyboards to.
+.PP
+.TP 8
+.B --reattach \fIslave\fP \fImaster\fP
+Reattach \fIslave\fP to \fImaster\fP.
+.PP
+.TP 8
+.B --float \fIslave\fP
+Remove \fIslave\fP from its current master device.
+.PP
+.TP 8
+.B --set-cp \fIwindow\fP \fImaster\fP
+Set the ClientPointer for the client owning \fIwindow\fP to \fImaster\fP.
+\fImaster\fP must specify a master pointer.
+.PP
+.TP 8
+.B --map-to-crtc \fIdevice\fP \fIcrtc\fP
+Restricts the movements of the absolute \fIdevice\fP to the RandR
+\fIcrtc\fP. The CRTC name must match a currently connected CRTC (see
+\fIxrandr(__appmansuffix__)\fP). If the NVIDIA binary driver is
+detected or RandR 1.2 or later is not available, a Xinerama output may be
+specified as "HEAD-N", with N being the Xinerama screen number. This option
+has no effect on relative devices.

 .PP
 \fIdevice\fP can be the device name as a string or the XID of the
 device.
 .PP
 .PP
 \fIdevice\fP can be the device name as a string or the XID of the
 device.
 .PP

+\fIslave\fP can be the device name as a string or the XID of a slave
+device.
+.PP
+\fImaster\fP can be the device name as a string or the XID of a master
+device.
+.PP

 \fIproperty\fP can be the property as a string or the Atom value.
 .PP
 .SH "SEE ALSO"
 \fIproperty\fP can be the property as a string or the Atom value.
 .PP
 .SH "SEE ALSO"

-X(__miscmansuffix__), xset(1)
+X(__miscmansuffix__), xset(__appmansuffix__), xrandr(__appmansuffix__)

 .SH COPYRIGHT
 Copyright 1996,1997, Frederic Lepied.
 .PP
 .SH COPYRIGHT
 Copyright 1996,1997, Frederic Lepied.
 .PP

+Copyright 2007, Peter Hutterer.
+.PP

 Copyright 2008, Philip Langdale.
 Copyright 2008, Philip Langdale.

+.PP
+Copyright 2009-2011, Red Hat, Inc.

 
 .SH AUTHORS
 
 .nf
 
 .SH AUTHORS
 
 .nf

+Peter Hutterer <peter.hutterer@who-t.net>

 Philip Langdale, <philipl@alumni.utexas.net>
 Frederic Lepied, France <Frederic.Lepied@sugix.frmug.org>
 Philip Langdale, <philipl@alumni.utexas.net>
 Frederic Lepied, France <Frederic.Lepied@sugix.frmug.org>

-Peter Hutterer <peter.hutterer@who-t.net>

 Julien Cristau <jcristau@debian.org>
 Thomas Jaeger <ThJaeger@gmail.com>
 and more.
 Julien Cristau <jcristau@debian.org>
 Thomas Jaeger <ThJaeger@gmail.com>
 and more.