X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Frandr.xml;h=d9192b21633b805687878c2d04a9724aca542872;hb=HEAD;hp=ab58f80a1ea4f7556ba212ac4df8d2fadb9179e7;hpb=37b681288c18754037a00d1765fdbde456b1c1a5;p=free-sw%2Fxcb%2Fproto

diff --git a/src/randr.xml b/src/randr.xml
index ab58f80..d9192b2 100644
--- a/src/randr.xml
+++ b/src/randr.xml
@@ -27,15 +27,23 @@ authorization from the authors.
 -->
 
 <xcb header="randr" extension-xname="RANDR" extension-name="RandR"
-    major-version="1" minor-version="2">
+    major-version="1" minor-version="4">
 
 	<import>xproto</import>
+	<import>render</import>
+
+	<!-- XIDs -->
+	<xidtype name="MODE" />
+	<xidtype name="CRTC" />
+	<xidtype name="OUTPUT" />
+	<xidtype name="PROVIDER" />
 	
 	<!-- Errors -->
 
-	<error name="BadOutput" number="0" />
-	<error name="BadCrtc"   number="1" />
-	<error name="BadMode"   number="2" />
+	<error name="BadOutput"   number="0" />
+	<error name="BadCrtc"     number="1" />
+	<error name="BadMode"     number="2" />
+	<error name="BadProvider" number="3" />
 
 	<!-- Requests -->
 
@@ -49,10 +57,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">
@@ -75,40 +83,52 @@ authorization from the authors.
 	
 	<!-- Skip obsolete opcode 1 so old clients fail immediately -->
 
+	<enum name="SetConfig">
+		<item name="Success"><value>0</value></item>
+		<item name="InvalidConfigTime"><value>1</value></item>
+		<item name="InvalidTime"><value>2</value></item>
+		<item name="Failed"><value>3</value></item>
+	</enum>
+
 	<!-- This is for the 1.1 version request.  I don't believe we need to specify a 1.0 request
 	as few things used randr 1.0.  The only difference is the removal of refresh and padding I think.
 	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" mask="Rotation" />
 		<field type="CARD16" name="rate" />
 		<pad bytes="2" />
 		<reply>
-			<field type="CARD8" name="status" />	<!-- enum SetConfig -->
+			<field type="CARD8" name="status" enum="SetConfig" />
 			<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" />
 			<pad bytes="10" />
 		</reply>
 	</request>
 	
 	<!-- opcode 3 is obsolete -->
 
-	<enum name="SetConfig">
-		<item name="Success"><value>0</value></item>
-		<item name="InvalidConfigTime"><value>1</value></item>
-		<item name="InvalidTime"><value>2</value></item>
-		<item name="Failed"><value>3</value></item>
+	<enum name="NotifyMask" >
+		<item name="ScreenChange">    <bit>0</bit></item>
+		<!-- New in version 1.2 -->
+		<item name="CrtcChange">      <bit>1</bit></item>
+		<item name="OutputChange">    <bit>2</bit></item>
+		<item name="OutputProperty">  <bit>3</bit></item>
+		<!-- New in version 1.4 -->
+		<item name="ProviderChange">  <bit>4</bit></item>
+		<item name="ProviderProperty"><bit>5</bit></item>
+		<item name="ResourceChange">  <bit>6</bit></item>
 	</enum>
 
 	<request name="SelectInput" opcode="4">	
 		<field type="WINDOW" name="window" />
-		<field type="CARD16" name="enable" />  <!-- enum SetConfig -->
+		<field type="CARD16" name="enable" mask="NotifyMask" />
 		<pad bytes="2" />
 	</request>
 
@@ -118,13 +138,13 @@ authorization from the authors.
 	<request name="GetScreenInfo" opcode="5">
 		<field type="WINDOW" name="window" />
 		<reply>
-			<field type="CARD8" name="rotations" />
+			<field type="CARD8" name="rotations" mask="Rotation" />
 			<field type="WINDOW" name="root" />
 			<field type="TIMESTAMP" name="timestamp" />
 			<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" mask="Rotation" />
 			<field type="CARD16" name="rate" />
 			<field type="CARD16" name="nInfo" />
 			<pad bytes="2" />
@@ -146,10 +166,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 +178,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 +204,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" mask="ModeFlag" />
 		<!-- the mode name itself -->
 	</struct>
 
@@ -207,10 +228,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">
@@ -227,34 +248,34 @@ authorization from the authors.
 
 	<!-- for GetOutputInfo.connection -->
 	<enum name="Connection">
-		<item name="Connected" />
-		<item name="Disconnected" />
-		<item name="Unknown" />
+		<item name="Connected">    <value>0</value> </item>
+		<item name="Disconnected"> <value>1</value> </item>
+		<item name="Unknown">      <value>2</value> </item>
 	</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="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="CARD8" name="connection" /> <!-- enum Connection -->
-			<field type="CARD8" name="subpixelOrder" />
+			<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="subpixel_order" enum="SubPixel" />
 			<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 +284,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 +305,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" />
+		<field type="CARD8" name="mode" enum="PropMode" />
 		<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="ATOM" name="type" altenum="GetPropertyType" />
+		<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="ATOM" name="type" altenum="Atom" />
+			<field type="CARD32" name="bytes_after" />
 			<field type="CARD32" name="num_items" />
 			<pad bytes="12" />
 			<list type="BYTE" name="data">
@@ -342,75 +375,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="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="CARD16" name="rotation" />		<!-- enum Rotation -->
-			<field type="CARD16" name="rotations" />	<!-- mask of enum Rotation -->
+			<field type="MODE" name="mode" />
+			<field type="CARD16" name="rotation" mask="Rotation" />
+			<field type="CARD16" name="rotations" mask="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="CARD16" name="rotation" />		<!-- enum Rotation -->
+		<field type="MODE" name="mode" />
+		<field type="CARD16" name="rotation" mask="Rotation" />
+		<pad bytes="2" />
+		<list type="OUTPUT" name="outputs" />
 		<reply>
-			<field type="CARD8" name="status" />	<!-- enum SetConfig -->
+			<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 +467,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">
@@ -440,45 +481,328 @@ authorization from the authors.
 		</list>
 	</request>
 
-	<!-- Events -->
+	<!-- new in 1.3 -->
 
-	<enum name="NotifyMask" >
-		<item name="ScreenChange">  <bit>0</bit></item>
-		<!-- new in 1.2 -->
-		<item name="CrtcChange">    <bit>1</bit></item>
-		<item name="OutputChange">  <bit>2</bit></item>
-		<item name="OutputProperty"><bit>3</bit></item>
+	<request name="GetScreenResourcesCurrent" opcode="25">
+		<field type="WINDOW" name="window" />
+		<reply>
+			<pad bytes="1" />
+			<field type="TIMESTAMP" name="timestamp" />
+			<field type="TIMESTAMP" name="config_timestamp" />
+			<field type="CARD16" name="num_crtcs" />
+			<field type="CARD16" name="num_outputs" />
+			<field type="CARD16" name="num_modes" />
+			<field type="CARD16" name="names_len" />
+			<pad bytes="8" />
+			<list type="CRTC" name="crtcs">
+			    <fieldref>num_crtcs</fieldref>
+			</list>
+			<list type="OUTPUT" name="outputs">
+			    <fieldref>num_outputs</fieldref>
+			</list>
+			<list type="ModeInfo" name="modes">
+			    <fieldref>num_modes</fieldref>
+			</list>
+			<!-- FIXME: this is *not* null separated!
+			     One must use ModeInfo.name_len from each previous
+			     ModeInfo to infer the position of the name. -->
+			<list type="BYTE" name="names">
+			    <fieldref>names_len</fieldref>
+			</list>
+		</reply>
+	</request>
+
+	<enum name="Transform">
+		<!-- Introduced in version 1.3, but not referenced. -->
+		<item name="Unit">       <bit>0</bit></item>
+		<item name="ScaleUp">    <bit>1</bit></item>
+		<item name="ScaleDown">  <bit>2</bit></item>
+		<item name="Projective"> <bit>3</bit></item>
 	</enum>
-	
+
+	<request name="SetCrtcTransform" opcode="26">
+		<field type="CRTC" name="crtc" />
+		<field type="TRANSFORM" name="transform" />
+		<field type="CARD16" name="filter_len" />
+		<pad bytes="2" />
+		<list type="char" name="filter_name">
+			<fieldref>filter_len</fieldref>
+		</list>
+		<list type="FIXED" name="filter_params" />
+	</request>
+
+	<request name="GetCrtcTransform" opcode="27">
+		<field type="CRTC" name="crtc" />
+		<reply>
+			<pad bytes="1" />
+			<field type="TRANSFORM" name="pending_transform" />
+			<field type="BOOL" name="has_transforms" />
+			<pad bytes="3" />
+			<field type="TRANSFORM" name="current_transform" />
+			<pad bytes="4" />
+			<field type="CARD16" name="pending_len" />
+			<field type="CARD16" name="pending_nparams" />
+			<field type="CARD16" name="current_len" />
+			<field type="CARD16" name="current_nparams" />
+			<list type="char" name="pending_filter_name" >
+				<fieldref>pending_len</fieldref>
+			</list>
+			<list type="FIXED" name="pending_params" >
+				<fieldref>pending_nparams</fieldref>
+			</list>
+			<list type="char" name="current_filter_name" >
+				<fieldref>current_len</fieldref>
+			</list>
+			<list type="FIXED" name="current_params" >
+				<fieldref>current_nparams</fieldref>
+			</list>
+		</reply>
+	</request>
+
+	<request name="GetPanning" opcode="28">
+		<field type="CRTC" name="crtc" />
+		<reply>
+			<field type="CARD8" name="status" enum="SetConfig" />
+			<field type="TIMESTAMP" name="timestamp" />
+			<field type="CARD16" name="left" />
+			<field type="CARD16" name="top" />
+			<field type="CARD16" name="width" />
+			<field type="CARD16" name="height" />
+			<field type="CARD16" name="track_left" />
+			<field type="CARD16" name="track_top" />
+			<field type="CARD16" name="track_width" />
+			<field type="CARD16" name="track_height" />
+			<field type="INT16" name="border_left" />
+			<field type="INT16" name="border_top" />
+			<field type="INT16" name="border_right" />
+			<field type="INT16" name="border_bottom" />
+		</reply>
+	</request>
+
+	<request name="SetPanning" opcode="29">
+		<field type="CRTC" name="crtc" />
+		<field type="TIMESTAMP" name="timestamp" />
+		<field type="CARD16" name="left" />
+		<field type="CARD16" name="top" />
+		<field type="CARD16" name="width" />
+		<field type="CARD16" name="height" />
+		<field type="CARD16" name="track_left" />
+		<field type="CARD16" name="track_top" />
+		<field type="CARD16" name="track_width" />
+		<field type="CARD16" name="track_height" />
+		<field type="INT16" name="border_left" />
+		<field type="INT16" name="border_top" />
+		<field type="INT16" name="border_right" />
+		<field type="INT16" name="border_bottom" />
+		<reply>
+			<field type="CARD8" name="status" enum="SetConfig" />
+			<field type="TIMESTAMP" name="timestamp" />
+		</reply>
+	</request>
+
+	<request name="SetOutputPrimary" opcode="30">
+		<field type="WINDOW" name="window" />
+		<field type="OUTPUT" name="output" />
+	</request>
+
+	<request name="GetOutputPrimary" opcode="31">
+		<field type="WINDOW" name="window" />
+		<reply>
+			<pad bytes="1" />
+			<field type="OUTPUT" name="output" />
+		</reply>
+	</request>
+
+	<!-- New in version 1.4 -->
+
+	<request name="GetProviders" opcode="32">
+		<field type="WINDOW" name="window" />
+		<reply>
+			<pad bytes="1" />
+			<field type="TIMESTAMP" name="timestamp" />
+			<field type="CARD16" name="num_providers" />
+			<pad bytes="18" />
+			<list type="PROVIDER" name="providers">
+				<fieldref>num_providers</fieldref>
+			</list>
+		</reply>
+	</request>
+
+	<enum name="ProviderCapability">
+		<item name="SourceOutput">  <bit>0</bit></item>
+		<item name="SinkOutput">    <bit>1</bit></item>
+		<item name="SourceOffload"> <bit>2</bit></item>
+		<item name="SinkOffload">   <bit>3</bit></item>
+	</enum>
+
+	<request name="GetProviderInfo" opcode="33">
+		<field type="PROVIDER" name="provider" />
+		<field type="TIMESTAMP" name="config_timestamp" />
+		<reply>
+			<field type="CARD8" name="status" />
+			<field type="TIMESTAMP" name="timestamp" />
+			<field type="CARD32" name="capabilities" mask="ProviderCapability" />
+			<field type="CARD16" name="num_crtcs" />
+			<field type="CARD16" name="num_outputs" />
+			<field type="CARD16" name="num_associated_providers" />
+			<field type="CARD16" name="name_len" />
+			<pad bytes="8" />
+			<list type="CRTC" name="crtcs">
+				<fieldref>num_crtcs</fieldref>
+			</list>
+			<list type="OUTPUT" name="outputs">
+				<fieldref>num_outputs</fieldref>
+			</list>
+			<list type="PROVIDER" name="associated_providers">
+				<fieldref>num_associated_providers</fieldref>
+			</list>
+			<list type="CARD32" name="associated_capability">
+				<fieldref>num_associated_providers</fieldref>
+			</list>
+			<list type="char" name="name">
+				<fieldref>name_len</fieldref>
+			</list>
+			<!-- XXX: Prepared for the future. Until xcbgen supports
+			          the align attribute in <pad>, we ignore the
+			          trailing pad bytes here.
+			<pad align="4" />
+			-->
+		</reply>
+	</request>
+
+	<request name="SetProviderOffloadSink" opcode="34">
+		<field type="PROVIDER" name="provider" />
+		<field type="PROVIDER" name="sink_provider" />
+		<field type="TIMESTAMP" name="config_timestamp" />
+	</request>
+
+	<request name="SetProviderOutputSource" opcode="35">
+		<field type="PROVIDER" name="provider" />
+		<field type="PROVIDER" name="source_provider" />
+		<field type="TIMESTAMP" name="config_timestamp" />
+	</request>
+
+	<request name="ListProviderProperties" opcode="36">
+		<field type="PROVIDER" name="provider" />
+		<reply>
+			<pad bytes="1" />
+			<field type="CARD16" name="num_atoms" />
+			<pad bytes="22" />
+			<list type="ATOM" name="atoms">
+				<fieldref>num_atoms</fieldref>
+			</list>
+		</reply>
+	</request>
+
+	<request name="QueryProviderProperty" opcode="37">
+		<field type="PROVIDER" name="provider" />
+		<field type="ATOM" name="property" />
+		<reply>
+			<pad bytes="1" />
+			<field type="BOOL" name="pending" />
+			<field type="BOOL" name="range" />
+			<field type="BOOL" name="immutable" />
+			<pad bytes="21" />
+			<list type="INT32" name="valid_values">
+				<fieldref>length</fieldref>
+			</list>
+		</reply>
+	</request>
+
+	<request name="ConfigureProviderProperty" opcode="38">
+		<field type="PROVIDER" name="provider" />
+		<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="ChangeProviderProperty" opcode="39">
+		<field type="PROVIDER" name="provider" />
+		<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_items" />
+		<list type="void" name="data">
+			<op op="*">
+				<fieldref>num_items</fieldref>
+				<op op="/">
+					<fieldref>format</fieldref>
+					<value>8</value>
+				</op>
+			</op>
+		</list>
+	</request>
+
+	<request name="DeleteProviderProperty" opcode="40">
+		<field type="PROVIDER" name="provider" />
+		<field type="ATOM" name="property" />
+	</request>
+
+	<request name="GetProviderProperty" opcode="41">
+		<field type="PROVIDER" name="provider" />
+		<field type="ATOM" name="property" />
+		<field type="ATOM" name="type" /> <!-- AnyProperty -->
+		<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" /> <!-- None -->
+			<field type="CARD32" name="bytes_after" />
+			<field type="CARD32" name="num_items" />
+			<pad bytes="12" />
+			<list type="void" name="data">
+				<op op="*">
+					<fieldref>num_items</fieldref>
+					<op op="/">
+						<fieldref>format</fieldref>
+						<value>8</value>
+					</op>
+				</op>
+			</list>
+		</reply>
+	</request>
+
+	<!-- Events -->
+
 	<event name="ScreenChangeNotify" number="0">
-		<field type="CARD8" name="rotation" />
+		<field type="CARD8" name="rotation" mask="Rotation" />
 		<field type="TIMESTAMP" name="timestamp" />
 		<field type="TIMESTAMP" name="config_timestamp" />
 		<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" />
 		<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 -->
 
 	<!-- subcode -->
 	<enum name="Notify" >
-		<item name="CrtcChange">    <value>0</value></item>
-		<item name="OutputChange">  <value>1</value></item>
-		<item name="OutputProperty"><value>2</value></item>
+		<item name="CrtcChange">      <value>0</value></item>
+		<item name="OutputChange">    <value>1</value></item>
+		<item name="OutputProperty">  <value>2</value></item>
+		<item name="ProviderChange">  <value>3</value></item>
+		<item name="ProviderProperty"><value>4</value></item>
+		<item name="ResourceChange">  <value>5</value></item>
 	</enum>
 
 	<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="CARD16" name="rotation" />		<!-- enum Rotation -->
+		<field type="CRTC" name="crtc" />
+		<field type="MODE" name="mode" />
+		<field type="CARD16" name="rotation" mask="Rotation" />
 		<pad bytes="2" />
 		<field type="INT16" name="x" />
 		<field type="INT16" name="y" />
@@ -488,33 +812,60 @@ 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="CARD16" name="rotation" />		<!-- enum Rotation -->
-		<field type="CARD8" name="connection" />	<!-- enum Connection -->
-		<field type="CARD8" name="subpixelOrder" />
+		<field type="OUTPUT" name="output" />
+		<field type="CRTC" name="crtc" />
+		<field type="MODE" name="mode" />
+		<field type="CARD16" name="rotation" mask="Rotation" />
+		<field type="CARD8" name="connection" enum="Connection" />
+		<field type="CARD8" name="subpixel_order" enum="SubPixel" />
 	</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 -->
+		<field type="CARD8" name="status" enum="Property" />
 		<pad bytes="11" />
 	</struct>
 
+	<!-- New in version 1.4 -->
+
+	<struct name="ProviderChange">
+		<field type="TIMESTAMP" name="timestamp" />
+		<field type="WINDOW" name="window" />
+		<field type="PROVIDER" name="provider" />
+		<pad bytes="16" />
+	</struct>
+
+	<struct name="ProviderProperty">
+		<field type="WINDOW" name="window" />
+		<field type="PROVIDER" name="provider" />
+		<field type="ATOM" name="atom" />
+		<field type="TIMESTAMP" name="timestamp" />
+		<field type="CARD8" name="state" />
+		<pad bytes="11" />
+	</struct>
+
+	<struct name="ResourceChange">
+		<field type="TIMESTAMP" name="timestamp" />
+		<field type="WINDOW" name="window" />
+		<pad bytes="20" />
+	</struct>
+
 	<union name="NotifyData">
-		<field type="CrtcChange"     name="cc" />
-		<field type="OutputChange"   name="oc" />
-		<field type="OutputProperty" name="op" />
+		<field type="CrtcChange"       name="cc" />
+		<field type="OutputChange"     name="oc" />
+		<field type="OutputProperty"   name="op" />
+		<field type="ProviderChange"   name="pc" />
+		<field type="ProviderProperty" name="pp" />
+		<field type="ResourceChange"   name="rc" />
 	</union>
 
 	<event name="Notify" number="1">
-		<field type="CARD8" name="subCode" />		<!-- enum Notify -->
+		<field type="CARD8" name="subCode" enum="Notify" />
 		<field type="NotifyData" name="u" />
 	</event>
 </xcb>