Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 671 insertions, 671 deletions

diff --git a/libxcb/xcb-proto/src/randr.xml b/libxcb/xcb-proto/src/randr.xml
index 4f0716f7c..b28372e9c 100644
--- a/libxcb/xcb-proto/src/randr.xml
+++ b/libxcb/xcb-proto/src/randr.xml
@@ -1,671 +1,671 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2006 Jeremy Kolb, Ian Osgood
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the authors or their
-institutions shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization from the authors.
--->
-
-<xcb header="randr" extension-xname="RANDR" extension-name="RandR"
-    major-version="1" minor-version="3">
-
-	<import>xproto</import>
-	<import>render</import>
-
-	<!-- XIDs -->
-	<xidtype name="MODE" />
-	<xidtype name="CRTC" />
-	<xidtype name="OUTPUT" />
-	
-	<!-- Errors -->
-
-	<error name="BadOutput" number="0" />
-	<error name="BadCrtc"   number="1" />
-	<error name="BadMode"   number="2" />
-
-	<!-- Requests -->
-
-	<enum name="Rotation">
-		<item name="Rotate_0">  <bit>0</bit></item>
-		<item name="Rotate_90"> <bit>1</bit></item>
-		<item name="Rotate_180"><bit>2</bit></item>
-		<item name="Rotate_270"><bit>3</bit></item>
-		<item name="Reflect_X"> <bit>4</bit></item>
-		<item name="Reflect_Y"> <bit>5</bit></item>
-	</enum>
-
-	<struct name="ScreenSize">
-		<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">
-		<field type="CARD16" name="nRates" />
-		<list type="CARD16" name="rates">
-			<fieldref>nRates</fieldref>
-		</list>
-	</struct>
-	
-	<request name="QueryVersion" opcode="0">
-		<field type="CARD32" name="major_version" />
-		<field type="CARD32" name="minor_version" />
-		<reply>
-			<pad bytes="1" />
-			<field type="CARD32" name="major_version" />
-			<field type="CARD32" name="minor_version" />
-			<pad bytes="16" />
-		</reply>
-	</request>
-	
-	<!-- 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="WINDOW" name="window" />
-		<field type="TIMESTAMP" name="timestamp" />
-		<field type="TIMESTAMP" name="config_timestamp" />
-		<field type="CARD16" name="sizeID" />
-		<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="TIMESTAMP" name="new_timestamp" />
-			<field type="TIMESTAMP" name="config_timestamp" />
-			<field type="WINDOW" name="root" />
-			<field type="CARD16" name="subpixel_order" enum="SubPixel" />
-			<pad bytes="10" />
-		</reply>
-	</request>
-	
-	<!-- opcode 3 is obsolete -->
-
-	<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>
-	</enum>
-
-	<request name="SelectInput" opcode="4">	
-		<field type="WINDOW" name="window" />
-		<field type="CARD16" name="enable" mask="NotifyMask" />
-		<pad bytes="2" />
-	</request>
-
-	<!--
-	I think this is correct.  It works. though I believe nInfo is a bit high...
-	-->
-	<request name="GetScreenInfo" opcode="5">
-		<field type="WINDOW" name="window" />
-		<reply>
-			<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="CARD16" name="rotation" mask="Rotation" />
-			<field type="CARD16" name="rate" />
-			<field type="CARD16" name="nInfo" />
-			<pad bytes="2" />
-			<list type="ScreenSize" name="sizes">
-			    <fieldref>nSizes</fieldref>
-			</list>
-			<list type="RefreshRates" name="rates">
-				<op op="-">
-					<fieldref>nInfo</fieldref>
-					<fieldref>nSizes</fieldref>
-				</op>
-			</list>
-		</reply>
-	</request>
-
-	<!-- new in version 1.2 -->
-
-	<request name="GetScreenSizeRange" opcode="6">
-		<field type="WINDOW" name="window" />
-		<reply>
-			<pad bytes="1" />
-			<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>
-
-	<request name="SetScreenSize" opcode="7">
-		<field type="WINDOW" name="window" />
-		<field type="CARD16" name="width" />    <!-- pixels -->
-		<field type="CARD16" name="height" />
-		<field type="CARD32" name="mm_width" />  <!-- millimeters -->
-		<field type="CARD32" name="mm_height" />
-	</request>
-
-	<!-- for GetScreenResources.ModeInfo.ModeFlag -->
-	<enum name="ModeFlag">
-		<item name="HsyncPositive"> <bit>0</bit></item>
-		<item name="HsyncNegative"> <bit>1</bit></item>
-		<item name="VsyncPositive"> <bit>2</bit></item>
-		<item name="VsyncNegative"> <bit>3</bit></item>
-		<item name="Interlace">     <bit>4</bit></item>
-		<item name="DoubleScan">    <bit>5</bit></item>
-		<item name="Csync">         <bit>6</bit></item>
-		<item name="CsyncPositive"> <bit>7</bit></item>
-		<item name="CsyncNegative"> <bit>8</bit></item>
-		<item name="HskewPresent">  <bit>9</bit></item>
-		<item name="Bcast">         <bit>10</bit></item>
-		<item name="PixelMultiplex"><bit>11</bit></item>
-		<item name="DoubleClock">   <bit>12</bit></item>
-		<item name="HalveClock">    <bit>13</bit></item>
-	</enum>
-
-	<struct name="ModeInfo">
-		<field type="CARD32" name="id" />
-		<field type="CARD16" name="width" />
-		<field type="CARD16" name="height" />
-		<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="vsync_start" />
-		<field type="CARD16" name="vsync_end" />
-		<field type="CARD16" name="vtotal" />
-		<field type="CARD16" name="name_len" />
-		<field type="CARD32" name="mode_flags" mask="ModeFlag" />
-		<!-- the mode name itself -->
-	</struct>
-
-	<request name="GetScreenResources" opcode="8">
-		<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>
-
-	<!-- for GetOutputInfo.connection -->
-	<enum name="Connection">
-		<item name="Connected" />
-		<item name="Disconnected" />
-		<item name="Unknown" />
-	</enum>
-
-	<request name="GetOutputInfo" opcode="9">
-		<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="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="CRTC" name="crtcs">
-			    <fieldref>num_crtcs</fieldref>
-			</list>
-			<list type="MODE" name="modes">
-			    <fieldref>num_modes</fieldref>
-			</list>
-			<list type="OUTPUT" name="clones">
-			    <fieldref>num_clones</fieldref>
-			</list>
-			<list type="BYTE" name="name">
-			    <fieldref>name_len</fieldref>
-			</list>
-		</reply>
-	</request>
-
-	<request name="ListOutputProperties" opcode="10">
-		<field type="OUTPUT" name="output" />
-		<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="QueryOutputProperty" opcode="11">
-		<field type="OUTPUT" name="output" />
-		<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="validValues">
-				<fieldref>length</fieldref>
-			</list>
-		</reply>
-	</request>
-
-	<request name="ConfigureOutputProperty" opcode="12">
-		<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="OUTPUT" name="output" />
-		<field type="ATOM" name="property" />
-		<field type="ATOM" name="type" />
-		<field type="CARD8" name="format" />
-		<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="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="OUTPUT" name="output" />
-		<field type="ATOM" name="property" />
-		<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" altenum="Atom" />
-			<field type="CARD32" name="bytes_after" />
-			<field type="CARD32" name="num_items" />
-			<pad bytes="12" />
-			<list type="BYTE" name="data">
-				<!-- n * format / 8 -->
-				<op op="*">
-					<fieldref>num_items</fieldref>
-					<op op="/">
-						<fieldref>format</fieldref>
-						<value>8</value>
-					</op>
-				</op>
-			</list>
-		</reply>
-	</request>
-
-	<request name="CreateMode" opcode="16">
-		<field type="WINDOW" name="window" />
-		<field type="ModeInfo" name="mode_info" />
-		<list type="char" name="name" />
-		<reply>
-			<pad bytes="1" />
-			<field type="MODE" name="mode" />
-			<pad bytes="20" />
-		</reply>
-	</request>
-
-	<request name="DestroyMode" opcode="17">
-		<field type="MODE" name="mode" />
-	</request>
-
-	<request name="AddOutputMode" opcode="18">
-		<field type="OUTPUT" name="output" />
-		<field type="MODE" name="mode" />
-	</request>
-
-	<request name="DeleteOutputMode" opcode="19">
-		<field type="OUTPUT" name="output" />
-		<field type="MODE" name="mode" />
-	</request>
-
-	<request name="GetCrtcInfo" opcode="20">
-		<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="INT16" name="x" />
-			<field type="INT16" name="y" />
-			<field type="CARD16" name="width" />
-			<field type="CARD16" name="height" />
-			<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="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="CRTC" name="crtc" />
-		<field type="TIMESTAMP" name="timestamp" />
-		<field type="TIMESTAMP" name="config_timestamp" />
-		<field type="INT16" name="x" />
-		<field type="INT16" name="y" />
-		<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="TIMESTAMP" name="timestamp" />
-			<pad bytes="20" />
-		</reply>
-	</request>
-
-	<request name="GetCrtcGammaSize" opcode="22">
-		<field type="CRTC" name="crtc" />
-		<reply>
-			<pad bytes="1" />
-			<field type="CARD16" name="size" />
-			<pad bytes="22" />
-		</reply>
-	</request>
-
-	<request name="GetCrtcGamma" opcode="23">
-		<field type="CRTC" name="crtc" />
-		<reply>
-			<pad bytes="1" />
-			<field type="CARD16" name="size" />
-			<pad bytes="22" />
-			<list type="CARD16" name="red">
-				<fieldref>size</fieldref>
-			</list>
-			<list type="CARD16" name="green">
-				<fieldref>size</fieldref>
-			</list>
-			<list type="CARD16" name="blue">
-				<fieldref>size</fieldref>
-			</list>
-		</reply>
-	</request>
-
-	<request name="SetCrtcGamma" opcode="24">
-		<field type="CRTC" name="crtc" />
-		<field type="CARD16" name="size" />
-		<pad bytes="2"/>
-		<list type="CARD16" name="red">
-			<fieldref>size</fieldref>
-		</list>
-		<list type="CARD16" name="green">
-			<fieldref>size</fieldref>
-		</list>
-		<list type="CARD16" name="blue">
-			<fieldref>size</fieldref>
-		</list>
-	</request>
-
-	<!-- new in 1.3 -->
-
-	<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>
-
-	<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>
-
-	<!-- Events -->
-
-	<event name="ScreenChangeNotify" number="0">
-		<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" enum="SubPixel" />
-		<field type="CARD16" name="width" />
-		<field type="CARD16" name="height" />
-		<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>
-	</enum>
-
-	<struct name="CrtcChange">
-		<field type="TIMESTAMP" name="timestamp" />
-		<field type="WINDOW" name="window" />
-		<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" />
-		<field type="CARD16" name="width" />
-		<field type="CARD16" name="height" />
-	</struct>
-
-	<struct name="OutputChange">
-		<field type="TIMESTAMP" name="timestamp" />
-		<field type="TIMESTAMP" name="config_timestamp" />
-		<field type="WINDOW" name="window" />
-		<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="OUTPUT" name="output" />
-		<field type="ATOM" name="atom" />
-		<field type="TIMESTAMP" name="timestamp" />
-		<field type="CARD8" name="status" enum="Property" />
-		<pad bytes="11" />
-	</struct>
-
-	<union name="NotifyData">
-		<field type="CrtcChange"     name="cc" />
-		<field type="OutputChange"   name="oc" />
-		<field type="OutputProperty" name="op" />
-	</union>
-
-	<event name="Notify" number="1">
-		<field type="CARD8" name="subCode" enum="Notify" />
-		<field type="NotifyData" name="u" />
-	</event>
-</xcb>
+<?xml version="1.0" encoding="utf-8"?>

+<!--

+Copyright (C) 2006 Jeremy Kolb, Ian Osgood

+All Rights Reserved.

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software, and to permit persons to whom the Software is

+furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in all

+copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the names of the authors or their

+institutions shall not be used in advertising or otherwise to promote the

+sale, use or other dealings in this Software without prior written

+authorization from the authors.

+-->

+

+<xcb header="randr" extension-xname="RANDR" extension-name="RandR"

+    major-version="1" minor-version="3">

+

+	<import>xproto</import>

+	<import>render</import>

+

+	<!-- XIDs -->

+	<xidtype name="MODE" />

+	<xidtype name="CRTC" />

+	<xidtype name="OUTPUT" />

+	

+	<!-- Errors -->

+

+	<error name="BadOutput" number="0" />

+	<error name="BadCrtc"   number="1" />

+	<error name="BadMode"   number="2" />

+

+	<!-- Requests -->

+

+	<enum name="Rotation">

+		<item name="Rotate_0">  <bit>0</bit></item>

+		<item name="Rotate_90"> <bit>1</bit></item>

+		<item name="Rotate_180"><bit>2</bit></item>

+		<item name="Rotate_270"><bit>3</bit></item>

+		<item name="Reflect_X"> <bit>4</bit></item>

+		<item name="Reflect_Y"> <bit>5</bit></item>

+	</enum>

+

+	<struct name="ScreenSize">

+		<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">

+		<field type="CARD16" name="nRates" />

+		<list type="CARD16" name="rates">

+			<fieldref>nRates</fieldref>

+		</list>

+	</struct>

+	

+	<request name="QueryVersion" opcode="0">

+		<field type="CARD32" name="major_version" />

+		<field type="CARD32" name="minor_version" />

+		<reply>

+			<pad bytes="1" />

+			<field type="CARD32" name="major_version" />

+			<field type="CARD32" name="minor_version" />

+			<pad bytes="16" />

+		</reply>

+	</request>

+	

+	<!-- 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="WINDOW" name="window" />

+		<field type="TIMESTAMP" name="timestamp" />

+		<field type="TIMESTAMP" name="config_timestamp" />

+		<field type="CARD16" name="sizeID" />

+		<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="TIMESTAMP" name="new_timestamp" />

+			<field type="TIMESTAMP" name="config_timestamp" />

+			<field type="WINDOW" name="root" />

+			<field type="CARD16" name="subpixel_order" enum="SubPixel" />

+			<pad bytes="10" />

+		</reply>

+	</request>

+	

+	<!-- opcode 3 is obsolete -->

+

+	<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>

+	</enum>

+

+	<request name="SelectInput" opcode="4">	

+		<field type="WINDOW" name="window" />

+		<field type="CARD16" name="enable" mask="NotifyMask" />

+		<pad bytes="2" />

+	</request>

+

+	<!--

+	I think this is correct.  It works. though I believe nInfo is a bit high...

+	-->

+	<request name="GetScreenInfo" opcode="5">

+		<field type="WINDOW" name="window" />

+		<reply>

+			<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="CARD16" name="rotation" mask="Rotation" />

+			<field type="CARD16" name="rate" />

+			<field type="CARD16" name="nInfo" />

+			<pad bytes="2" />

+			<list type="ScreenSize" name="sizes">

+			    <fieldref>nSizes</fieldref>

+			</list>

+			<list type="RefreshRates" name="rates">

+				<op op="-">

+					<fieldref>nInfo</fieldref>

+					<fieldref>nSizes</fieldref>

+				</op>

+			</list>

+		</reply>

+	</request>

+

+	<!-- new in version 1.2 -->

+

+	<request name="GetScreenSizeRange" opcode="6">

+		<field type="WINDOW" name="window" />

+		<reply>

+			<pad bytes="1" />

+			<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>

+

+	<request name="SetScreenSize" opcode="7">

+		<field type="WINDOW" name="window" />

+		<field type="CARD16" name="width" />    <!-- pixels -->

+		<field type="CARD16" name="height" />

+		<field type="CARD32" name="mm_width" />  <!-- millimeters -->

+		<field type="CARD32" name="mm_height" />

+	</request>

+

+	<!-- for GetScreenResources.ModeInfo.ModeFlag -->

+	<enum name="ModeFlag">

+		<item name="HsyncPositive"> <bit>0</bit></item>

+		<item name="HsyncNegative"> <bit>1</bit></item>

+		<item name="VsyncPositive"> <bit>2</bit></item>

+		<item name="VsyncNegative"> <bit>3</bit></item>

+		<item name="Interlace">     <bit>4</bit></item>

+		<item name="DoubleScan">    <bit>5</bit></item>

+		<item name="Csync">         <bit>6</bit></item>

+		<item name="CsyncPositive"> <bit>7</bit></item>

+		<item name="CsyncNegative"> <bit>8</bit></item>

+		<item name="HskewPresent">  <bit>9</bit></item>

+		<item name="Bcast">         <bit>10</bit></item>

+		<item name="PixelMultiplex"><bit>11</bit></item>

+		<item name="DoubleClock">   <bit>12</bit></item>

+		<item name="HalveClock">    <bit>13</bit></item>

+	</enum>

+

+	<struct name="ModeInfo">

+		<field type="CARD32" name="id" />

+		<field type="CARD16" name="width" />

+		<field type="CARD16" name="height" />

+		<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="vsync_start" />

+		<field type="CARD16" name="vsync_end" />

+		<field type="CARD16" name="vtotal" />

+		<field type="CARD16" name="name_len" />

+		<field type="CARD32" name="mode_flags" mask="ModeFlag" />

+		<!-- the mode name itself -->

+	</struct>

+

+	<request name="GetScreenResources" opcode="8">

+		<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>

+

+	<!-- for GetOutputInfo.connection -->

+	<enum name="Connection">

+		<item name="Connected" />

+		<item name="Disconnected" />

+		<item name="Unknown" />

+	</enum>

+

+	<request name="GetOutputInfo" opcode="9">

+		<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="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="CRTC" name="crtcs">

+			    <fieldref>num_crtcs</fieldref>

+			</list>

+			<list type="MODE" name="modes">

+			    <fieldref>num_modes</fieldref>

+			</list>

+			<list type="OUTPUT" name="clones">

+			    <fieldref>num_clones</fieldref>

+			</list>

+			<list type="BYTE" name="name">

+			    <fieldref>name_len</fieldref>

+			</list>

+		</reply>

+	</request>

+

+	<request name="ListOutputProperties" opcode="10">

+		<field type="OUTPUT" name="output" />

+		<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="QueryOutputProperty" opcode="11">

+		<field type="OUTPUT" name="output" />

+		<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="validValues">

+				<fieldref>length</fieldref>

+			</list>

+		</reply>

+	</request>

+

+	<request name="ConfigureOutputProperty" opcode="12">

+		<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="OUTPUT" name="output" />

+		<field type="ATOM" name="property" />

+		<field type="ATOM" name="type" />

+		<field type="CARD8" name="format" />

+		<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="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="OUTPUT" name="output" />

+		<field type="ATOM" name="property" />

+		<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" altenum="Atom" />

+			<field type="CARD32" name="bytes_after" />

+			<field type="CARD32" name="num_items" />

+			<pad bytes="12" />

+			<list type="BYTE" name="data">

+				<!-- n * format / 8 -->

+				<op op="*">

+					<fieldref>num_items</fieldref>

+					<op op="/">

+						<fieldref>format</fieldref>

+						<value>8</value>

+					</op>

+				</op>

+			</list>

+		</reply>

+	</request>

+

+	<request name="CreateMode" opcode="16">

+		<field type="WINDOW" name="window" />

+		<field type="ModeInfo" name="mode_info" />

+		<list type="char" name="name" />

+		<reply>

+			<pad bytes="1" />

+			<field type="MODE" name="mode" />

+			<pad bytes="20" />

+		</reply>

+	</request>

+

+	<request name="DestroyMode" opcode="17">

+		<field type="MODE" name="mode" />

+	</request>

+

+	<request name="AddOutputMode" opcode="18">

+		<field type="OUTPUT" name="output" />

+		<field type="MODE" name="mode" />

+	</request>

+

+	<request name="DeleteOutputMode" opcode="19">

+		<field type="OUTPUT" name="output" />

+		<field type="MODE" name="mode" />

+	</request>

+

+	<request name="GetCrtcInfo" opcode="20">

+		<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="INT16" name="x" />

+			<field type="INT16" name="y" />

+			<field type="CARD16" name="width" />

+			<field type="CARD16" name="height" />

+			<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="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="CRTC" name="crtc" />

+		<field type="TIMESTAMP" name="timestamp" />

+		<field type="TIMESTAMP" name="config_timestamp" />

+		<field type="INT16" name="x" />

+		<field type="INT16" name="y" />

+		<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="TIMESTAMP" name="timestamp" />

+			<pad bytes="20" />

+		</reply>

+	</request>

+

+	<request name="GetCrtcGammaSize" opcode="22">

+		<field type="CRTC" name="crtc" />

+		<reply>

+			<pad bytes="1" />

+			<field type="CARD16" name="size" />

+			<pad bytes="22" />

+		</reply>

+	</request>

+

+	<request name="GetCrtcGamma" opcode="23">

+		<field type="CRTC" name="crtc" />

+		<reply>

+			<pad bytes="1" />

+			<field type="CARD16" name="size" />

+			<pad bytes="22" />

+			<list type="CARD16" name="red">

+				<fieldref>size</fieldref>

+			</list>

+			<list type="CARD16" name="green">

+				<fieldref>size</fieldref>

+			</list>

+			<list type="CARD16" name="blue">

+				<fieldref>size</fieldref>

+			</list>

+		</reply>

+	</request>

+

+	<request name="SetCrtcGamma" opcode="24">

+		<field type="CRTC" name="crtc" />

+		<field type="CARD16" name="size" />

+		<pad bytes="2"/>

+		<list type="CARD16" name="red">

+			<fieldref>size</fieldref>

+		</list>

+		<list type="CARD16" name="green">

+			<fieldref>size</fieldref>

+		</list>

+		<list type="CARD16" name="blue">

+			<fieldref>size</fieldref>

+		</list>

+	</request>

+

+	<!-- new in 1.3 -->

+

+	<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>

+

+	<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>

+

+	<!-- Events -->

+

+	<event name="ScreenChangeNotify" number="0">

+		<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" enum="SubPixel" />

+		<field type="CARD16" name="width" />

+		<field type="CARD16" name="height" />

+		<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>

+	</enum>

+

+	<struct name="CrtcChange">

+		<field type="TIMESTAMP" name="timestamp" />

+		<field type="WINDOW" name="window" />

+		<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" />

+		<field type="CARD16" name="width" />

+		<field type="CARD16" name="height" />

+	</struct>

+

+	<struct name="OutputChange">

+		<field type="TIMESTAMP" name="timestamp" />

+		<field type="TIMESTAMP" name="config_timestamp" />

+		<field type="WINDOW" name="window" />

+		<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="OUTPUT" name="output" />

+		<field type="ATOM" name="atom" />

+		<field type="TIMESTAMP" name="timestamp" />

+		<field type="CARD8" name="status" enum="Property" />

+		<pad bytes="11" />

+	</struct>

+

+	<union name="NotifyData">

+		<field type="CrtcChange"     name="cc" />

+		<field type="OutputChange"   name="oc" />

+		<field type="OutputProperty" name="op" />

+	</union>

+

+	<event name="Notify" number="1">

+		<field type="CARD8" name="subCode" enum="Notify" />

+		<field type="NotifyData" name="u" />

+	</event>

+</xcb>