From: Peter Harris Date: Mon, 25 Aug 2014 23:31:36 +0000 (-0400) Subject: Merge http://infra-srv1.demorecorder.com/git/free-sw/xcb/proto X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80a79d466d1b3cb7c81c30f54035862b2d0f5f6f;hp=7d8c990d6a6f6ef49793eaef46ae38eb2ebb6f39;p=free-sw%2Fxcb%2Fproto Merge infra-srv1.demorecorder.com/git/free-sw/xcb/proto See the mailing list for Reviewed-bys. Thread root is http://lists.freedesktop.org/archives/xcb/2014-August/009632.html --- diff --git a/doc/xml-xcb.txt b/doc/xml-xcb.txt index 97ce5bf..6aa789b 100644 --- a/doc/xml-xcb.txt +++ b/doc/xml-xcb.txt @@ -184,11 +184,12 @@ separated by a single colon. For example, to refer to the PIXMAP type defined in glx rather than the one defined in xproto, use type="glx:PIXMAP" rather than type="PIXMAP". -Note: Most of the below may optionally contain an enum, altenum, or mask +Note: Most of the below may optionally contain an enum, altenum, mask or altmask attribute, which follows the above rules for "type". "enum" is an exhaustive enum; the value is restricted to one of the constants named in the enum. "altenum" may be one of the values contained in the enum, but it need not be. -"mask" refers to an enum to be used as a bitmask. +"mask" refers to an exhaustive enum to be used as a bitmask. +"altmask" may be a mask from the referred enum, but it need not be. diff --git a/src/xcb.xsd b/src/xcb.xsd index 59bb9a8..20cee5b 100644 --- a/src/xcb.xsd +++ b/src/xcb.xsd @@ -54,6 +54,7 @@ authorization from the authors. +