projects / free-sw / xcb / proto / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
xtest: rename window field
[free-sw/xcb/proto] / src / randr.xml
diff --git a/src/randr.xml b/src/randr.xml
index ab58f80..05c42fb 100644 (file)
--- a/src/randr.xml
+++ b/src/randr.xml
@@ -30,6 +30,11 @@ authorization from the authors.
     major-version="1" minor-version="2">
 
        <import>xproto</import>
+
+       <!-- XIDs -->
+       <xidtype name="MODE" />
+       <xidtype name="CRTC" />
+       <xidtype name="OUTPUT" />
        
        <!-- Errors -->
 
@@ -49,10 +54,10 @@ authorization from the authors.
        </enum>
 
        <struct name="ScreenSize">
-               <field type="INT16" name="width" />   <!-- pixels -->
-               <field type="INT16" name="height" />
-               <field type="INT16" name="mwidth" />  <!-- millimeters -->
-               <field type="INT16" name="mheight" />
+               <field type="CARD16" name="width" />   <!-- pixels -->
+               <field type="CARD16" name="height" />
+               <field type="CARD16" name="mwidth" />  <!-- millimeters -->
+               <field type="CARD16" name="mheight" />
        </struct>
        
        <struct name="RefreshRates">
@@ -80,11 +85,11 @@ authorization from the authors.
        BEWARE: the docs lie!
        -->
        <request name="SetScreenConfig" opcode="2">
-               <field type="DRAWABLE" name="drawable" />
+               <field type="WINDOW" name="window" />
                <field type="TIMESTAMP" name="timestamp" />
                <field type="TIMESTAMP" name="config_timestamp" />
                <field type="CARD16" name="sizeID" />
-               <field type="INT16" name="rotation" />
+               <field type="CARD16" name="rotation" />         <!-- enum Rotation -->
                <field type="CARD16" name="rate" />
                <pad bytes="2" />
                <reply>
@@ -92,7 +97,7 @@ authorization from the authors.
                        <field type="TIMESTAMP" name="new_timestamp" />
                        <field type="TIMESTAMP" name="config_timestamp" />
                        <field type="WINDOW" name="root" />
-                       <field type="CARD16" name="subpixel_order" />
+                       <field type="CARD16" name="subpixel_order" />   <!-- enum SubPixel (from Render) -->
                        <pad bytes="10" />
                </reply>
        </request>
@@ -124,7 +129,7 @@ authorization from the authors.
                        <field type="TIMESTAMP" name="config_timestamp" />
                        <field type="CARD16" name="nSizes" />
                        <field type="CARD16" name="sizeID" />
-                       <field type="INT16" name="rotation" />
+                       <field type="CARD16" name="rotation" />
                        <field type="CARD16" name="rate" />
                        <field type="CARD16" name="nInfo" />
                        <pad bytes="2" />
@@ -146,10 +151,11 @@ authorization from the authors.
                <field type="WINDOW" name="window" />
                <reply>
                        <pad bytes="1" />
-                       <field type="CARD16" name="minWidth" />
-                       <field type="CARD16" name="minHeight" />
-                       <field type="CARD16" name="maxWidth" />
-                       <field type="CARD16" name="maxHeight" />
+                       <field type="CARD16" name="min_width" />
+                       <field type="CARD16" name="min_height" />
+                       <field type="CARD16" name="max_width" />
+                       <field type="CARD16" name="max_height" />
+                       <pad bytes="16" />
                </reply>
        </request>
 
@@ -157,8 +163,8 @@ authorization from the authors.
                <field type="WINDOW" name="window" />
                <field type="CARD16" name="width" />    <!-- pixels -->
                <field type="CARD16" name="height" />
-               <field type="CARD32" name="mmWidth" />  <!-- millimeters -->
-               <field type="CARD32" name="mmHeight" />
+               <field type="CARD32" name="mm_width" />  <!-- millimeters -->
+               <field type="CARD32" name="mm_height" />
        </request>
 
        <!-- for GetScreenResources.ModeInfo.ModeFlag -->
@@ -183,16 +189,16 @@ authorization from the authors.
                <field type="CARD32" name="id" />
                <field type="CARD16" name="width" />
                <field type="CARD16" name="height" />
-               <field type="CARD32" name="dotClock" />
-               <field type="CARD16" name="hsyncStart" />
-               <field type="CARD16" name="hsyncEnd" />
+               <field type="CARD32" name="dot_clock" />
+               <field type="CARD16" name="hsync_start" />
+               <field type="CARD16" name="hsync_end" />
                <field type="CARD16" name="htotal" />
                <field type="CARD16" name="hskew" />
-               <field type="CARD16" name="vsyncStart" />
-               <field type="CARD16" name="vsyncEnd" />
+               <field type="CARD16" name="vsync_start" />
+               <field type="CARD16" name="vsync_end" />
                <field type="CARD16" name="vtotal" />
                <field type="CARD16" name="name_len" />
-               <field type="CARD32" name="modeFlags" />        <!-- enum ModeFlag -->
+               <field type="CARD32" name="mode_flags" />       <!-- enum ModeFlag -->
                <!-- the mode name itself -->
        </struct>
 
@@ -207,10 +213,10 @@ authorization from the authors.
                        <field type="CARD16" name="num_modes" />
                        <field type="CARD16" name="names_len" />
                        <pad bytes="8" />
-                       <list type="CARD32" name="crtcs">
+                       <list type="CRTC" name="crtcs">
                            <fieldref>num_crtcs</fieldref>
                        </list>
-                       <list type="CARD32" name="outputs">
+                       <list type="OUTPUT" name="outputs">
                            <fieldref>num_outputs</fieldref>
                        </list>
                        <list type="ModeInfo" name="modes">
@@ -233,28 +239,28 @@ authorization from the authors.
        </enum>
 
        <request name="GetOutputInfo" opcode="9">
-               <field type="CARD32" name="output" />
-               <field type="TIMESTAMP" name="configTimestamp" />
+               <field type="OUTPUT" name="output" />
+               <field type="TIMESTAMP" name="config_timestamp" />
                <reply>
                        <field type="CARD8" name="status" />    <!-- enum SetConfig -->
                        <field type="TIMESTAMP" name="timestamp" />
-                       <field type="CARD32" name="crtc" />
-                       <field type="CARD32" name="mmWidth" />  <!-- millimeters -->
-                       <field type="CARD32" name="mmHeight" />
+                       <field type="CRTC" name="crtc" />
+                       <field type="CARD32" name="mm_width" />  <!-- millimeters -->
+                       <field type="CARD32" name="mm_height" />
                        <field type="CARD8" name="connection" /> <!-- enum Connection -->
-                       <field type="CARD8" name="subpixelOrder" />
+                       <field type="CARD8" name="subpixel_order" /> <!-- enum SubPixel (from Render) -->
                        <field type="CARD16" name="num_crtcs" />
                        <field type="CARD16" name="num_modes" />
                        <field type="CARD16" name="num_preferred" />
                        <field type="CARD16" name="num_clones" />
                        <field type="CARD16" name="name_len" />
-                       <list type="CARD32" name="crtcs">
+                       <list type="CRTC" name="crtcs">
                            <fieldref>num_crtcs</fieldref>
                        </list>
-                       <list type="CARD32" name="modes">
+                       <list type="MODE" name="modes">
                            <fieldref>num_modes</fieldref>
                        </list>
-                       <list type="CARD32" name="clones">
+                       <list type="OUTPUT" name="clones">
                            <fieldref>num_clones</fieldref>
                        </list>
                        <list type="BYTE" name="name">
@@ -263,21 +269,20 @@ authorization from the authors.
                </reply>
        </request>
 
-       <!-- NOTE: num_atoms is currently unused. -->
        <request name="ListOutputProperties" opcode="10">
-               <field type="CARD32" name="output" />
+               <field type="OUTPUT" name="output" />
                <reply>
-                       <field type="CARD8" name="num_properties" />
+                       <pad bytes="1" />
                        <field type="CARD16" name="num_atoms" />
                        <pad bytes="22" />
-                       <list type="ATOM" name="properties">
-                               <fieldref>num_properties</fieldref>
+                       <list type="ATOM" name="atoms">
+                               <fieldref>num_atoms</fieldref>
                        </list>
                </reply>
        </request>
 
        <request name="QueryOutputProperty" opcode="11">
-               <field type="CARD32" name="output" />
+               <field type="OUTPUT" name="output" />
                <field type="ATOM" name="property" />
                <reply>
                        <pad bytes="1" />
@@ -285,46 +290,59 @@ authorization from the authors.
                        <field type="BOOL" name="range" />
                        <field type="BOOL" name="immutable" />
                        <pad bytes="21" />
-                       <list type="INT32" name="validValues" />
+                       <list type="INT32" name="validValues">
+                               <fieldref>length</fieldref>
+                       </list>
                </reply>
        </request>
 
        <request name="ConfigureOutputProperty" opcode="12">
-               <field type="CARD32" name="output" />
+               <field type="OUTPUT" name="output" />
                <field type="ATOM" name="property" />
                <field type="BOOL" name="pending" />
                <field type="BOOL" name="range" />
                <pad bytes="2" />
+               <list type="INT32" name="values" />
        </request>
 
        <request name="ChangeOutputProperty" opcode="13">
-               <field type="CARD32" name="output" />
+               <field type="OUTPUT" name="output" />
                <field type="ATOM" name="property" />
                <field type="ATOM" name="type" />
                <field type="CARD8" name="format" />
                <field type="CARD8" name="mode" />
                <pad bytes="2" />
                <field type="CARD32" name="num_units" />
+               <list type="void" name="data">
+                   <op op="/">
+                       <op op="*">
+                           <fieldref>num_units</fieldref>
+                           <fieldref>format</fieldref>
+                       </op>
+                       <value>8</value>
+                   </op>
+               </list>
        </request>
 
        <request name="DeleteOutputProperty" opcode="14">
-               <field type="CARD32" name="output" />
+               <field type="OUTPUT" name="output" />
                <field type="ATOM" name="property" />
        </request>
 
        <!-- NOTE: num_items depends on format (8/16/32) -->
        <request name="GetOutputProperty" opcode="15">
-               <field type="CARD32" name="output" />
+               <field type="OUTPUT" name="output" />
                <field type="ATOM" name="property" />
                <field type="ATOM" name="type" />
-               <field type="CARD32" name="longOffset" />
-               <field type="CARD32" name="longLength" />
+               <field type="CARD32" name="long_offset" />
+               <field type="CARD32" name="long_length" />
                <field type="BOOL" name="delete" />
                <field type="BOOL" name="pending" />
+               <pad bytes="2" />
                <reply>
                        <field type="CARD8" name="format" />
                        <field type="ATOM" name="type" />
-                       <field type="CARD32" name="bytesAfter" />
+                       <field type="CARD32" name="bytes_after" />
                        <field type="CARD32" name="num_items" />
                        <pad bytes="12" />
                        <list type="BYTE" name="data">
@@ -342,75 +360,83 @@ authorization from the authors.
 
        <request name="CreateMode" opcode="16">
                <field type="WINDOW" name="window" />
-               <field type="ModeInfo" name="modeInfo" />
+               <field type="ModeInfo" name="mode_info" />
+               <list type="char" name="name" />
                <reply>
-                       <field type="CARD8" name="status" />    <!-- enum SetConfig -->
-                       <field type="CARD32" name="mode" />
+                       <pad bytes="1" />
+                       <field type="MODE" name="mode" />
+                       <pad bytes="20" />
                </reply>
        </request>
 
        <request name="DestroyMode" opcode="17">
-               <field type="CARD32" name="mode" />
+               <field type="MODE" name="mode" />
        </request>
 
        <request name="AddOutputMode" opcode="18">
-               <field type="CARD32" name="output" />
-               <field type="CARD32" name="mode" />
+               <field type="OUTPUT" name="output" />
+               <field type="MODE" name="mode" />
        </request>
 
        <request name="DeleteOutputMode" opcode="19">
-               <field type="CARD32" name="output" />
-               <field type="CARD32" name="mode" />
+               <field type="OUTPUT" name="output" />
+               <field type="MODE" name="mode" />
        </request>
 
        <request name="GetCrtcInfo" opcode="20">
-               <field type="CARD32" name="crtc" />
-               <field type="TIMESTAMP" name="configTimestamp" />
+               <field type="CRTC" name="crtc" />
+               <field type="TIMESTAMP" name="config_timestamp" />
                <reply>
                        <field type="CARD8" name="status" />    <!-- enum SetConfig -->
                        <field type="TIMESTAMP" name="timestamp" />
-                       <field type="CARD32" name="crtc" />
                        <field type="INT16" name="x" />
                        <field type="INT16" name="y" />
                        <field type="CARD16" name="width" />
                        <field type="CARD16" name="height" />
-                       <field type="CARD32" name="mode" />
+                       <field type="MODE" name="mode" />
                        <field type="CARD16" name="rotation" />         <!-- enum Rotation -->
                        <field type="CARD16" name="rotations" />        <!-- mask of enum Rotation -->
                        <field type="CARD16" name="num_outputs" />
                        <field type="CARD16" name="num_possible_outputs" />
-                       <list type="CARD32" name="outputs">
+                       <list type="OUTPUT" name="outputs">
                                <fieldref>num_outputs</fieldref>
                        </list>
+                       <list type="OUTPUT" name="possible">
+                               <fieldref>num_possible_outputs</fieldref>
+                       </list>
                </reply>
        </request>
 
        <request name="SetCrtcConfig" opcode="21">
-               <field type="CARD32" name="crtc" />
+               <field type="CRTC" name="crtc" />
                <field type="TIMESTAMP" name="timestamp" />
-               <field type="TIMESTAMP" name="configTimestamp" />
+               <field type="TIMESTAMP" name="config_timestamp" />
                <field type="INT16" name="x" />
                <field type="INT16" name="y" />
-               <field type="CARD32" name="mode" />
+               <field type="MODE" name="mode" />
                <field type="CARD16" name="rotation" />         <!-- enum Rotation -->
+               <pad bytes="2" />
+               <list type="OUTPUT" name="outputs" />
                <reply>
                        <field type="CARD8" name="status" />    <!-- enum SetConfig -->
                        <field type="TIMESTAMP" name="timestamp" />
+                       <pad bytes="20" />
                </reply>
        </request>
 
        <request name="GetCrtcGammaSize" opcode="22">
-               <field type="CARD32" name="crtc" />
+               <field type="CRTC" name="crtc" />
                <reply>
-                       <field type="CARD8" name="status" />    <!-- enum SetConfig -->
+                       <pad bytes="1" />
                        <field type="CARD16" name="size" />
+                       <pad bytes="22" />
                </reply>
        </request>
 
        <request name="GetCrtcGamma" opcode="23">
-               <field type="CARD32" name="crtc" />
+               <field type="CRTC" name="crtc" />
                <reply>
-                       <field type="CARD8" name="status" />    <!-- enum SetConfig -->
+                       <pad bytes="1" />
                        <field type="CARD16" name="size" />
                        <pad bytes="22" />
                        <list type="CARD16" name="red">
@@ -426,7 +452,7 @@ authorization from the authors.
        </request>
 
        <request name="SetCrtcGamma" opcode="24">
-               <field type="CARD32" name="crtc" />
+               <field type="CRTC" name="crtc" />
                <field type="CARD16" name="size" />
                <pad bytes="2"/>
                <list type="CARD16" name="red">
@@ -457,11 +483,11 @@ authorization from the authors.
                <field type="WINDOW" name="root" />
                <field type="WINDOW" name="request_window" />
                <field type="CARD16" name="sizeID" />
-               <field type="CARD16" name="subpixel_order" />
+               <field type="CARD16" name="subpixel_order" />   <!-- enum SubPixel (from Render) -->
                <field type="CARD16" name="width" />
                <field type="CARD16" name="height" />
-               <field type="CARD16" name="mmWidth" />
-               <field type="CARD16" name="mmHeight" />
+               <field type="CARD16" name="mwidth" />
+               <field type="CARD16" name="mheight" />
        </event>
 
        <!-- New in version 1.2 -->
@@ -476,8 +502,8 @@ authorization from the authors.
        <struct name="CrtcChange">
                <field type="TIMESTAMP" name="timestamp" />
                <field type="WINDOW" name="window" />
-               <field type="CARD32" name="crtc" />
-               <field type="CARD32" name="mode" />
+               <field type="CRTC" name="crtc" />
+               <field type="MODE" name="mode" />
                <field type="CARD16" name="rotation" />         <!-- enum Rotation -->
                <pad bytes="2" />
                <field type="INT16" name="x" />
@@ -488,19 +514,19 @@ authorization from the authors.
 
        <struct name="OutputChange">
                <field type="TIMESTAMP" name="timestamp" />
-               <field type="TIMESTAMP" name="configTimestamp" />
+               <field type="TIMESTAMP" name="config_timestamp" />
                <field type="WINDOW" name="window" />
-               <field type="CARD32" name="output" />
-               <field type="CARD32" name="crtc" />
-               <field type="CARD32" name="mode" />
+               <field type="OUTPUT" name="output" />
+               <field type="CRTC" name="crtc" />
+               <field type="MODE" name="mode" />
                <field type="CARD16" name="rotation" />         <!-- enum Rotation -->
                <field type="CARD8" name="connection" />        <!-- enum Connection -->
-               <field type="CARD8" name="subpixelOrder" />
+               <field type="CARD8" name="subpixel_order" />    <!-- enum SubPixel (from Render) -->
        </struct>
 
        <struct name="OutputProperty">
                <field type="WINDOW" name="window" />
-               <field type="CARD32" name="output" />
+               <field type="OUTPUT" name="output" />
                <field type="ATOM" name="atom" />
                <field type="TIMESTAMP" name="timestamp" />
                <field type="CARD8" name="status" />            <!-- core enum Property -->
Unnamed repository; edit this file 'description' to name the repository.