On Wed, Feb 03, 2010 at 11:59:40PM -0800, Jeremy Huddleston wrote: > > On Feb 3, 2010, at 21:06, Peter Hutterer wrote: > > > +.B --reattach \fIdevice\fP \fImaster\fP > > +Reattach the given device to the given master device. > > Formatting throughout this file seems inconsistent with respect to hilighting > arguments in the descriptions. Shouldn't this be more like: > > .B --reattach \fIdevice\fP \fImaster\fP > Reattach \fIdevice\fP to the \fImaster\fP device. > > which better matches what's already in the man page: > .B --get-feedbacks \fIdevice\fP > Display the feedbacks of \fIdevice\fP. > > I just picked this one line as an example, but there are inconsistencies like > this throughout. As example, this is currently in the man page:
you're right, was a bit slack. I went through and fixed up the highlighting and a bit of the wording. The man page now refers to "master" and "slave" where needed instead of just "device". Fixed patch is below. For the other problematic highlighting (mostly in the property calls) I'd rather have a separate patch go in though. >From 4966627f5fc74b30a5cc9ca9292a0314aabf1734 Mon Sep 17 00:00:00 2001 From: Peter Hutterer <[email protected]> Date: Thu, 4 Feb 2010 15:05:36 +1000 Subject: [PATCH] man: document XI2 options Document the options to modifiy the device hierarchy and change the ClientPointer. Signed-off-by: Peter Hutterer <[email protected]> --- man/xinput.man | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/man/xinput.man b/man/xinput.man index 7e1a9d3..b922656 100644 --- a/man/xinput.man +++ b/man/xinput.man @@ -102,9 +102,46 @@ and ProximityOut are registered. Register for a number of XI2 events and display them. This option does not take a device argument. .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 \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" -- 1.6.6 _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
