From 7f951a3b8ad71211e34a52878a030d5df823c49e Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 20 Jan 2014 12:53:16 -0800 Subject: [PATCH] spec: Make alignment of columns in Encoding section more consistent Signed-off-by: Alan Coopersmith --- specs/fsproto.xml | 266 +++++++++++++++++++++++----------------------- 1 file changed, 133 insertions(+), 133 deletions(-) diff --git a/specs/fsproto.xml b/specs/fsproto.xml index b6c4f80..74f2428 100644 --- a/specs/fsproto.xml +++ b/specs/fsproto.xml @@ -3477,194 +3477,194 @@ multiple of four: ACCESSCONTEXT +4 CARD32 access context -4 CARD32 access context with at least one of the following bits set: + with at least one of the following bits set: -#x1fffffff + #x1fffffff -but none of the following bits set: + but none of the following bits set: -#xe0000000 zero + #xe0000000 zero ALTERNATESERVER -1 BOOL subset -1 n length of name -n STRING8 name -p unused, p=pad(n+2) +1 BOOL subset +1 n length of name +n STRING8 name +p unused, p=pad(n+2) AUTH - -2 n length of name -2 d length of data -n STRING8 name -p unused, p=pad(n) -d STRING8 data -q unused, q=pad(d) +2 n length of name +2 d length of data +n STRING8 name +p unused, p=pad(n) +d STRING8 data +q unused, q=pad(d) BITMAPFORMAT +4 CARD32 value, union of the following bits: -4 CARD32 value, union of the following bits: - #x00000001 ByteOrderMSB - #x00000002 BitOrderMSB - #x00000000 ImageRectMin - #x00000004 ImageRectMaxWidth - #x00000008 ImageRectMax - #x00000000 ScanlinePad8 - #x00000100 ScanlinePad16 - #x00000200 ScanlinePad32 - #x00000300 ScanlinePad64 - #x00000000 ScanlineUnit8 - #x00001000 ScanlineUnit16 - #x00002000 ScanlineUnit32 - #x00003000 ScanlineUnit64 + #x00000001 ByteOrderMSB + #x00000002 BitOrderMSB + #x00000000 ImageRectMin + #x00000004 ImageRectMaxWidth + #x00000008 ImageRectMax + #x00000000 ScanlinePad8 + #x00000100 ScanlinePad16 + #x00000200 ScanlinePad32 + #x00000300 ScanlinePad64 + #x00000000 ScanlineUnit8 + #x00001000 ScanlineUnit16 + #x00002000 ScanlineUnit32 + #x00003000 ScanlineUnit64 -except for the following bits which must be zero: + except for the following bits which must be zero: - #xffffccf0 zero + #xffffccf0 zero -and the following of which at most one bit may be set: + and the following of which at most one bit may be set: - #x0000000c at most one bit can be set + #x0000000c at most one bit can be set BITMAPFORMATMASK +4 CARD32 value, mask of the following bits: -4 CARD32 value, mask of the following bits: + #x00000001 ByteOrderMask + #x00000002 BitOrderMask + #x00000004 ImageRectMask + #x00000008 ScanlinePadMask + #x00000010 ScanlineUnitMask - #x00000001 ByteOrderMask - #x00000002 BitOrderMask - #x00000004 ImageRectMask - #x00000008 ScanlinePadMask - #x00000010 ScanlineUnitMask + except for the following bits which must be zero: -except for the following bits which must be zero: - - #xffffffe0 zero + #xffffffe0 zero BOOL - -1 BOOL boolean, one of the following values: -0 False -1 True +1 BOOL boolean, one of the following values: + 0 False + 1 True BYTE -1 BYTE unsigned byte of data +1 BYTE unsigned byte of data CARD8 -1 CARD8 8-bit unsigned integer +1 CARD8 8-bit unsigned integer CARD16 -2 CARD16 16-bit unsigned integer +2 CARD16 16-bit unsigned integer CARD32 -4 CARD32 32-bit unsigned integer +4 CARD32 32-bit unsigned integer CHAR2B -1 CARD8 byte1 -1 CARD8 byte2 +1 CARD8 byte1 +1 CARD8 byte2 EVENTMASK -4 CARD32 event mask - for core events, this is union of the following bits: +4 CARD32 event mask - #00000001 CatalogueListChangeMask - #00000002 FontListChangeMask + for core events, this is union of the following bits: -but none of the following bits set: + #00000001 CatalogueListChangeMask + #00000002 FontListChangeMask - #fffffffc + but none of the following bits set: -extensions define their own sets of bits + #fffffffc + + extensions define their own sets of bits FONTID +4 CARD32 font identifier -4 CARD32 font identifier with at least one of -the following bits set: + with at least one of the following bits set: - #x1fffffff + #x1fffffff -but none of the following bits set: + but none of the following bits set: - #xe0000000 zero + #xe0000000 zero INT8 -1 INT8 8-bit signed integer +1 INT8 8-bit signed integer INT16 -2 INT16 16-bit signed integer +2 INT16 16-bit signed integer INT32 -4 INT32 32-bit signed integer +4 INT32 32-bit signed integer OFFSET32 -4 CARD32 position (or integer value) -4 CARD32 length +4 CARD32 position (or integer value) +4 CARD32 length PROPINFO -4 n number of PROPOFFSET components -4 m number of bytes of property data -20*n PROPOFFSET property offsets into data block -m LISTofBYTE property data block +4 n number of PROPOFFSET components +4 m number of bytes of property data +20*n PROPOFFSET property offsets into data block +m LISTofBYTE property data block PROPOFFSET -8 OFFSET32 name in data block -8 OFFSET32 value in data block - -1 CARD8 type, one of the following values: -0 String -1 Unsigned -2 Signed -3 zero +8 OFFSET32 name in data block +8 OFFSET32 value in data block +1 CARD8 type, one of the following values: + 0 String + 1 Unsigned + 2 Signed + 3 zero RANGE -2 CHAR2B minimum character code -2 CHAR2B maximum character code +2 CHAR2B minimum character code +2 CHAR2B maximum character code RESOLUTION -2 CARD16 x resolution in pixels per inch -2 CARD16 y resolution in pixels per inch -2 CARD16 point size in decipoints +2 CARD16 x resolution in pixels per inch +2 CARD16 y resolution in pixels per inch +2 CARD16 point size in decipoints STRNAME -1 n length of name -n STRING8 name +1 n length of name +n STRING8 name STRING8 -n LISTofBYTE array of 8-bit character values +n LISTofBYTE array of 8-bit character values TIMESTAMP -4 CARD32 milliseconds since server time origin +4 CARD32 milliseconds since server time origin XCHARINFO -2 INT16 left bearing -2 INT16 right bearing -2 INT16 width -2 INT16 ascent -2 INT16 descent -2 CARD16 attributes +2 INT16 left bearing +2 INT16 right bearing +2 INT16 width +2 INT16 ascent +2 INT16 descent +2 CARD16 attributes XFONTINFO -4 CARD32 flags, union of the following bits: - #x00000001 AllCharactersExist - #x00000002 InkInside - #x00000004 HorizontalOverlap +4 CARD32 flags, union of the following bits: -but none of the following bits set: + #x00000001 AllCharactersExist + #x00000002 InkInside + #x00000004 HorizontalOverlap - #xfffffff8 zero -4 RANGE range of characters in font -1 CARD8 drawing direction - 0 LeftToRight - 1 RightToLeft -1 unused -2 CHAR2B default character -12 XCHARINFO minimum bounds -12 XCHARINFO maximum bounds -2 INT16 font ascent -2 INT16 font descent -n PROPINFO property data + but none of the following bits set: + + #xfffffff8 zero + +4 RANGE range of characters in font +1 CARD8 drawing direction + 0 LeftToRight + 1 RightToLeft +1 unused +2 CHAR2B default character +12 XCHARINFO minimum bounds +12 XCHARINFO maximum bounds +2 INT16 font ascent +2 INT16 font descent +n PROPINFO property data @@ -3673,8 +3673,8 @@ n PROPINFO property data open connection 1 BYTE byteorder, one of the values: - #x42 MostSignificant Byte first - #x6c LeastSignificant Byte first + #x42 MostSignificant Byte first + #x6c LeastSignificant Byte first 1 CARD8 numberof auth in auth-data 2 2 client-major-protocol-version 2 0 client-minor-protocol-version @@ -3682,10 +3682,10 @@ n PROPINFO property data a LISTofAUTH auth-data ▶ 2 CARD16 status -0 Success -1 Continue -2 Busy -3 Denied + 0 Success + 1 Continue + 2 Busy + 3 Denied 2 2 major version 2 0 version 1 CARD8 numberof alternate-servers-hint @@ -3714,11 +3714,11 @@ q unused, q=pad(d) ▶ 4 2+(d+q)/4 length 2 CARD16 status - 0 Success - 1 Continue - 2 Busy - 3 Denied - 2 unused + 0 Success + 1 Continue + 2 Busy + 3 Denied +2 unused d LISTofBYTE more-authorization-data q unused, q=pad(d) @@ -3845,10 +3845,10 @@ a LISTofAUTH authorization-protocols 2 CARD16 sequence-number 4 3+(d+q)/4 length 2 CARD16 status - 0 Success - 1 Continue - 2 Busy - 3 Denied + 0 Success + 1 Continue + 2 Busy + 3 Denied 2 unused d LISTofBYTE authorization-data q unused, q=pad(d) @@ -3870,10 +3870,10 @@ q unused, q=pad(d) ▶ 4 2+(d+q)/4 length 2 CARD16 status - 0 Success - 1 Continue - 2 Busy - 3 Denied + 0 Success + 1 Continue + 2 Busy + 3 Denied 2 unused d LISTofBYTE authorization-data q unused, q=pad(d) @@ -4099,7 +4099,7 @@ p unused, p=pad(m) 1 CARD8 major-opcode 1 CARD8 minor-opcode 2 unused -4 FONTID bad-fontid +4 FONTID bad-fontid Range 1 1 type error