[Xcb-commit] Branch 'xspec' - 2 commits - xcb-proto

Alp Toker alp at kemper.freedesktop.org
Mon Mar 27 05:43:57 PST 2006


 xcb-proto/src/extensions/render.xml |  107 +++++++-----------------------------
 xcb-proto/src/extensions/xfixes.xml |   11 +--
 2 files changed, 24 insertions(+), 94 deletions(-)

New commits:
diff-tree aaaac41020bc742669c7eddd2273e1046ac4cf3a (from 70600af169f78871898367882ca406412e89d30b)
Author: Alp Toker <alp at atoker.com>
Date:   Mon Mar 27 14:43:49 2006 +0100

    More masks done. All "&lt;&lt;" ops now eliminated.

diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index 27323e1..6829a44 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -65,86 +65,21 @@ for licensing information.
     <item name="precise"/>
     <item name="imprecise"/>
   </enum>
-  <enum name="CP">
-    <item name="repeat">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>0</value>
-      </op>
-    </item>
-    <item name="alpha-map">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>1</value>
-      </op>
-    </item>
-    <item name="alpha-x-origin">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>2</value>
-      </op>
-    </item>
-    <item name="alpha-y-origin">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>3</value>
-      </op>
-    </item>
-    <item name="clip-x-origin">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>4</value>
-      </op>
-    </item>
-    <item name="clip-y-origin">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>5</value>
-      </op>
-    </item>
-    <item name="clip-mask">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>6</value>
-      </op>
-    </item>
-    <item name="graphics-exposure">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>7</value>
-      </op>
-    </item>
-    <item name="subwindow-mode">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>8</value>
-      </op>
-    </item>
-    <item name="poly-edge">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>9</value>
-      </op>
-    </item>
-    <item name="poly-mode">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>10</value>
-      </op>
-    </item>
-    <item name="dither">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>11</value>
-      </op>
-    </item>
-    <item name="component-alpha">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>12</value>
-      </op>
-    </item>
-  </enum>
+  <mask name="CP">
+    <item name="repeat"/>
+    <item name="alpha-map"/>
+    <item name="alpha-x-origin"/>
+    <item name="alpha-y-origin"/>
+    <item name="clip-x-origin"/>
+    <item name="clip-y-origin"/>
+    <item name="clip-mask"/>
+    <item name="graphics-exposure"/>
+    <item name="subwindow-mode"/>
+    <item name="poly-edge"/>
+    <item name="poly-mode"/>
+    <item name="dither"/>
+    <item name="component-alpha"/>
+  </mask>
   <enum type="CARD16" name="SubpixelOrder">
     <item name="unknown"/>
     <item name="horizontal-rgb"/>
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index 4f3b4c5..3c36633 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -87,14 +87,9 @@ authorization from the authors.
   <enum name="CursorNotify">
     <item name="display-cursor"/>
   </enum>
-  <enum name="CursorNotifyMask">
-    <item name="display-cursor">
-      <op op="&lt;&lt;">
-        <value>1</value>
-        <value>0</value>
-      </op>
-    </item>
-  </enum>
+  <mask name="CursorNotifyMask">
+    <item name="display-cursor"/>
+  </mask>
   <event name="CursorNotify" number="1">
 <!-- CursorNotify -->
     <field type="CARD8" name="subtype"/>
diff-tree 70600af169f78871898367882ca406412e89d30b (from 0620e39424503c1ac0a7d8b5a6e51d4ed5520aac)
Author: Alp Toker <alp at atoker.com>
Date:   Mon Mar 27 14:19:25 2006 +0100

    TODO update

diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index 50cb899..27323e1 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -317,7 +317,7 @@ for licensing information.
     <field type="CARD16" name="width"/>
     <field type="CARD16" name="height"/>
   </request>
-<!-- opcode 9 reserved for Scale -->
+<!-- TODO: opcode 9 reserved for Scale -->
   <request name="Trapezoids" number="10">
     <field type="CARD8" name="op"/>
     <pad bytes="3"/>
@@ -358,8 +358,8 @@ for licensing information.
     <field type="INT16" name="src-y"/>
     <list type="PointFixed" name="points"/>
   </request>
-<!-- opcode 14 reserved for ColorTrapezoids -->
-<!-- opcode 15 reserved for ColorTriangles -->
+<!-- TODO: opcode 14 reserved for ColorTrapezoids -->
+<!-- TODO: opcode 15 reserved for ColorTriangles -->
 <!-- opcode 16 reserved for Transform -->
   <request name="CreateGlyphSet" number="17">
     <field type="GlyphSet" name="gsid"/>
@@ -383,7 +383,7 @@ for licensing information.
     </list>
     <list type="byte" name="data"/>
   </request>
-<!-- opcode 21 reserved for AddGlyphsFromPicture -->
+<!-- TODO: opcode 21 reserved for AddGlyphsFromPicture -->
   <request name="FreeGlyphs" number="22">
     <field type="GlyphSet" name="glyphset"/>
     <list type="Glyph" name="glyphs"/>
@@ -528,10 +528,10 @@ for licensing information.
   </request>
   <!-- new in version 0.9 -->
   <!-- FIXME: validate from 0.9 onwards, esp. field order and padding -->
-  <request name="AddTrapezoids" number="32">
+  <request name="AddTraps" number="32">
     <field type="Picture" name="picture"/>
     <field type="Point" name="offset"/>
-    <list type="Trapezoid" name="trapezoids"/>
+    <list type="Trap" name="trapezoids"/>
   </request>
   <enum type="CARD16" name="Repeat">
     <item name="none"/>


More information about the xcb-commit mailing list