diff options
| author | Ran Benita <ran234@gmail.com> | 2014-08-25 17:20:55 +0300 |
|---|---|---|
| committer | Peter Harris <pharris@opentext.com> | 2014-08-25 19:28:59 -0400 |
| commit | 88415e63996e43ac74013250a3aa8367987182a9 (patch) | |
| tree | 7083c77501754442ecba51f14fb94ae07b5cfa28 | |
| parent | 8e3db42d67a0035bb16d16da28bd5eea7a269178 (diff) | |
Add "altmask" attribute, like "altenum" for masks
"altmask" means the field is principally a bitmask of bits from the
enum, but in some cases can obtain other values (e.g. "out-of-band" data
in a free bit).
Several fields in xinput will benefit from this extra metadata.
Suggested-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
Signed-off-by: Peter Harris <pharris@opentext.com>
| -rw-r--r-- | doc/xml-xcb.txt | 5 | ||||
| -rw-r--r-- | src/xcb.xsd | 1 |
2 files changed, 4 insertions, 2 deletions
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. <pad bytes="integer" /> 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. <xsd:attribute name="enum" type="xsd:string" use="optional" /> <xsd:attribute name="altenum" type="xsd:string" use="optional" /> <xsd:attribute name="mask" type="xsd:string" use="optional" /> + <xsd:attribute name="altmask" type="xsd:string" use="optional" /> </xsd:complexType> <!-- case expression --> |