[Xcb-commit] Branch 'xspec' - 3 commits - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Mon Mar 27 04:40:17 PST 2006
xcb-proto/src/extensions/glx.xml | 84 ++++++-----------------
xcb-proto/src/extensions/randr.xml | 44 +++---------
xcb-proto/src/extensions/record.xml | 30 ++------
xcb-proto/src/extensions/screensaver.xml | 18 +----
xcb-proto/src/extensions/xfixes.xml | 25 +------
xcb-proto/src/extensions/xv.xml | 36 +++-------
xcb-proto/src/xproto.xml | 109 ++++---------------------------
7 files changed, 80 insertions(+), 266 deletions(-)
New commits:
diff-tree 0620e39424503c1ac0a7d8b5a6e51d4ed5520aac (from 20b47af53bb57f008e57f481fc658259b02c848a)
Author: Alp Toker <alp at atoker.com>
Date: Mon Mar 27 13:40:06 2006 +0100
More simplification
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index 52e80aa..e608b7f 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -72,18 +72,10 @@ authorization from the authors.
</reply>
</request>
<enum name="SetConfig">
- <item name="success">
- <value>0</value>
- </item>
- <item name="invalid-config-time">
- <value>1</value>
- </item>
- <item name="invalid-time">
- <value>2</value>
- </item>
- <item name="failed">
- <value>3</value>
- </item>
+ <item name="success"/>
+ <item name="invalid-config-time"/>
+ <item name="invalid-time"/>
+ <item name="failed"/>
</enum>
<request name="SelectInput" number="4">
<field type="Window" name="window"/>
diff --git a/xcb-proto/src/extensions/screensaver.xml b/xcb-proto/src/extensions/screensaver.xml
index 034ea3a..ae5abf8 100644
--- a/xcb-proto/src/extensions/screensaver.xml
+++ b/xcb-proto/src/extensions/screensaver.xml
@@ -38,19 +38,9 @@ Draft Standard Version 1.0
<item name="internal"/>
<item name="external"/>
</enum>
- <enum name="EVENT">
- <item name="notify-mask">
- <op op="<<">
- <value>1</value>
- <value>0</value>
- </op>
- </item>
- <item name="cycle-mask">
- <op op="<<">
- <value>1</value>
- <value>1</value>
- </op>
- </item>
+ <mask name="Event">
+ <item name="notify-mask"/>
+ <item name="cycle-mask"/>
</enum>
<enum type="byte" name="ScreenSaverState">
<item name="off"/>
@@ -91,7 +81,7 @@ Draft Standard Version 1.0
</request>
<request name="SelectInput" number="2">
<field type="Drawable" name="drawable"/>
- <field type="EVENT" name="event-mask"/>
+ <field type="Event" name="event-mask"/>
</request>
<request name="SetAttributes" number="3">
<field type="Drawable" name="drawable"/>
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index 2632cc1..4f3b4c5 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -63,26 +63,11 @@ authorization from the authors.
<item name="selection-window-destroy"/>
<item name="selection-client-close"/>
</enum>
- <enum name="SelectionEventMask">
- <item name="set-selection-owner">
- <op op="<<">
- <value>1</value>
- <value>0</value>
- </op>
- </item>
- <item name="selection-window-destroy">
- <op op="<<">
- <value>1</value>
- <value>1</value>
- </op>
- </item>
- <item name="selection-client-close">
- <op op="<<">
- <value>1</value>
- <value>2</value>
- </op>
- </item>
- </enum>
+ <mask name="SelectionEventMask">
+ <item name="set-selection-owner"/>
+ <item name="selection-window-destroy"/>
+ <item name="selection-client-close"/>
+ </mask>
<event name="SelectionNotify" number="0">
<!-- SelectionEvent -->
<field type="CARD8" name="subtype"/>
diff-tree 20b47af53bb57f008e57f481fc658259b02c848a (from 39b2d093eecc995c5877cc11cc55448ce3ffed52)
Author: Alp Toker <alp at atoker.com>
Date: Mon Mar 27 13:28:09 2006 +0100
Introduce mask element; simplify mask enums
Correct CW mask item names
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index c55c0dd..d41d5c5 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -169,71 +169,31 @@ The patch that fixed this server bug in
<field type="ContextTag" name="src_context_tag"/>
</request>
<!-- Enum for CopyContext: mask -->
- <enum name="GC">
- <item name="_GL_CURRENT_BIT">
- <value>0x00000001</value>
- </item>
- <item name="_GL_POINT_BIT">
- <value>0x00000002</value>
- </item>
- <item name="_GL_LINE_BIT">
- <value>0x00000004</value>
- </item>
- <item name="_GL_POLYGON_BIT">
- <value>0x00000008</value>
- </item>
- <item name="_GL_POLYGON_STIPPLE_BIT">
- <value>0x00000010</value>
- </item>
- <item name="_GL_PIXEL_MODE_BIT">
- <value>0x00000020</value>
- </item>
- <item name="_GL_LIGHTING_BIT">
- <value>0x00000040</value>
- </item>
- <item name="_GL_FOG_BIT">
- <value>0x00000080</value>
- </item>
- <item name="_GL_DEPTH_BUFFER_BIT">
- <value>0x00000100</value>
- </item>
- <item name="_GL_ACCUM_BUFFER_BIT">
- <value>0x00000200</value>
- </item>
- <item name="_GL_STENCIL_BUFFER_BIT">
- <value>0x00000400</value>
- </item>
- <item name="_GL_VIEWPORT_BIT">
- <value>0x00000800</value>
- </item>
- <item name="_GL_TRANSFORM_BIT">
- <value>0x00001000</value>
- </item>
- <item name="_GL_ENABLE_BIT">
- <value>0x00002000</value>
- </item>
- <item name="_GL_COLOR_BUFFER_BIT">
- <value>0x00004000</value>
- </item>
- <item name="_GL_HINT_BIT">
- <value>0x00008000</value>
- </item>
- <item name="_GL_EVAL_BIT">
- <value>0x00010000</value>
- </item>
- <item name="_GL_LIST_BIT">
- <value>0x00020000</value>
- </item>
- <item name="_GL_TEXTURE_BIT">
- <value>0x00040000</value>
- </item>
- <item name="_GL_SCISSOR_BIT">
- <value>0x00080000</value>
- </item>
+ <mask type="CARD32" name="GC">
+ <item name="_GL_CURRENT_BIT"/>
+ <item name="_GL_POINT_BIT"/>
+ <item name="_GL_LINE_BIT"/>
+ <item name="_GL_POLYGON_BIT"/>
+ <item name="_GL_POLYGON_STIPPLE_BIT"/>
+ <item name="_GL_PIXEL_MODE_BIT"/>
+ <item name="_GL_LIGHTING_BIT"/>
+ <item name="_GL_FOG_BIT"/>
+ <item name="_GL_DEPTH_BUFFER_BIT"/>
+ <item name="_GL_ACCUM_BUFFER_BIT"/>
+ <item name="_GL_STENCIL_BUFFER_BIT"/>
+ <item name="_GL_VIEWPORT_BIT"/>
+ <item name="_GL_TRANSFORM_BIT"/>
+ <item name="_GL_ENABLE_BIT"/>
+ <item name="_GL_COLOR_BUFFER_BIT"/>
+ <item name="_GL_HINT_BIT"/>
+ <item name="_GL_EVAL_BIT"/>
+ <item name="_GL_LIST_BIT"/>
+ <item name="_GL_TEXTURE_BIT"/>
+ <item name="_GL_SCISSOR_BIT"/>
<item name="_GL_ALL_ATTRIB_BITS">
<value>0x000ffffff</value>
</item>
- </enum>
+ </mask>
<request name="SwapBuffers" number="11">
<field type="ContextTag" name="context_tag"/>
<field type="glx:Drawable" name="drawable"/>
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index 06f66e9..52e80aa 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -29,26 +29,14 @@ authorization from the authors.
<extension header="randr" xname="RANDR" name="RandR" version="1.1">
<!-- for SubpixelOrder, import render -->
<import>render</import>
- <enum name="Rotation">
- <item name="rotate0">
- <value>1</value>
- </item>
- <item name="rotate90">
- <value>2</value>
- </item>
- <item name="rotate180">
- <value>4</value>
- </item>
- <item name="rotate270">
- <value>8</value>
- </item>
- <item name="reflect-x">
- <value>16</value>
- </item>
- <item name="reflect-y">
- <value>32</value>
- </item>
- </enum>
+ <mask name="Rotation">
+ <item name="rotate0"/>
+ <item name="rotate90"/>
+ <item name="rotate180"/>
+ <item name="rotate270"/>
+ <item name="reflect-x"/>
+ <item name="reflect-y"/>
+ </mask>
<struct name="RefreshRates">
<field type="CARD16" name="n-rates"/>
<list type="CARD16" name="rates">
diff --git a/xcb-proto/src/extensions/record.xml b/xcb-proto/src/extensions/record.xml
index 3fae883..27640ec 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -53,28 +53,16 @@ authorization from the authors.
<field type="bool" name="client-died"/>
</struct>
<typedef oldname="CARD8" newname="ElementHeader"/>
- <enum name="HType">
- <item name="from-server-time">
- <value>0x01</value>
- </item>
- <item name="from-client-time">
- <value>0x02</value>
- </item>
- <item name="from-client-sequence">
- <value>0x04</value>
- </item>
- </enum>
+ <mask type="CARD8" name="HType">
+ <item name="from-server-time"/>
+ <item name="from-client-time"/>
+ <item name="from-client-sequence"/>
+ </mask>
<typedef oldname="CARD32" newname="ClientSpec"/>
<enum name="CS">
- <item name="current-clients">
- <value>1</value>
- </item>
- <item name="future-clients">
- <value>2</value>
- </item>
- <item name="all-clients">
- <value>3</value>
- </item>
+ <item name="current-clients"/>
+ <item name="future-clients"/>
+ <item name="all-clients"/>
</enum>
<struct name="ClientInfo">
<field type="ClientSpec" name="client-resource"/>
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index a1ae7fe..6bf1408 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -35,23 +35,13 @@ authorization from the authors.
<error name="BadPort" number="0"/>
<error name="BadEncoding" number="1"/>
<error name="BadControl" number="2"/>
- <enum name="Type">
- <item name="input-mask">
- <value>0x00000001</value>
- </item>
- <item name="output-mask">
- <value>0x00000002</value>
- </item>
- <item name="video-mask">
- <value>0x00000004</value>
- </item>
- <item name="still-mask">
- <value>0x00000008</value>
- </item>
- <item name="image-mask">
- <value>0x00000010</value>
- </item>
- </enum>
+ <mask type="CARD32" name="Type">
+ <item name="input-mask"/>
+ <item name="output-mask"/>
+ <item name="video-mask"/>
+ <item name="still-mask"/>
+ <item name="image-mask"/>
+ </mask>
<enum name="ImageFormatInfoType">
<item name="rgb"/>
<item name="yuv"/>
@@ -60,14 +50,10 @@ authorization from the authors.
<item name="packed"/>
<item name="planar"/>
</enum>
- <enum name="AttributeFlag">
- <item name="gettable">
- <value>0x01</value>
- </item>
- <item name="settable">
- <value>0x02</value>
- </item>
- </enum>
+ <mask type="CARD8" name="AttributeFlag">
+ <item name="gettable"/>
+ <item name="settable"/>
+ </mask>
<struct name="Rational">
<field type="INT32" name="numerator"/>
<field type="INT32" name="denominator"/>
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 3e387cf..2490325 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -497,98 +497,23 @@ authorization from the authors.
<item name="none"/>
</enum>
<!-- Window attributes for CreateWindow and ChangeWindowAttributes. -->
- <enum name="CW">
- <item name="back-pixmap">
- <op op="<<">
- <value>1</value>
- <value>0</value>
- </op>
- </item>
- <item name="back-pixel">
- <op op="<<">
- <value>1</value>
- <value>1</value>
- </op>
- </item>
- <item name="border-pixmap">
- <op op="<<">
- <value>1</value>
- <value>2</value>
- </op>
- </item>
- <item name="border-pixel">
- <op op="<<">
- <value>1</value>
- <value>3</value>
- </op>
- </item>
- <item name="bit-gravity">
- <op op="<<">
- <value>1</value>
- <value>4</value>
- </op>
- </item>
- <item name="win-gravity">
- <op op="<<">
- <value>1</value>
- <value>5</value>
- </op>
- </item>
- <item name="backing-store">
- <op op="<<">
- <value>1</value>
- <value>6</value>
- </op>
- </item>
- <item name="backing-planes">
- <op op="<<">
- <value>1</value>
- <value>7</value>
- </op>
- </item>
- <item name="backing-pixel">
- <op op="<<">
- <value>1</value>
- <value>8</value>
- </op>
- </item>
- <item name="override-redirect">
- <op op="<<">
- <value>1</value>
- <value>9</value>
- </op>
- </item>
- <item name="save-under">
- <op op="<<">
- <value>1</value>
- <value>10</value>
- </op>
- </item>
- <item name="event-mask">
- <op op="<<">
- <value>1</value>
- <value>11</value>
- </op>
- </item>
- <item name="dont-propagate">
- <op op="<<">
- <value>1</value>
- <value>12</value>
- </op>
- </item>
- <item name="colormap">
- <op op="<<">
- <value>1</value>
- <value>13</value>
- </op>
- </item>
- <item name="cursor">
- <op op="<<">
- <value>1</value>
- <value>14</value>
- </op>
- </item>
- </enum>
+ <mask type="CARD32" name="CW">
+ <item name="background-pixmap"/>
+ <item name="background-pixel"/>
+ <item name="border-pixmap"/>
+ <item name="border-pixel"/>
+ <item name="bit-gravity"/>
+ <item name="win-gravity"/>
+ <item name="backing-store"/>
+ <item name="backing-planes"/>
+ <item name="backing-pixel"/>
+ <item name="save-under"/>
+ <item name="event-mask"/>
+ <item name="do-not-propagate-mask"/>
+ <item name="override-redirect"/>
+ <item name="colormap"/>
+ <item name="cursor"/>
+ </mask>
<request name="CreateWindow" number="1">
<field type="CARD8" name="depth"/>
<field type="Window" name="wid"/>
diff-tree 39b2d093eecc995c5877cc11cc55448ce3ffed52 (from a37a6dd90100152b0c518745e177cd1691d257c5)
Author: Alp Toker <alp at atoker.com>
Date: Mon Mar 27 12:57:57 2006 +0100
Capitalization
diff --git a/xcb-proto/src/extensions/record.xml b/xcb-proto/src/extensions/record.xml
index a275e41..3fae883 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -28,7 +28,7 @@ authorization from the authors.
-->
<extension header="record" xname="RECORD" name="Record">
<!-- Types -->
- <resource name="CONTEXT"/>
+ <resource name="Context"/>
<struct name="Range8">
<field type="CARD8" name="first"/>
<field type="CARD8" name="last"/>
More information about the xcb-commit
mailing list