X server testing

[Peter Hutterer]

On Tue, Jun 23, 2009 at 01:02:07PM -0400, Thomas Jaeger wrote:
> Peter Hutterer wrote:
> >> How about "<id> [Floating || AttachToMaster (dflt:Floating)]
> >> [returnPointer] [returnKeyboard]" ?
> > 
> > yeah, that'd work too. Feel free to send me a patch for this (note, I just
> > pushed a commit that might conflict with such a patch so make sure you pull
> > first).
> Patch attached.

> > also, a man page patch would be much appreciated ;)
> None of the XI2 commands are documented yet, so this would be a little
> more work than I have time for right now, maybe some other day.

> From f6ed546fc0eb6cefb0055165168fe02e4fd4e0cf Mon Sep 17 00:00:00 2001
> From: Thomas Jaeger <ThJaeger at gmail.com>
> Date: Tue, 23 Jun 2009 12:49:56 -0400
> Subject: [PATCH] remove-master: document possible return modes in --help
> 
> ---
>  src/xinput.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/src/xinput.c b/src/xinput.c
> index bd07e7c..275fa1b 100644
> --- a/src/xinput.c
> +++ b/src/xinput.c
> @@ -87,7 +87,7 @@ static entry drivers[] =
>        create_master
>      },
>      { "remove-master",
> -      "<id> [<returnMode (dflt:Floating)>] [<returnPointer>] [<returnKeyboard>]",
> +      "<id> [Floating|AttachToMaster (dflt:Floating)] [<returnPointer>] [<returnKeyboard>]",
>        remove_master
>      },
>      { "reattach",
> -- 
> 1.6.3.1
> 

merged and pushed, thanks.

Cheers,
  Peter