summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaya Tiwari <tiwari.jaya18@gmail.com>2014-11-24 22:32:19 +0530
committerChristian Linhart <chris@demorecorder.com>2015-02-21 11:20:24 +0100
commite0a4f7ba911a5b933c939d7c696672d1bba7f2af (patch)
tree92bec86828b90b35951331a458d43bc0dcad37fe
parent068430a7f9ae5b4fa18bb9e6d41b7fd3b24deedc (diff)
Replace valueparam with switch-bitcase in render
Changed valueparam to switch bitcase in render extension for the requests : CreatePicture ChangePicture The changes of valueparam to switch has been made as per the specs for the render extension for the possible values of value-mask and value-list CreatePicture : http://cgit.freedesktop.org/xorg/proto/renderproto/tree/renderproto.txt?id=renderproto-0.11.1#n572 ChangePicture: http://cgit.freedesktop.org/xorg/proto/renderproto/tree/renderproto.txt?id=renderproto-0.11.1#n668 The backward compatibility for the extension was checked successfully by rendering shapes with libraries having valueparam and then by having libraries with switch bitcase. Signed-off-by: Jaya Tiwari <tiwari.jaya18@gmail.com> Reviewed-by: Christian Linhart <chris@demorecorder.com>
-rw-r--r--src/render.xml118
1 files changed, 112 insertions, 6 deletions
diff --git a/src/render.xml b/src/render.xml
index 55b73f7..c54608e 100644
--- a/src/render.xml
+++ b/src/render.xml
@@ -280,16 +280,122 @@ for licensing information.
<field type="PICTURE" name="pid" />
<field type="DRAWABLE" name="drawable" />
<field type="PICTFORMAT" name="format" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
+ <field type="CARD32" name="value_mask" mask="CP"/>
+ <switch name="value_list">
+ <fieldref>value_mask</fieldref>
+ <bitcase>
+ <enumref ref="CP">Repeat</enumref>
+ <field type="CARD32" name="repeat" enum="Repeat"/>
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">AlphaMap</enumref>
+ <field type="PICTURE" name="alphamap" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">AlphaXOrigin</enumref>
+ <field type="INT32" name="alphaxorigin" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">AlphaYOrigin</enumref>
+ <field type="INT32" name="alphayorigin" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">ClipXOrigin</enumref>
+ <field type="INT32" name="clipxorigin" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">ClipYOrigin</enumref>
+ <field type="INT32" name="clipyorigin" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">ClipMask</enumref>
+ <field type="PIXMAP" name="clipmask" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">GraphicsExposure</enumref>
+ <field type="CARD32" name="graphicsexposure" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">SubwindowMode</enumref>
+ <field type="CARD32" name="subwindowmode" enum="SubwindowMode"/>
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">PolyEdge</enumref>
+ <field type="CARD32" name="polyedge" enum="PolyEdge"/>
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">PolyMode</enumref>
+ <field type="CARD32" name="polymode" enum="PolyMode"/>
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">Dither</enumref>
+ <field type="ATOM" name="dither" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">ComponentAlpha</enumref>
+ <field type="CARD32" name="componentalpha" />
+ </bitcase>
+ </switch>
</request>
<request name="ChangePicture" opcode="5">
<field type="PICTURE" name="picture" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
+ <field type="CARD32" name="value_mask" mask="CP"/>
+ <switch name="value_list">
+ <fieldref>value_mask</fieldref>
+ <bitcase>
+ <enumref ref="CP">Repeat</enumref>
+ <field type="CARD32" name="repeat" enum="Repeat"/>
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">AlphaMap</enumref>
+ <field type="PICTURE" name="alphamap" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">AlphaXOrigin</enumref>
+ <field type="INT32" name="alphaxorigin" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">AlphaYOrigin</enumref>
+ <field type="INT32" name="alphayorigin" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">ClipXOrigin</enumref>
+ <field type="INT32" name="clipxorigin" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">ClipYOrigin</enumref>
+ <field type="INT32" name="clipyorigin" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">ClipMask</enumref>
+ <field type="PIXMAP" name="clipmask" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">GraphicsExposure</enumref>
+ <field type="CARD32" name="graphicsexposure" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">SubwindowMode</enumref>
+ <field type="CARD32" name="subwindowmode" enum="SubwindowMode"/>
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">PolyEdge</enumref>
+ <field type="CARD32" name="polyedge" enum="PolyEdge"/>
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">PolyMode</enumref>
+ <field type="CARD32" name="polymode" enum="PolyMode"/>
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">Dither</enumref>
+ <field type="ATOM" name="dither" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CP">ComponentAlpha</enumref>
+ <field type="CARD32" name="componentalpha" />
+ </bitcase>
+ </switch>
</request>
<request name="SetPictureClipRectangles" opcode="6">