On Wed, May 18, 2011 at 02:32:56PM +0300, Oleh Nykyforchyn wrote: > Add "MatchLayout" and negative patterns in "Match*" statements and to man > page
all three patches merged, thanks. Cheers, Peter > > Signed-off-by: Oleh Nykyforchyn <[email protected]> > --- > hw/xfree86/man/xorg.conf.man | 31 ++++++++++++++++++++++++++----- > 1 files changed, 26 insertions(+), 5 deletions(-) > > diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man > index 4bec316..92891b2 100644 > --- a/hw/xfree86/man/xorg.conf.man > +++ b/hw/xfree86/man/xorg.conf.man > @@ -1071,18 +1071,29 @@ There are two types of match entries used in > .B InputClass > sections. The first allows various tokens to be matched against attributes > of the device. An entry can be constructed to match attributes from different > -devices by separating arguments with a '|' character. Multiple entries of the > +devices by separating patterns with a '|' character. Some of patterns can be > +prefixed by '!' character (without trailing spaces) to make them negative, > +i.e. such that should not be matched. Patterns are applied to each > +attribute in order of appearance in the list. If a positive (without '!') > +pattern is matched, the entry succeeds. If a negative pattern is matched, > +the entry fails. If the end of the entry is reached, it is successful if > +and only if there was at least one negative pattern. > +.PP > +Multiple entries of the > same type may be supplied to add multiple matching conditions on the same > -attribute. For example: > +attribute. > +.PP > +For example: > .PP > .RS 4 > .nf > .B "Section \*qInputClass\*q" > .B " Identifier \*qMy Class\*q" > -.B " # product string must contain example and > -.B " # either gizmo or gadget > -.B " MatchProduct \*qexample\*q > +.B " # product string must contain either > +.B " # gizmo or gadget, and either contain > +.B " # example or not contain x at all > .B " MatchProduct \*qgizmo|gadget\*q > +.B " MatchProduct \*qexample|!x\*q > .I " ..." > .B "EndSection" > .fi > @@ -1140,6 +1151,16 @@ matches the > pattern. A match is found if at least one of the tags given in > .RI \*q matchtag \*q > matches at least one of the tags assigned by the backend. > +.TP 7 > +.BI "MatchLayout \*q" matchlayout \*q > +Check the case-sensitive string > +.RI \*q matchlayout \*q > +against the currently active > +.B ServerLayout > +section. The empty string "" matches an implicit layout which appears > +if no named > +.B ServerLayout > +sections have been found. > .PP > The second type of entry is used to match device types. These entries take a > boolean argument similar to > -- > 1.6.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
