Add "altmask" attribute, like "altenum" for masks

Submitted by Ran Benita on Aug. 25, 2014, 2:20 p.m.

Details

Message ID 1408976455-9874-1-git-send-email-ran234@gmail.com
State Accepted
Headers show

Not browsing as part of any series.

Commit Message

Ran Benita Aug. 25, 2014, 2:20 p.m.
"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>
---
 doc/xml-xcb.txt | 5 +++--
 src/xcb.xsd     | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

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 -->

Comments

On Mon, Aug 25, 2014 at 05:20:55PM +0300, Ran Benita wrote:
> "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.

Oops - forgot to set the subjectprefix. This patch is for proto.
It is needed to get Cristian's series to pass "make check".

Ran

> Suggested-by: Peter Harris <pharris@opentext.com>
> Signed-off-by: Ran Benita <ran234@gmail.com>
> ---
>  doc/xml-xcb.txt | 5 +++--
>  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 -->
> -- 
> 2.1.0
>
On 2014-08-25 10:20, Ran Benita wrote:
> "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>

Good catch. Thanks. Pushed.

Peter Harris