projects
/
free-sw
/
xcb
/
proto
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make CompositeGlyphs* usable.
[free-sw/xcb/proto]
/
src
/
xproto.xml
diff --git
a/src/xproto.xml
b/src/xproto.xml
index
dd9ea42
..
7fcbc2f
100644
(file)
--- a/
src/xproto.xml
+++ b/
src/xproto.xml
@@
-47,35
+47,25
@@
authorization from the authors.
<xidtype name="ATOM" />
<xidtype name="ATOM" />
- <union name="DRAWABLE">
- <
field type="WINDOW" name="window" /
>
- <
field type="PIXMAP" name="pixmap" /
>
- </union>
+ <
xid
union name="DRAWABLE">
+ <
type>WINDOW</type
>
+ <
type>PIXMAP</type
>
+ </
xid
union>
- <union name="FONTABLE">
- <
field type="FONT" name="font" /
>
- <
field type="GCONTEXT" name="gcontext" /
>
- </union>
+ <
xid
union name="FONTABLE">
+ <
type>FONT</type
>
+ <
type>GCONTEXT</type
>
+ </
xid
union>
- <struct name="VISUALID">
- <field type="CARD32" name="id" />
- </struct>
+ <typedef oldname="CARD32" newname="VISUALID" />
- <struct name="TIMESTAMP">
- <field type="CARD32" name="id" />
- </struct>
+ <typedef oldname="CARD32" newname="TIMESTAMP" />
- <struct name="KEYSYM">
- <field type="CARD32" name="id" />
- </struct>
+ <typedef oldname="CARD32" newname="KEYSYM" />
- <struct name="KEYCODE">
- <field type="CARD8" name="id" />
- </struct>
+ <typedef oldname="CARD8" newname="KEYCODE" />
- <struct name="BUTTON">
- <field type="CARD8" name="id" />
- </struct>
+ <typedef oldname="CARD8" newname="BUTTON" />
<struct name="POINT">
<field type="INT16" name="x" />
<struct name="POINT">
<field type="INT16" name="x" />
@@
-159,7
+149,7
@@
authorization from the authors.
</list>
</struct>
</list>
</struct>
- <struct name="SetupReq">
+ <struct name="SetupReq
uest
">
<field type="CARD8" name="byte_order" />
<pad bytes="1" />
<field type="CARD16" name="protocol_major_version" />
<field type="CARD8" name="byte_order" />
<pad bytes="1" />
<field type="CARD16" name="protocol_major_version" />
@@
-1029,7
+1019,7
@@
authorization from the authors.
<field type="TIMESTAMP" name="time" />
</request>
<field type="TIMESTAMP" name="time" />
</request>
- <enum name="Button">
+ <enum name="Button
Index
">
<item name="Any"><value>0</value></item>
<item name="1"> <value>1</value></item>
<item name="2"> <value>2</value></item>
<item name="Any"><value>0</value></item>
<item name="1"> <value>1</value></item>
<item name="2"> <value>2</value></item>
@@
-2129,7
+2119,7
@@
authorization from the authors.
</reply>
</request>
</reply>
</request>
- <enum name="Host">
+ <enum name="Host
Mode
">
<item name="Insert"><value>0</value></item>
<item name="Delete"><value>1</value></item>
</enum>
<item name="Insert"><value>0</value></item>
<item name="Delete"><value>1</value></item>
</enum>