fdo-mirrors/xorg-xcbproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xcbproto.git synced 2026-05-05 19:18:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ambiguously qualified type names

Browse source 
dpms.xml defines a type called EventMask, named the same as the
different one in xproto.xml. So it should qualify the name as
dpms:EventMask to disambiguate, according to the text in
doc/xml-xcb.txt under "Structure Contents" ("The type name must refer
to only one possible type").

The same goes for xinput:EventMask, present:EventMask, present:Notify,
and glx:BOOL32.
This commit is contained in:
Simon Tatham 2025-04-27 18:41:19 +01:00
parent faa9c89eb3
commit ea8d997477
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dpms.xml
View file

@ -91,7 +91,7 @@ authorization from the authors.
</enum>
<request name="SelectInput" opcode="8">
<field type="CARD32" name="event_mask" mask="EventMask"/>
<field type="CARD32" name="event_mask" mask="dpms:EventMask"/>
</request>
<event name="InfoNotify" number="0" xge="true">

10
src/glx.xml
View file

@ -1097,7 +1097,7 @@ The patch that fixed this server bug in X.org is here:
<field type="CARD32" name="capability" />
<reply>
<pad bytes="1" />
<field type="BOOL32" name="ret_val" />
<field type="glx:BOOL32" name="ret_val" />
</reply>
</request>
@ -1106,7 +1106,7 @@ The patch that fixed this server bug in X.org is here:
<field type="CARD32" name="list" />
<reply>
<pad bytes="1" />
<field type="BOOL32" name="ret_val" />
<field type="glx:BOOL32" name="ret_val" />
</reply>
</request>
@ -1122,7 +1122,7 @@ The patch that fixed this server bug in X.org is here:
</list>
<reply>
<pad bytes="1" />
<field type="BOOL32" name="ret_val" />
<field type="glx:BOOL32" name="ret_val" />
<pad bytes="20" />
<list type="BOOL" name="data">
<op op="*">
@ -1158,7 +1158,7 @@ The patch that fixed this server bug in X.org is here:
<field type="CARD32" name="texture" />
<reply>
<pad bytes="1" />
<field type="BOOL32" name="ret_val" />
<field type="glx:BOOL32" name="ret_val" />
</reply>
</request>
@ -1454,7 +1454,7 @@ The patch that fixed this server bug in X.org is here:
<field type="CARD32" name="id" />
<reply>
<pad bytes="1" />
<field type="BOOL32" name="ret_val" />
<field type="glx:BOOL32" name="ret_val" />
</reply>
</request>

8
src/present.xml
View file

@ -111,7 +111,7 @@ OF THIS SOFTWARE.
<field type="CARD64" name="target_msc" />
<field type="CARD64" name="divisor" />
<field type="CARD64" name="remainder" />
<list type="Notify" name="notifies"/>
<list type="present:Notify" name="notifies"/>
</request>
<request name="NotifyMSC" opcode="2">
@ -129,7 +129,7 @@ OF THIS SOFTWARE.
<request name="SelectInput" opcode="3">
<field type="EVENT" name="eid"/>
<field type="WINDOW" name="window" />
<field type="CARD32" name="event_mask" mask="EventMask" />
<field type="CARD32" name="event_mask" mask="present:EventMask" />
</request>
<request name="QueryCapabilities" opcode="4">
@ -160,7 +160,7 @@ OF THIS SOFTWARE.
<field type="CARD64" name="target_msc" />
<field type="CARD64" name="divisor" />
<field type="CARD64" name="remainder" />
<list type="Notify" name="notifies"/>
<list type="present:Notify" name="notifies"/>
</request>
<!-- Events -->
@ -233,7 +233,7 @@ OF THIS SOFTWARE.
<field type="CARD64" name="target_msc" />
<field type="CARD64" name="divisor" />
<field type="CARD64" name="remainder" />
<list type="Notify" name="notifies" />
<list type="present:Notify" name="notifies" />
</event>
</xcb>

4
src/xinput.xml
View file

@ -1574,7 +1574,7 @@ authorization from the authors.
<field type="WINDOW" name="window" />
<field type="CARD16" name="num_mask" />
<pad bytes="2" />
<list type="EventMask" name="masks">
<list type="xinput:EventMask" name="masks">
<fieldref>num_mask</fieldref>
</list>
</request>
@ -2057,7 +2057,7 @@ authorization from the authors.
<pad bytes="1" />
<field type="CARD16" name="num_masks" />
<pad bytes="22" />
<list type="EventMask" name="masks">
<list type="xinput:EventMask" name="masks">
<fieldref>num_masks</fieldref>
</list>
</reply>