[Xcb-commit] Branch 'xspec' - 3 commits - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Wed Mar 15 10:44:33 PST 2006
xcb-proto/src/extensions/bigreq.xml | 1
xcb-proto/src/extensions/composite.xml | 1
xcb-proto/src/extensions/damage.xml | 3 +
xcb-proto/src/extensions/dpms.xml | 1
xcb-proto/src/extensions/glx.xml | 50 +++++++++++++--------------
xcb-proto/src/extensions/randr.xml | 1
xcb-proto/src/extensions/record.xml | 15 ++++----
xcb-proto/src/extensions/render.xml | 30 ++++++++--------
xcb-proto/src/extensions/res.xml | 1
xcb-proto/src/extensions/screensaver.xml | 14 ++++---
xcb-proto/src/extensions/shape.xml | 1
xcb-proto/src/extensions/shm.xml | 1
xcb-proto/src/extensions/sync.xml | 57 +++++++++++++++----------------
xcb-proto/src/extensions/xc_misc.xml | 1
xcb-proto/src/extensions/xevie.xml | 1
xcb-proto/src/extensions/xf86dri.xml | 1
xcb-proto/src/extensions/xfixes.xml | 1
xcb-proto/src/extensions/xprint.xml | 1
xcb-proto/src/extensions/xv.xml | 1
xcb-proto/src/extensions/xvmc.xml | 1
xcb-proto/src/xcb_types.xml | 1
xcb-proto/src/xproto.xml | 5 +-
22 files changed, 105 insertions(+), 84 deletions(-)
New commits:
diff-tree 5fdd4479960baa91516c24980cc218373d12b09c (from 197e16c892d8e50ae16d2435fdc5f9f1c3ea2119)
Author: Alp Toker <alp at atoker.com>
Date: Wed Mar 15 18:44:24 2006 +0000
Add self to copyright headers where appropriate
diff --git a/xcb-proto/src/extensions/bigreq.xml b/xcb-proto/src/extensions/bigreq.xml
index e489015..b46a8cc 100644
--- a/xcb-proto/src/extensions/bigreq.xml
+++ b/xcb-proto/src/extensions/bigreq.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/xcb-proto/src/extensions/composite.xml b/xcb-proto/src/extensions/composite.xml
index ba14346..bc1d91c 100644
--- a/xcb-proto/src/extensions/composite.xml
+++ b/xcb-proto/src/extensions/composite.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2004 Josh Triplett. All Rights Reserved.
+Copyright (C) 2006 Alp Toker
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/xcb-proto/src/extensions/damage.xml b/xcb-proto/src/extensions/damage.xml
index 9247e4a..8ee62af 100644
--- a/xcb-proto/src/extensions/damage.xml
+++ b/xcb-proto/src/extensions/damage.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2004 Josh Triplett. All Rights Reserved.
+Copyright (C) 2006 Alp Toker
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/xcb-proto/src/extensions/dpms.xml b/xcb-proto/src/extensions/dpms.xml
index e09c948..cb45632 100644
--- a/xcb-proto/src/extensions/dpms.xml
+++ b/xcb-proto/src/extensions/dpms.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index 0c89924..06f66e9 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2005 Jeremy Kolb.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/xcb-proto/src/extensions/record.xml b/xcb-proto/src/extensions/record.xml
index 2bd0b17..8ca3193 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2005 Jeremy Kolb.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person ob/Sintaining a copy
diff --git a/xcb-proto/src/extensions/res.xml b/xcb-proto/src/extensions/res.xml
index db94aaa..b251ba1 100644
--- a/xcb-proto/src/extensions/res.xml
+++ b/xcb-proto/src/extensions/res.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2006 Jeremy Kolb
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/xcb-proto/src/extensions/screensaver.xml b/xcb-proto/src/extensions/screensaver.xml
index 2caf77f..034ea3a 100644
--- a/xcb-proto/src/extensions/screensaver.xml
+++ b/xcb-proto/src/extensions/screensaver.xml
@@ -2,6 +2,7 @@
<!--
Copyright (C) 2005 Vincent Torri.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person ob/Sintaining a copy
diff --git a/xcb-proto/src/extensions/shape.xml b/xcb-proto/src/extensions/shape.xml
index 09960e4..f0fb19a 100644
--- a/xcb-proto/src/extensions/shape.xml
+++ b/xcb-proto/src/extensions/shape.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/xcb-proto/src/extensions/shm.xml b/xcb-proto/src/extensions/shm.xml
index c18a8b7..ecfa6e4 100644
--- a/xcb-proto/src/extensions/shm.xml
+++ b/xcb-proto/src/extensions/shm.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/xcb-proto/src/extensions/sync.xml b/xcb-proto/src/extensions/sync.xml
index 588310b..9c5fe9e 100644
--- a/xcb-proto/src/extensions/sync.xml
+++ b/xcb-proto/src/extensions/sync.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2004 Mikko Torni and Josh Triplett.
+Copyright (C) 2006 Alp Toker
All Rights Reserved. See the file COPYING in this directory
for licensing information.
-->
diff --git a/xcb-proto/src/extensions/xc_misc.xml b/xcb-proto/src/extensions/xc_misc.xml
index 4380870..c02ac12 100644
--- a/xcb-proto/src/extensions/xc_misc.xml
+++ b/xcb-proto/src/extensions/xc_misc.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2004 Mikko Torni and Josh Triplett.
+Copyright (C) 2006 Alp Toker
All Rights Reserved. See the file COPYING in this directory
for licensing information.
-->
diff --git a/xcb-proto/src/extensions/xevie.xml b/xcb-proto/src/extensions/xevie.xml
index 5f09984..8539606 100644
--- a/xcb-proto/src/extensions/xevie.xml
+++ b/xcb-proto/src/extensions/xevie.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2004 Josh Triplett. All Rights Reserved.
+Copyright (C) 2006 Alp Toker
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/xcb-proto/src/extensions/xf86dri.xml b/xcb-proto/src/extensions/xf86dri.xml
index 92d445e..f583cae 100644
--- a/xcb-proto/src/extensions/xf86dri.xml
+++ b/xcb-proto/src/extensions/xf86dri.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2005 Jeremy Kolb.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person ob/Sintaining a copy
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index 943da80..a27db78 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2004 Josh Triplett. All Rights Reserved.
+Copyright (C) 2006 Alp Toker
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/xcb-proto/src/extensions/xprint.xml b/xcb-proto/src/extensions/xprint.xml
index 1e8e375..e71f95a 100644
--- a/xcb-proto/src/extensions/xprint.xml
+++ b/xcb-proto/src/extensions/xprint.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2005 Jeremy Kolb.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person ob/Sintaining a copy
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index bed70a7..3270adc 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2006 Jeremy Kolb.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index 8f0d62f..2f9a79c 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2006 Jeremy Kolb.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/xcb-proto/src/xcb_types.xml b/xcb-proto/src/xcb_types.xml
index 6b78b70..8192f25 100644
--- a/xcb-proto/src/xcb_types.xml
+++ b/xcb-proto/src/xcb_types.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 5e64d25..bd0480f 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
+Copyright (C) 2006 Alp Toker
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
diff-tree 197e16c892d8e50ae16d2435fdc5f9f1c3ea2119 (from d8365ff9aac4beb909be847515dc64947367ac06)
Author: Alp Toker <alp at atoker.com>
Date: Wed Mar 15 18:32:22 2006 +0000
screensaver enum annotations
diff --git a/xcb-proto/src/extensions/screensaver.xml b/xcb-proto/src/extensions/screensaver.xml
index 58a2c06..2caf77f 100644
--- a/xcb-proto/src/extensions/screensaver.xml
+++ b/xcb-proto/src/extensions/screensaver.xml
@@ -32,7 +32,7 @@ Draft Standard Version 1.0
-->
<extension header="screensaver" xname="SCREENSAVER" name="ScreenSaver" version="1.0">
<!-- Types -->
- <enum name="KIND">
+ <enum type="byte" name="ScreenSaverKind">
<item name="blanked"/>
<item name="internal"/>
<item name="external"/>
@@ -51,12 +51,13 @@ Draft Standard Version 1.0
</op>
</item>
</enum>
- <enum name="STATE">
+ <enum type="byte" name="ScreenSaverState">
<item name="off"/>
<item name="on"/>
<item name="cycle"/>
<item name="disabled"/>
</enum>
+<!-- TODO: merge with "WindowClass" -->
<enum name="CLASS">
<item name="copy-from-parent"/>
<item name="input-output"/>
@@ -78,12 +79,12 @@ Draft Standard Version 1.0
<request name="QueryInfo" number="1">
<field type="Drawable" name="drawable"/>
<reply>
- <field type="CARD8" name="state"/>
+ <field type="ScreenSaverState" name="state"/>
<field type="Window" name="saver-window"/>
<field type="CARD32" name="ms-until-server"/>
<field type="CARD32" name="ms-since-user-input"/>
<field type="CARD16" name="event-mask"/>
- <field type="KIND" name="kind"/>
+ <field type="ScreenSaverKind" name="kind"/>
<pad bytes="10"/>
</reply>
</request>
@@ -106,12 +107,12 @@ Draft Standard Version 1.0
<!-- Events -->
<event name="Notify" number="0">
<field type="CARD8" name="code"/>
- <field type="STATE" name="state"/>
+ <field type="ScreenSaverState" name="state"/>
<field type="CARD16" name="sequence-number"/>
<field type="Time" name="time"/>
<field type="Window" name="root"/>
<field type="Window" name="window"/>
- <field type="KIND" name="kind"/>
+ <field type="ScreenSaverKind" name="kind"/>
<field type="bool" name="forced"/>
<pad bytes="14"/>
</event>
diff-tree d8365ff9aac4beb909be847515dc64947367ac06 (from a3ed83459d12960fe6eae5bc3d20930b2d9063ba)
Author: Alp Toker <alp at atoker.com>
Date: Wed Mar 15 18:19:34 2006 +0000
Regex breakage fixups, more reconciliation
diff --git a/xcb-proto/src/extensions/damage.xml b/xcb-proto/src/extensions/damage.xml
index 5a817af..9247e4a 100644
--- a/xcb-proto/src/extensions/damage.xml
+++ b/xcb-proto/src/extensions/damage.xml
@@ -24,7 +24,7 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-<extension header="damage" xname="Damage" name="Damage" version="1">
+<extension header="damage" xname="DAMAGE" name="Damage" version="1">
<import>xfixes</import>
<type name="Damage"/>
<error name="BadDamage" number="0"/>
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index 930c9c2..57ac36b 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -77,7 +77,7 @@ The patch that fixed this server bug in
<event name="PbufferClobber" number="0">
<field type="CARD16" name="event_type"/>
<field type="CARD16" name="draw_type"/>
- <field type="glx:DRAWABLE" name="drawable"/>
+ <field type="glx:Drawable" name="drawable"/>
<field type="CARD32" name="b_mask"/>
<field type="CARD16" name="aux_buffer"/>
<field type="CARD16" name="x"/>
@@ -119,7 +119,7 @@ The patch that fixed this server bug in
</list>
</request>
<request name="CreateContext" number="3">
- <field type="glx:CONTEXT" name="context"/>
+ <field type="glx:Context" name="context"/>
<field type="VisualID" name="visual"/>
<field type="CARD32" name="screen"/>
<field type="CARD32" name="share_list"/>
@@ -127,11 +127,11 @@ The patch that fixed this server bug in
<pad bytes="3"/>
</request>
<request name="DestroyContext" number="4">
- <field type="glx:CONTEXT" name="context"/>
+ <field type="glx:Context" name="context"/>
</request>
<request name="MakeCurrent" number="5">
- <field type="glx:DRAWABLE" name="drawable"/>
- <field type="glx:CONTEXT" name="context"/>
+ <field type="glx:Drawable" name="drawable"/>
+ <field type="glx:Context" name="context"/>
<field type="CARD32" name="old_context_tag"/>
<reply>
<pad bytes="1"/>
@@ -140,7 +140,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="IsDirect" number="6">
- <field type="glx:CONTEXT" name="context"/>
+ <field type="glx:Context" name="context"/>
<reply>
<pad bytes="1"/>
<field type="bool" name="is_direct"/>
@@ -164,8 +164,8 @@ The patch that fixed this server bug in
<field type="CARD32" name="context_tag"/>
</request>
<request name="CopyContext" number="10">
- <field type="glx:CONTEXT" name="src"/>
- <field type="glx:CONTEXT" name="dest"/>
+ <field type="glx:Context" name="src"/>
+ <field type="glx:Context" name="dest"/>
<field type="CARD32" name="mask"/>
<field type="CARD32" name="src_context_tag"/>
</request>
@@ -237,7 +237,7 @@ The patch that fixed this server bug in
</enum>
<request name="SwapBuffers" number="11">
<field type="CARD32" name="context_tag"/>
- <field type="glx:DRAWABLE" name="drawable"/>
+ <field type="glx:Drawable" name="drawable"/>
</request>
<request name="UseXFont" number="12">
<field type="CARD32" name="context_tag"/>
@@ -249,8 +249,8 @@ The patch that fixed this server bug in
<request name="CreateGLXPixmap" number="13">
<field type="CARD32" name="screen"/>
<field type="VisualID" name="visual"/>
- <field type="xcb_types:PIXMAP" name="pixmap"/>
- <field type="glx:PIXMAP" name="glx_pixmap"/>
+ <field type="xcb_types:Pixmap" name="pixmap"/>
+ <field type="glx:Pixmap" name="glx_pixmap"/>
</request>
<request name="GetVisualConfigs" number="14">
<field type="CARD32" name="screen"/>
@@ -263,7 +263,7 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="DestroyGLXPixmap" number="15">
- <field type="glx:PIXMAP" name="glx_pixmap"/>
+ <field type="glx:Pixmap" name="glx_pixmap"/>
</request>
<!--
Context tag is not in the proto, should be part of the list of bytes
@@ -332,15 +332,15 @@ The patch that fixed this server bug in
<request name="CreatePixmap" number="22">
<field type="CARD32" name="screen"/>
<field type="CARD32" name="fbconfig"/>
- <field type="xcb_types:PIXMAP" name="pixmap"/>
- <field type="glx:PIXMAP" name="glx_pixmap"/>
+ <field type="xcb_types:Pixmap" name="pixmap"/>
+ <field type="glx:Pixmap" name="glx_pixmap"/>
<field type="CARD32" name="num_attribs"/>
</request>
<request name="DestroyPixmap" number="23">
- <field type="glx:PIXMAP" name="glx_pixmap"/>
+ <field type="glx:Pixmap" name="glx_pixmap"/>
</request>
<request name="CreateNewContext" number="24">
- <field type="glx:CONTEXT" name="context"/>
+ <field type="glx:Context" name="context"/>
<field type="CARD32" name="fbconfig"/>
<field type="Screen" name="screen"/>
<field type="CARD32" name="render_type"/>
@@ -350,7 +350,7 @@ The patch that fixed this server bug in
<field type="CARD16" name="reserved2"/>
</request>
<request name="QueryContext" number="25">
- <field type="glx:CONTEXT" name="context"/>
+ <field type="glx:Context" name="context"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="num_attributes"/>
@@ -360,9 +360,9 @@ The patch that fixed this server bug in
</request>
<request name="MakeContextCurrent" number="26">
<field type="CARD32" name="old_context_tag"/>
- <field type="glx:DRAWABLE" name="drawable"/>
- <field type="glx:DRAWABLE" name="read_drawable"/>
- <field type="glx:CONTEXT" name="context"/>
+ <field type="glx:Drawable" name="drawable"/>
+ <field type="glx:Drawable" name="read_drawable"/>
+ <field type="glx:Context" name="context"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="context_tag"/>
@@ -380,7 +380,7 @@ The patch that fixed this server bug in
<field type="PBUFFER" name="pbuffer"/>
</request>
<request name="GetDrawableAttributes" number="29">
- <field type="glx:DRAWABLE" name="drawable"/>
+ <field type="glx:Drawable" name="drawable"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="num_attribs"/>
@@ -389,20 +389,20 @@ The patch that fixed this server bug in
</reply>
</request>
<request name="ChangeDrawableAttributes" number="30">
- <field type="glx:DRAWABLE" name="drawable"/>
+ <field type="glx:Drawable" name="drawable"/>
<field type="CARD32" name="num_attribs"/>
<valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
<request name="CreateWindow" number="31">
<field type="Screen" name="screen"/>
<field type="FBCONFIG" name="fbconfig"/>
- <field type="xcb_types:WINDOW" name="window"/>
- <field type="glx:WINDOW" name="glx_window"/>
+ <field type="xcb_types:Window" name="window"/>
+ <field type="glx:Window" name="glx_window"/>
<field type="CARD32" name="num_attribs"/>
<valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
<request name="DeleteWindow" number="32">
- <field type="glx:WINDOW" name="glxwindow"/>
+ <field type="glx:Window" name="glxwindow"/>
</request>
<!-- Requests for GL Non-rendering Commands (single ops) -->
<request name="NewList" number="101">
diff --git a/xcb-proto/src/extensions/record.xml b/xcb-proto/src/extensions/record.xml
index bad8372..2bd0b17 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -97,7 +97,7 @@ authorization from the authors.
</reply>
</request>
<request name="CreateContext" number="1">
- <field type="record:CONTEXT" name="context"/>
+ <field type="record:Context" name="context"/>
<field type="ElementHeader" name="element-header"/>
<pad bytes="3"/>
<field type="CARD32" name="num-client-specs"/>
@@ -110,7 +110,7 @@ authorization from the authors.
</list>
</request>
<request name="RegisterClients" number="2">
- <field type="record:CONTEXT" name="context"/>
+ <field type="record:Context" name="context"/>
<field type="ElementHeader" name="element-header"/>
<pad bytes="3"/>
<field type="CARD32" name="num-client-specs"/>
@@ -123,14 +123,14 @@ authorization from the authors.
</list>
</request>
<request name="UnregisterClients" number="3">
- <field type="record:CONTEXT" name="context"/>
+ <field type="record:Context" name="context"/>
<field type="CARD32" name="num-client-specs"/>
<list type="ClientSpec" name="client-specs">
<fieldref>num-client-specs</fieldref>
</list>
</request>
<request name="GetContext" number="4">
- <field type="record:CONTEXT" name="context"/>
+ <field type="record:Context" name="context"/>
<reply>
<field type="bool" name="enabled"/>
<field type="ElementHeader" name="element-header"/>
@@ -143,7 +143,7 @@ authorization from the authors.
</reply>
</request>
<request name="EnableContext" number="5">
- <field type="record:CONTEXT" name="context"/>
+ <field type="record:Context" name="context"/>
<reply>
<field type="CARD8" name="category"/>
<field type="ElementHeader" name="element-header"/>
@@ -157,9 +157,9 @@ authorization from the authors.
</reply>
</request>
<request name="DisableContext" number="6">
- <field type="record:CONTEXT" name="context"/>
+ <field type="record:Context" name="context"/>
</request>
<request name="FreeContext" number="7">
- <field type="record:CONTEXT" name="context"/>
+ <field type="record:Context" name="context"/>
</request>
</extension>
diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index c8b18ac..91f9fd2 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -154,7 +154,7 @@ for licensing information.
<item name="none"/>
</enum>
<typedef oldname="CARD32" newname="Glyph"/>
- <type name="Glyphset"/>
+ <type name="GlyphSet"/>
<type name="Picture"/>
<type name="PictFormat"/>
<typedef oldname="INT32" newname="Fixed"/>
@@ -358,18 +358,18 @@ for licensing information.
<!-- opcode 15 reserved for ColorTriangles -->
<!-- opcode 16 reserved for Transform -->
<request name="CreateGlyphSet" number="17">
- <field type="Glyphset" name="gsid"/>
+ <field type="GlyphSet" name="gsid"/>
<field type="PictFormat" name="format"/>
</request>
<request name="ReferenceGlyphSet" number="18">
- <field type="Glyphset" name="gsid"/>
- <field type="Glyphset" name="existing"/>
+ <field type="GlyphSet" name="gsid"/>
+ <field type="GlyphSet" name="existing"/>
</request>
<request name="FreeGlyphSet" number="19">
- <field type="Glyphset" name="glyphset"/>
+ <field type="GlyphSet" name="glyphset"/>
</request>
<request name="AddGlyphs" number="20">
- <field type="Glyphset" name="glyphset"/>
+ <field type="GlyphSet" name="glyphset"/>
<field type="CARD32" name="glyphs-len"/>
<list type="CARD32" name="glyphids">
<fieldref>glyphs-len</fieldref>
@@ -381,14 +381,14 @@ for licensing information.
</request>
<!-- opcode 21 reserved for AddGlyphsFromPicture -->
<request name="FreeGlyphs" number="22">
- <field type="Glyphset" name="glyphset"/>
+ <field type="GlyphSet" name="glyphset"/>
<list type="Glyph" name="glyphs"/>
</request>
- <struct name="GlyphsetElt">
+ <struct name="GlyphSetElt">
<field type="CARD8" name="len"/>
<pad bytes="3"/>
<field type="Point" name="delta"/>
- <field type="Glyphset" name="glyphset"/>
+ <field type="GlyphSet" name="glyphset"/>
</struct>
<!-- CompositeGlyphs8 -->
<struct name="GLYPHELT8">
@@ -401,7 +401,7 @@ for licensing information.
</struct>
<union name="GLYPHITEM8">
<field type="GLYPHELT8" name="glyphelt"/>
- <field type="GlyphsetElt" name="glyphset"/>
+ <field type="GlyphSetElt" name="glyphset"/>
</union>
<request name="CompositeGlyphs8" number="23">
<field type="CARD8" name="op"/>
@@ -409,7 +409,7 @@ for licensing information.
<field type="Picture" name="src"/>
<field type="Picture" name="dst"/>
<field type="PictFormat" name="mask-format"/>
- <field type="Glyphset" name="glyphset"/>
+ <field type="GlyphSet" name="glyphset"/>
<field type="INT16" name="src-x"/>
<field type="INT16" name="src-y"/>
<list type="GLYPHITEM8" name="glyphcmds"/>
@@ -425,7 +425,7 @@ for licensing information.
</struct>
<union name="GLYPHITEM16">
<field type="GLYPHELT16" name="glyphelt"/>
- <field type="GlyphsetElt" name="glyphset"/>
+ <field type="GlyphSetElt" name="glyphset"/>
</union>
<request name="CompositeGlyphs16" number="24">
<field type="CARD8" name="op"/>
@@ -433,7 +433,7 @@ for licensing information.
<field type="Picture" name="src"/>
<field type="Picture" name="dst"/>
<field type="PictFormat" name="mask-format"/>
- <field type="Glyphset" name="glyphset"/>
+ <field type="GlyphSet" name="glyphset"/>
<field type="Point" name="src-point"/>
<list type="GLYPHITEM16" name="glyphcmds"/>
</request>
@@ -448,7 +448,7 @@ for licensing information.
</struct>
<union name="GLYPHITEM32">
<field type="GLYPHELT32" name="glyphelt"/>
- <field type="GlyphsetElt" name="glyphset"/>
+ <field type="GlyphSetElt" name="glyphset"/>
</union>
<request name="CompositeGlyphs32" number="25">
<field type="CARD8" name="op"/>
@@ -456,7 +456,7 @@ for licensing information.
<field type="Picture" name="src"/>
<field type="Picture" name="dst"/>
<field type="PictFormat" name="mask-format"/>
- <field type="Glyphset" name="glyphset"/>
+ <field type="GlyphSet" name="glyphset"/>
<field type="Point" name="src-point"/>
<list type="GLYPHITEM32" name="glyphcmds"/>
</request>
diff --git a/xcb-proto/src/extensions/sync.xml b/xcb-proto/src/extensions/sync.xml
index d95ac5e..588310b 100644
--- a/xcb-proto/src/extensions/sync.xml
+++ b/xcb-proto/src/extensions/sync.xml
@@ -5,30 +5,30 @@ All Rights Reserved. See the file COPYI
for licensing information.
-->
<extension header="sync" xname="SYNC" name="Sync">
- <type name="COUNTER"/>
+ <type name="Counter"/>
<error name="Counter" number="0">
<field type="CARD32" name="bad-counter"/>
<field type="CARD16" name="minor-opcode"/>
<field type="CARD8" name="major-opcode"/>
</error>
- <type name="ALARM"/>
+ <type name="Alarm"/>
<error name="Alarm" number="1">
<field type="CARD32" name="bad-alarm"/>
<field type="CARD16" name="minor-opcode"/>
<field type="CARD8" name="major-opcode"/>
</error>
- <enum name="ALARMSTATE">
+ <enum name="AlarmState">
<item name="active"/>
<item name="inactive"/>
<item name="destroyed"/>
</enum>
- <enum name="TESTTYPE">
+ <enum name="TestType">
<item name="positive-transition"/>
<item name="negative-transition"/>
<item name="positive-comparison"/>
<item name="negative-comparison"/>
</enum>
- <enum name="VALUETYPE">
+ <enum name="ValueType">
<item name="absolute"/>
<item name="relative"/>
</enum>
@@ -36,22 +36,22 @@ for licensing information.
<field type="INT32" name="hi"/>
<field type="CARD32" name="lo"/>
</struct>
- <struct name="SYSTEMCOUNTER">
- <field type="COUNTER" name="counter"/>
+ <struct name="SystemCounter">
+ <field type="Counter" name="counter"/>
<field type="INT64" name="resolution"/>
<field type="CARD16" name="name-len"/>
<list type="CARD8" name="name">
<fieldref>name-len</fieldref>
</list>
</struct>
- <struct name="TRIGGER">
- <field type="COUNTER" name="counter"/>
- <field type="VALUETYPE" name="wait-type"/>
+ <struct name="Trigger">
+ <field type="Counter" name="counter"/>
+ <field type="ValueType" name="wait-type"/>
<field type="INT64" name="wait-value"/>
- <field type="TESTTYPE" name="test-type"/>
+ <field type="TestType" name="test-type"/>
</struct>
- <struct name="WAITCONDITION">
- <field type="TRIGGER" name="trigger"/>
+ <struct name="WaitCondition">
+ <field type="Trigger" name="trigger"/>
<field type="INT64" name="event-threshold"/>
</struct>
<request name="Initialize" number="0">
@@ -66,55 +66,55 @@ for licensing information.
<pad bytes="1"/>
<field type="CARD32" name="counters-len"/>
<pad bytes="20"/>
- <list type="SYSTEMCOUNTER" name="counters">
+ <list type="SystemCounter" name="counters">
<fieldref>counters-len</fieldref>
</list>
</reply>
</request>
<request name="CreateCounter" number="2">
- <field type="COUNTER" name="id"/>
+ <field type="Counter" name="id"/>
<field type="INT64" name="initial-value"/>
</request>
<request name="DestroyCounter" number="6">
- <field type="COUNTER" name="counter"/>
+ <field type="Counter" name="counter"/>
</request>
<request name="QueryCounter" number="5">
- <field type="COUNTER" name="counter"/>
+ <field type="Counter" name="counter"/>
<reply>
<pad bytes="1"/>
<field type="INT64" name="counter-value"/>
</reply>
</request>
<request name="Await" number="7">
- <list type="WAITCONDITION" name="wait-list"/>
+ <list type="WaitCondition" name="wait-list"/>
</request>
<request name="ChangeCounter" number="4">
- <field type="COUNTER" name="counter"/>
+ <field type="Counter" name="counter"/>
<field type="INT64" name="amount"/>
</request>
<request name="SetCounter" number="3">
- <field type="COUNTER" name="counter"/>
+ <field type="Counter" name="counter"/>
<field type="INT64" name="value"/>
</request>
<request name="CreateAlarm" number="8">
- <field type="ALARM" name="id"/>
+ <field type="Alarm" name="id"/>
<valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="ChangeAlarm" number="9">
- <field type="ALARM" name="id"/>
+ <field type="Alarm" name="id"/>
<valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="DestroyAlarm" number="11">
- <field type="ALARM" name="alarm"/>
+ <field type="Alarm" name="alarm"/>
</request>
<request name="QueryAlarm" number="10">
- <field type="ALARM" name="alarm"/>
+ <field type="Alarm" name="alarm"/>
<reply>
<pad bytes="1"/>
- <field type="TRIGGER" name="trigger"/>
+ <field type="Trigger" name="trigger"/>
<field type="INT64" name="delta"/>
<field type="bool" name="events"/>
- <field type="ALARMSTATE" name="state"/>
+ <field type="AlarmState" name="state"/>
</reply>
</request>
<request name="SetPriority" number="12">
@@ -130,7 +130,7 @@ for licensing information.
</request>
<event name="CounterNotify" number="0">
<field type="CARD8" name="kind"/>
- <field type="COUNTER" name="counter"/>
+ <field type="Counter" name="counter"/>
<field type="INT64" name="wait-value"/>
<field type="INT64" name="counter-value"/>
<field type="Time" name="timestamp"/>
@@ -139,7 +139,7 @@ for licensing information.
</event>
<event name="AlarmNotify" number="1">
<field type="CARD8" name="kind"/>
- <field type="ALARM" name="alarm"/>
+ <field type="Alarm" name="alarm"/>
<field type="INT64" name="counter-value"/>
<field type="INT64" name="alarm-value"/>
<field type="Time" name="timestamp"/>
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 0f327d4..5e64d25 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -1397,7 +1397,7 @@ authorization from the authors.
<field type="CARD32" name="plane-mask"/>
<list type="CARD32" name="pixels"/>
</request>
- <struct name="COLORITEM">
+ <struct name="ColorItem">
<field type="CARD32" name="pixel"/>
<field type="Color" name="color"/>
<field type="byte" name="flags"/>
@@ -1406,7 +1406,7 @@ authorization from the authors.
<request name="StoreColors" number="89" combine-adjacent="true">
<pad bytes="1"/>
<field type="Colormap" name="cmap"/>
- <list type="COLORITEM" name="items"/>
+ <list type="ColorItem" name="items"/>
</request>
<request name="StoreNamedColor" number="90">
<field type="CARD8" name="flags"/>
More information about the xcb-commit
mailing list