fdo-mirrors/xorg-xcbproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xcbproto.git synced 2025-12-20 02:20:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Strip trailing whitespace

Browse source 
Performed with: git ls-files | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith 2025-08-02 13:28:41 -07:00
parent 014540add5
commit c70aba5cc6
21 changed files with 102 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -8,7 +8,7 @@ Release 1.14 (2020-02-22)
* Fix size computation of imported lists
* Allow access to the original type in the XML
* Add sysroot prefix to pkgconfig file (Fixes #9)
Release 1.13 (2018-02-28)
=========================
* dri3: Add multi-plane/modifier protocol for v1.2

4
src/composite.xml
View file

@ -202,9 +202,9 @@ other requests using Composite. Failure to do so will cause a BadRequest error.
<field type="WINDOW" name="window" />
<field type="PIXMAP" name="pixmap" />
</request>
<!-- new in version 0.3 -->
<request name="GetOverlayWindow" opcode="7">
<field type="WINDOW" name="window" />
<reply>

34
src/glx.xml
View file

@ -66,7 +66,7 @@ The patch that fixed this server bug in X.org is here:
<typedef oldname="double" newname="FLOAT64" />
<typedef oldname="CARD32" newname="BOOL32" />
<typedef oldname="CARD32" newname="CONTEXT_TAG" />
<!-- Errors -->
<error name="Generic" number="-1"> <!-- FIXME: fake number -->
<field type="CARD32" name="bad_value" />
@ -257,7 +257,7 @@ The patch that fixed this server bug in X.org is here:
<field type="glx:PIXMAP" name="glx_pixmap" />
</request>
<request name="GetVisualConfigs" opcode="14">
<field type="CARD32" name="screen" />
<reply>
@ -363,7 +363,7 @@ The patch that fixed this server bug in X.org is here:
<field type="FBCONFIG" name="fbconfig" />
<field type="xproto:PIXMAP" name="pixmap" />
<field type="glx:PIXMAP" name="glx_pixmap" />
<field type="CARD32" name="num_attribs" />
<field type="CARD32" name="num_attribs" />
<list type="CARD32" name="attribs">
<op op="*">
<fieldref>num_attribs</fieldref>
@ -641,7 +641,7 @@ The patch that fixed this server bug in X.org is here:
</list>
</reply>
</request>
<!-- FIXME:
All the Get* functions can return different stuff for replies.
Hopefully xcb will support multiple reply structures at some point
@ -1024,7 +1024,7 @@ The patch that fixed this server bug in X.org is here:
</list>
</reply>
</request>
<request name="GetTexParameterfv" opcode="136">
<field type="CONTEXT_TAG" name="context_tag" />
@ -1181,7 +1181,7 @@ The patch that fixed this server bug in X.org is here:
</list>
</reply>
</request>
<request name="GetColorTableParameterfv" opcode="148">
<field type="CONTEXT_TAG" name="context_tag" />
<field type="CARD32" name="target" />
@ -1396,7 +1396,7 @@ The patch that fixed this server bug in X.org is here:
<!--
GLX Extensions
* XXX: So far only define non-rendering commands.
* Only those extensions that affect the GLX wire protocol are listed.
-->
@ -1423,7 +1423,7 @@ The patch that fixed this server bug in X.org is here:
</reply>
</request>
<!--
GL_ARB_occlusion_query
http://oss.sgi.com/projects/ogl-sample/registry/ARB/occlusion_query.txt
@ -1448,7 +1448,7 @@ The patch that fixed this server bug in X.org is here:
</list>
</reply>
</request>
<request name="IsQueryARB" opcode="163">
<field type="CONTEXT_TAG" name="context_tag" />
<field type="CARD32" name="id" />
@ -1457,7 +1457,7 @@ The patch that fixed this server bug in X.org is here:
<field type="BOOL32" name="ret_val" />
</reply>
</request>
<request name="GetQueryivARB" opcode="164">
<field type="CONTEXT_TAG" name="context_tag" />
<field type="CARD32" name="target" />
@ -1473,7 +1473,7 @@ The patch that fixed this server bug in X.org is here:
</list>
</reply>
</request>
<request name="GetQueryObjectivARB" opcode="165">
<field type="CONTEXT_TAG" name="context_tag" />
<field type="CARD32" name="id" />
@ -1489,7 +1489,7 @@ The patch that fixed this server bug in X.org is here:
</list>
</reply>
</request>
<request name="GetQueryObjectuivARB" opcode="166">
<field type="CONTEXT_TAG" name="context_tag" />
<field type="CARD32" name="id" />
@ -1505,19 +1505,19 @@ The patch that fixed this server bug in X.org is here:
</list>
</reply>
</request>
<!--
GL_ARB_vertex_program
http://oss.sgi.com/projects/ogl-sample/registry/ARB/vertex_program.txt
XXX: Need to write up vops
-->
-->
<!--
GL_ARB_fragment_program
http://oss.sgi.com/projects/ogl-sample/registry/ARB/fragment_program.txt
XXX: Need to write up vops
-->
<!--
GL_SGIS_texture_filter4
http://oss.sgi.com/projects/ogl-sample/registry/SGIS/texture_filter4.txt
@ -1589,7 +1589,7 @@ The patch that fixed this server bug in X.org is here:
http://oss.sgi.com/projects/ogl-sample/registry/EXT/pixel_transform.txt
XXX: Need to write up vops
-->
<!--
GL_NV_register_combiners
http://oss.sgi.com/projects/ogl-sample/registry/NV/register_combiners.txt
@ -1637,5 +1637,5 @@ The patch that fixed this server bug in X.org is here:
http://oss.sgi.com/projects/ogl-sample/registry/OES/single_precision.txt
XXX: Need to write up vops
-->
</xcb>

4
src/present.xml
View file

@ -125,7 +125,7 @@ OF THIS SOFTWARE.
</request>
<xidtype name="EVENT"/>
<request name="SelectInput" opcode="3">
<field type="EVENT" name="eid"/>
<field type="WINDOW" name="window" />
@ -172,7 +172,7 @@ OF THIS SOFTWARE.
<pad bytes="2" />
<field type="EVENT" name="event" />
</event>
<event name="ConfigureNotify" number="0" xge="true">
<pad bytes="2" />
<field type="EVENT" name="event" />

12
src/randr.xml
View file

@ -38,7 +38,7 @@ authorization from the authors.
<xidtype name="OUTPUT" />
<xidtype name="PROVIDER" />
<xidtype name="LEASE" />
<!-- Errors -->
<error name="BadOutput" number="0" />
@ -63,14 +63,14 @@ authorization from the authors.
<field type="CARD16" name="mwidth" /> <!-- millimeters -->
<field type="CARD16" name="mheight" />
</struct>
<struct name="RefreshRates">
<field type="CARD16" name="nRates" />
<list type="CARD16" name="rates">
<fieldref>nRates</fieldref>
</list>
</struct>
<request name="QueryVersion" opcode="0">
<field type="CARD32" name="major_version" />
<field type="CARD32" name="minor_version" />
@ -81,7 +81,7 @@ authorization from the authors.
<pad bytes="16" />
</reply>
</request>
<!-- Skip obsolete opcode 1 so old clients fail immediately -->
<enum name="SetConfig">
@ -112,7 +112,7 @@ authorization from the authors.
<pad bytes="10" />
</reply>
</request>
<!-- opcode 3 is obsolete -->
<enum name="NotifyMask" >
@ -128,7 +128,7 @@ authorization from the authors.
<item name="Lease"> <bit>7</bit></item>
</enum>
<request name="SelectInput" opcode="4">
<request name="SelectInput" opcode="4">
<field type="WINDOW" name="window" />
<field type="CARD16" name="enable" mask="NotifyMask" />
<pad bytes="2" />

8
src/record.xml
View file

@ -31,7 +31,7 @@ authorization from the authors.
<!-- Types -->
<xidtype name="CONTEXT" />
<struct name="Range8">
<field type="CARD8" name="first" />
<field type="CARD8" name="last" />
@ -85,7 +85,7 @@ authorization from the authors.
<error name="BadContext" number="0">
<field type="CARD32" name="invalid_record" />
</error>
<!-- Requests -->
<request name="QueryVersion" opcode="0">
<field type="CARD16" name="major_version" />
@ -166,7 +166,7 @@ authorization from the authors.
</list>
</reply>
</request>
<request name="DisableContext" opcode="6">
<field type="record:CONTEXT" name="context" />
</request>
@ -174,5 +174,5 @@ authorization from the authors.
<request name="FreeContext" opcode="7">
<field type="record:CONTEXT" name="context" />
</request>
</xcb>

8
src/render.xml
View file

@ -36,7 +36,7 @@ for licensing information.
<item name="Xor"> <value>11</value> </item>
<item name="Add"> <value>12</value> </item>
<item name="Saturate"> <value>13</value> </item>
<item name="DisjointClear"> <value>16</value></item>
<item name="DisjointSrc"> <value>17</value> </item>
<item name="DisjointDst"> <value>18</value> </item>
@ -49,7 +49,7 @@ for licensing information.
<item name="DisjointAtop"> <value>25</value> </item>
<item name="DisjointAtopReverse"> <value>26</value> </item>
<item name="DisjointXor"> <value>27</value> </item>
<item name="ConjointClear"> <value>32</value></item>
<item name="ConjointSrc"> <value>33</value> </item>
<item name="ConjointDst"> <value>34</value> </item>
@ -624,7 +624,7 @@ for licensing information.
</request>
<!-- new in version 0.9 -->
<struct name="SPANFIX">
<field type="FIXED" name="l" />
<field type="FIXED" name="r" />
@ -642,7 +642,7 @@ for licensing information.
<field type="INT16" name="y_off" />
<list type="TRAP" name="traps" />
</request>
<!-- new in version 0.10 -->
<request name="CreateSolidFill" opcode="33">

2
src/screensaver.xml
View file

@ -165,7 +165,7 @@ Draft Standard Version 1.1
<request name="UnsetAttributes" opcode="4">
<field type="DRAWABLE" name="drawable"/>
</request>
<!-- version 1.1 -->
<request name="Suspend" opcode="5">
<field type="CARD32" name="suspend" />

4
src/sync.xml
View file

@ -85,7 +85,7 @@ for licensing information.
<field type="CARD16" name="minor_opcode" />
<field type="CARD8" name="major_opcode" />
</error>
<request name="Initialize" opcode="0">
<field type="CARD8" name="desired_major_version" />
<field type="CARD8" name="desired_minor_version" />
@ -223,7 +223,7 @@ for licensing information.
<field type="CARD32" name="id" />
<field type="INT32" name="priority" />
</request>
<request name="GetPriority" opcode="13">
<field type="CARD32" name="id" />
<reply>

2
src/xcb.xsd
View file

@ -197,7 +197,7 @@ authorization from the authors.
<xsd:element name="bit" type="bitType" />
</xsd:choice>
</xsd:group>
<!-- Fields in requests that are calculated from other information, not
supplied by the caller. -->
<xsd:element name="exprfield" >

4
src/xf86dri.xml
View file

@ -39,7 +39,7 @@ authorization from the authors.
<field type="INT16" name="x2" />
<field type="INT16" name="x3" />
</struct>
<!-- Requests -->
<request name="QueryVersion" opcode="0">
<reply>
@ -168,5 +168,5 @@ authorization from the authors.
<pad bytes="1" />
<field type="CARD32" name="authenticated" />
</reply>
</request>
</request>
</xcb>

4
src/xfixes.xml
View file

@ -217,7 +217,7 @@ authorization from the authors.
<field type="INT16" name="dy" />
</request>
<request name="RegionExtents" opcode="18">
<request name="RegionExtents" opcode="18">
<field type="REGION" name="source" />
<field type="REGION" name="destination" />
</request>
@ -322,7 +322,7 @@ authorization from the authors.
<field type="CARD16" name="top" />
<field type="CARD16" name="bottom" />
</request>
<!-- Version 4 -->
<request name="HideCursor" opcode="29">
<field type="WINDOW" name="window" />

2
src/xkb.xml
View file

@ -1664,7 +1664,7 @@ authorization from the authors.
<bitcase>
<enumref ref="NameDetail">KTLevelNames</enumref>
<list name="nLevelsPerType" type="CARD8">
<!-- Xlib uses NTypes here -
<!-- Xlib uses NTypes here -
the spec says nKTLevels is correct, but
it does not work in reality
<fieldref>nKTLevels</fieldref> -->

6
src/xprint.xml
View file

@ -32,7 +32,7 @@ authorization from the authors.
<!-- Conforms to XPRINT 1.0 -->
<import>xproto</import>
<typedef oldname="char" newname="STRING8" />
<!-- Types -->
@ -85,8 +85,8 @@ authorization from the authors.
<item name="MediumAttr"><value>6</value></item>
<item name="SpoolerAttr"><value>7</value></item>
</enum>
<!-- Requests -->
<request name="PrintQueryVersion" opcode="0">
<reply>

54
src/xproto.xml
View file

@ -27,36 +27,36 @@ authorization from the authors.
-->
<xcb header="xproto">
<!-- Core protocol types -->
<struct name="CHAR2B">
<field type="CARD8" name="byte1" />
<field type="CARD8" name="byte2" />
</struct>
<xidtype name="WINDOW" />
<xidtype name="PIXMAP" />
<xidtype name="CURSOR" />
<xidtype name="FONT" />
<xidtype name="GCONTEXT" />
<xidtype name="COLORMAP" />
<xidtype name="ATOM" />
<xidunion name="DRAWABLE">
<type>WINDOW</type>
<type>PIXMAP</type>
</xidunion>
<xidunion name="FONTABLE">
<type>FONT</type>
<type>GCONTEXT</type>
</xidunion>
<typedef oldname="CARD32" newname="BOOL32" />
<typedef oldname="CARD32" newname="VISUALID" />
@ -65,7 +65,7 @@ authorization from the authors.
<typedef oldname="CARD32" newname="KEYSYM" />
<typedef oldname="CARD8" newname="KEYCODE" />
<typedef oldname="CARD32" newname="KEYCODE32" />
<typedef oldname="CARD8" newname="BUTTON" />
@ -267,7 +267,7 @@ authorization from the authors.
</struct>
<!-- Core event types -->
<enum name="ModMask">
<item name="Shift"> <bit>0</bit></item>
<item name="Lock"> <bit>1</bit></item>
@ -1267,7 +1267,7 @@ parent's cursor will cause an immediate change in the displayed cursor.
]]></field>
</doc>
</enum>
<enum name="BackPixmap">
<item name="None"> <value>0</value></item>
<item name="ParentRelative"><value>1</value></item>
@ -1545,7 +1545,7 @@ The specified `window` does not exist.
]]></error>
</doc>
</request>
<enum name="MapState">
<item name="Unmapped"> <value>0</value></item>
<item name="Unviewable"><value>1</value></item>
@ -1651,7 +1651,7 @@ The specified window does not exist.
<pad bytes="1" />
<field type="WINDOW" name="window" />
</request>
<enum name="SetMode">
<item name="Insert"><value>0</value></item>
<item name="Delete"><value>1</value></item>
@ -1797,7 +1797,7 @@ The specified window does not exist.
<pad bytes="1" />
<field type="WINDOW" name="window" />
</request>
<enum name="ConfigWindow">
<item name="X"> <bit>0</bit></item>
<item name="Y"> <bit>1</bit></item>
@ -1807,7 +1807,7 @@ The specified window does not exist.
<item name="Sibling"> <bit>5</bit></item>
<item name="StackMode"> <bit>6</bit></item>
</enum>
<enum name="StackMode">
<item name="Above"> <value>0</value></item>
<item name="Below"> <value>1</value></item>
@ -1852,7 +1852,7 @@ The specified window does not exist.
<field type="CARD32" name="stack_mode" enum="StackMode"/>
</bitcase>
</switch>
<doc>
<brief>Configures window attributes</brief>
<description><![CDATA[
@ -2141,7 +2141,7 @@ A value other than 0 or 1 was specified for `only_if_exists`.
</list>
</reply>
</request>
<enum name="PropMode">
<item name="Replace"><value>0</value></item>
<item name="Prepend"><value>1</value></item>
@ -2252,7 +2252,7 @@ The X server could not store the property (no memory?).
<field type="WINDOW" name="window" />
<field type="ATOM" name="property" />
</request>
<enum name="GetPropertyType">
<item name="Any"><value>0</value></item>
</enum>
@ -3799,7 +3799,7 @@ The specified pixmap does not exist.
]]></error>
</doc>
</request>
<enum name="GC">
<item name="Function"> <bit>0</bit></item>
<item name="PlaneMask"> <bit>1</bit></item>
@ -4451,7 +4451,7 @@ The specified graphics context does not exist.
<field type="CARD16" name="height" />
<field type="CARD32" name="bit_plane" />
</request>
<enum name="CoordMode">
<item name="Origin"> <value>0</value></item>
<item name="Previous"><value>1</value></item>
@ -4665,7 +4665,7 @@ TODO: reasons?
<field type="GCONTEXT" name="gc" />
<list type="ARC" name="arcs" />
</request>
<enum name="ImageFormat">
<item name="XYBitmap"><value>0</value></item>
<item name="XYPixmap"><value>1</value></item>
@ -5010,7 +5010,7 @@ The specified colormap `cmap` does not exist.
<field type="BYTE" name="flags" mask="ColorFlag" />
<pad bytes="1" />
</struct>
<request name="StoreColors" opcode="89" combine-adjacent="true">
<pad bytes="1" />
<field type="COLORMAP" name="cmap" />
@ -5196,7 +5196,7 @@ The specified cursor does not exist.
<enum name="QueryShapeOf">
<item name="LargestCursor"> <value>0</value></item>
<item name="FastestTile"> <value>1</value></item>
<item name="FastestStipple"><value>2</value></item>
<item name="FastestStipple"><value>2</value></item>
</enum>
<request name="QueryBestSize" opcode="97">
@ -5569,7 +5569,7 @@ The specified `resource` does not exist.
</list>
</reply>
</request>
<enum name="MapIndex">
<item name="Shift"> <value>0</value></item>
<item name="Lock"> <value>1</value></item>

6
src/xtest.xml
View file

@ -30,7 +30,7 @@ authorization from the authors.
major-version="2" minor-version="2">
<import>xproto</import>
<!-- Requests -->
<request name="GetVersion" opcode="0">
<field type="CARD8" name="major_version" />
@ -54,7 +54,7 @@ authorization from the authors.
<field type="BOOL" name="same" />
</reply>
</request>
<!-- There are several ways to use the FakeInput request:
1. Simulate a keypress:
type = XCBKeyPress or XCBKeyRelease
@ -99,7 +99,7 @@ authorization from the authors.
<field type="BOOL" name="impervious" />
<pad bytes="3" />
</request>
<!-- No events or errors -->
</xcb>

8
src/xv.xml
View file

@ -57,7 +57,7 @@ authorization from the authors.
<item name="Gettable"><bit>0</bit></item>
<item name="Settable"><bit>1</bit></item>
</enum>
<enum name="VideoNotifyReason">
<item name="Started"> <value>0</value> </item>
<item name="Stopped"> <value>1</value> </item>
@ -138,7 +138,7 @@ authorization from the authors.
</list>
<!-- Some XPointer "obdata" for SHM use-->
</struct>
<struct name="AttributeInfo">
<field type="CARD32" name="flags" mask="AttributeFlag" />
<field type="INT32" name="min" />
@ -205,8 +205,8 @@ authorization from the authors.
<field type="ATOM" name="attribute" />
<field type="INT32" name="value" />
</event>
<!-- Requests -->
<request name="QueryExtension" opcode="0">
<reply>

12
src/xvmc.xml
View file

@ -44,14 +44,14 @@ authorization from the authors.
<field type="CARD32" name="mc_type" />
<field type="CARD32" name="flags" />
</struct>
<request name="QueryVersion" opcode="0">
<request name="QueryVersion" opcode="0">
<reply>
<pad bytes="1" />
<field type="CARD32" name="major" />
<field type="CARD32" name="minor" />
</reply>
</request>
</request>
<request name="ListSurfaceTypes" opcode="1">
<field type="PORT" name="port_id" />
@ -87,7 +87,7 @@ authorization from the authors.
<request name="DestroyContext" opcode="3">
<field type="CONTEXT" name="context_id" />
</request>
<request name="CreateSurface" opcode="4">
<field type="SURFACE" name="surface_id" />
<field type="CONTEXT" name="context_id" />
@ -140,7 +140,7 @@ authorization from the authors.
<list type="ImageFormatInfo" name="types">
<fieldref>num</fieldref>
</list>
</reply>
</reply>
</request>
</xcb>
</xcb>

10
xcbgen/expr.py
View file

@ -96,7 +96,7 @@ class Expression(object):
self.rhs = Expression(list(elt)[0], parent)
self.lenfield_name = self.rhs.lenfield_name
elif elt.tag == 'value':
# Constant expression
self.nmemb = int(elt.text, 0)
@ -110,7 +110,7 @@ class Expression(object):
elif elt.tag == 'enumref':
self.op = 'enumref'
self.lenfield_name = (elt.get('ref'), elt.text)
elif elt.tag == 'sumof':
self.op = 'sumof'
self.lenfield_name = elt.get('ref')
@ -160,11 +160,11 @@ class Expression(object):
self.lenfield_name = self.lenfield_name[1]
elif self.op == 'sumof':
# need to find the field with lenfield_name
for p in reversed(parents):
for p in reversed(parents):
fields = dict([(f.field_name, f) for f in p.fields])
if self.lenfield_name in fields.keys():
if p.is_case_or_bitcase:
# switch is the anchestor
# switch is the anchestor
self.lenfield_parent = p.parents[-1]
else:
self.lenfield_parent = p
@ -173,4 +173,4 @@ class Expression(object):
break
self.recursive_resolve_tasks(module, parents)

4
xcbgen/state.py
View file

@ -40,9 +40,9 @@ class Namespace(object):
# Events
self.events = {}
# Get root element attributes
if self.root.get('extension-xname', False):
if self.root.get('extension-xname', False):
self.is_ext = True
self.major_version = self.root.get('major-version')
self.minor_version = self.root.get('minor-version')

14
xcbgen/xtypes.py
View file

@ -503,7 +503,7 @@ class PadType(Type):
log.ok(start_align, "", self, callstack, after_align)
return after_align
class ComplexType(Type):
'''
Derived class which represents a structure. Base type for all structure types.
@ -765,7 +765,7 @@ class ComplexType(Type):
class SwitchType(ComplexType):
'''
Derived class which represents a List of Items.
Derived class which represents a List of Items.
Public fields added:
bitcases is an array of Bitcase objects describing the list items
@ -776,7 +776,7 @@ class SwitchType(ComplexType):
self.parents = parents
# FIXME: switch cannot store lenfields, so it should just delegate the parents
self.lenfield_parent = list(parents) + [self]
# self.fields contains all possible fields collected from the Bitcase objects,
# self.fields contains all possible fields collected from the Bitcase objects,
# whereas self.items contains the Bitcase objects themselves
self.bitcases = []
@ -799,7 +799,7 @@ class SwitchType(ComplexType):
else:
field_type = self.name + (field_name,)
# use self.parent to indicate anchestor,
# use self.parent to indicate anchestor,
# as switch does not contain named fields itself
if child.tag == 'bitcase':
type = BitcaseType(index, field_type, child, *parents)
@ -810,7 +810,7 @@ class SwitchType(ComplexType):
if field_name is None:
type.has_name = False
# Get the full type name for the field
field_type = type.name
field_type = type.name
visible = True
# add the field to ourself
@ -861,7 +861,7 @@ class SwitchType(ComplexType):
def calc_size(self):
pass
# note: switch is _always_ of variable size, but we indicate here wether
# note: switch is _always_ of variable size, but we indicate here wether
# it contains elements that are variable-sized themselves
def fixed_size(self):
return False
@ -1159,7 +1159,7 @@ class Reply(ComplexType):
self.fields.append(Field(tcard16, tcard16.name, 'sequence', False, True, True))
self.fields.append(Field(tcard32, tcard32.name, 'length', False, True, True))
ComplexType.resolve(self, module)
class Request(ComplexType):
'''