Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	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/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

22 files changed, 5110 insertions, 5110 deletions

diff --git a/libxcb/xcb-proto/src/bigreq.xml b/libxcb/xcb-proto/src/bigreq.xml
index df1455be9..3cca2f77f 100644
--- a/libxcb/xcb-proto/src/bigreq.xml
+++ b/libxcb/xcb-proto/src/bigreq.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.

-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="bigreq" extension-xname="BIG-REQUESTS"

-    extension-name="BigRequests" extension-multiword="true"

-    major-version="0" minor-version="0">

-

-  <request name="Enable" opcode="0">

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="maximum_request_length" />

-    </reply>

-  </request>

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
+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="bigreq" extension-xname="BIG-REQUESTS"
+    extension-name="BigRequests" extension-multiword="true"
+    major-version="0" minor-version="0">
+
+  <request name="Enable" opcode="0">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="maximum_request_length" />
+    </reply>
+  </request>
+</xcb>
diff --git a/libxcb/xcb-proto/src/composite.xml b/libxcb/xcb-proto/src/composite.xml
index d6e5dc261..d16b6e746 100644
--- a/libxcb/xcb-proto/src/composite.xml
+++ b/libxcb/xcb-proto/src/composite.xml
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2004 Josh Triplett.  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.

--->

-<!-- This file describes version 0.3 of COMPOSITE. -->

-<xcb header="composite" extension-xname="Composite" extension-name="Composite"

-    major-version="0" minor-version="3">

-

-  <import>xproto</import>

-  <import>xfixes</import>

-

-  <enum name="Redirect">

-    <item name="Automatic" />

-    <item name="Manual" />

-  </enum>

-

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

-    <field type="CARD32" name="client_major_version" />

-    <field type="CARD32" name="client_minor_version" />

-    <reply>

-      <pad bytes="1" />

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

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

-      <pad bytes="16" />

-    </reply>

-  </request>

-

-  <request name="RedirectWindow" opcode="1">

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

-    <field type="CARD8" name="update" enum="Redirect" />

-    <pad bytes="3" />

-  </request>

-

-  <request name="RedirectSubwindows" opcode="2">

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

-    <field type="CARD8" name="update" enum="Redirect" />

-    <pad bytes="3" />

-  </request>

-

-  <request name="UnredirectWindow" opcode="3">

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

-    <field type="CARD8" name="update" enum="Redirect" />

-    <pad bytes="3" />

-  </request>

-

-  <request name="UnredirectSubwindows" opcode="4">

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

-    <field type="CARD8" name="update" enum="Redirect" />

-    <pad bytes="3" />

-  </request>

-

-  <request name="CreateRegionFromBorderClip" opcode="5">

-    <field type="REGION" name="region" />

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

-  </request>

-

-  <request name="NameWindowPixmap" opcode="6">

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

-    <field type="PIXMAP" name="pixmap" />

-  </request>

-  

-  <!-- new in version 0.3 -->

-  

-  <request name="GetOverlayWindow" opcode="7">

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

-    <reply>

-      <pad bytes="1" />

-      <field type="WINDOW" name="overlay_win" />

-      <pad bytes="20" />

-    </reply>

-  </request>

-

-  <request name="ReleaseOverlayWindow" opcode="8">

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

-  </request>

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004 Josh Triplett.  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.
+-->
+<!-- This file describes version 0.3 of COMPOSITE. -->
+<xcb header="composite" extension-xname="Composite" extension-name="Composite"
+    major-version="0" minor-version="3">
+
+  <import>xproto</import>
+  <import>xfixes</import>
+
+  <enum name="Redirect">
+    <item name="Automatic" />
+    <item name="Manual" />
+  </enum>
+
+  <request name="QueryVersion" opcode="0">
+    <field type="CARD32" name="client_major_version" />
+    <field type="CARD32" name="client_minor_version" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="major_version" />
+      <field type="CARD32" name="minor_version" />
+      <pad bytes="16" />
+    </reply>
+  </request>
+
+  <request name="RedirectWindow" opcode="1">
+    <field type="WINDOW" name="window" />
+    <field type="CARD8" name="update" enum="Redirect" />
+    <pad bytes="3" />
+  </request>
+
+  <request name="RedirectSubwindows" opcode="2">
+    <field type="WINDOW" name="window" />
+    <field type="CARD8" name="update" enum="Redirect" />
+    <pad bytes="3" />
+  </request>
+
+  <request name="UnredirectWindow" opcode="3">
+    <field type="WINDOW" name="window" />
+    <field type="CARD8" name="update" enum="Redirect" />
+    <pad bytes="3" />
+  </request>
+
+  <request name="UnredirectSubwindows" opcode="4">
+    <field type="WINDOW" name="window" />
+    <field type="CARD8" name="update" enum="Redirect" />
+    <pad bytes="3" />
+  </request>
+
+  <request name="CreateRegionFromBorderClip" opcode="5">
+    <field type="REGION" name="region" />
+    <field type="WINDOW" name="window" />
+  </request>
+
+  <request name="NameWindowPixmap" opcode="6">
+    <field type="WINDOW" name="window" />
+    <field type="PIXMAP" name="pixmap" />
+  </request>
+  
+  <!-- new in version 0.3 -->
+  
+  <request name="GetOverlayWindow" opcode="7">
+    <field type="WINDOW" name="window" />
+    <reply>
+      <pad bytes="1" />
+      <field type="WINDOW" name="overlay_win" />
+      <pad bytes="20" />
+    </reply>
+  </request>
+
+  <request name="ReleaseOverlayWindow" opcode="8">
+    <field type="WINDOW" name="window" />
+  </request>
+</xcb>
diff --git a/libxcb/xcb-proto/src/damage.xml b/libxcb/xcb-proto/src/damage.xml
index 5ac4cebbc..9c5cde5b6 100644
--- a/libxcb/xcb-proto/src/damage.xml
+++ b/libxcb/xcb-proto/src/damage.xml
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2004 Josh Triplett

-Copyright (C) 2007 Jeremy Kolb

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

--->

-<!-- This file describes version 1.1 of DAMAGE. -->

-<xcb header="damage" extension-xname="DAMAGE" extension-name="Damage"

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

-  <import>xproto</import>

-  <import>xfixes</import>

-

-  <xidtype name="DAMAGE" />

-

-  <enum name="ReportLevel">

-    <item name="RawRectangles" />

-    <item name="DeltaRectangles" />

-    <item name="BoundingBox" />

-    <item name="NonEmpty" />

-  </enum>

-

-  <error name="BadDamage" number="0" />

-

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

-    <field type="CARD32" name="client_major_version" />

-    <field type="CARD32" name="client_minor_version" />

-    <reply>

-      <pad bytes="1" />

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

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

-      <pad bytes="16" />

-    </reply>

-  </request>

-

-  <request name="Create" opcode="1">

-    <field type="DAMAGE"   name="damage" />

-    <field type="DRAWABLE" name="drawable" />

-    <field type="CARD8"    name="level" enum="ReportLevel" />

-    <pad bytes="3" />

-  </request>

-

-  <request name="Destroy" opcode="2">

-    <field type="DAMAGE" name="damage" />

-  </request>

-

-  <request name="Subtract" opcode="3">

-    <field type="DAMAGE" name="damage" />

-    <field type="REGION" name="repair" altenum="Region" />

-    <field type="REGION" name="parts" altenum="Region" />

-  </request>

-

-  <request name="Add" opcode="4">

-    <field type="DRAWABLE" name="drawable" />

-    <field type="REGION" name="region" />

-  </request>

-

-  <event name="Notify" number="0">

-    <field type="CARD8"     name="level" enum="ReportLevel" />

-    <field type="DRAWABLE"  name="drawable" />

-    <field type="DAMAGE"    name="damage" />

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

-    <field type="RECTANGLE" name="area" />

-    <field type="RECTANGLE" name="geometry" />

-  </event>

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004 Josh Triplett
+Copyright (C) 2007 Jeremy Kolb
+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.
+-->
+<!-- This file describes version 1.1 of DAMAGE. -->
+<xcb header="damage" extension-xname="DAMAGE" extension-name="Damage"
+    major-version="1" minor-version="1">
+  <import>xproto</import>
+  <import>xfixes</import>
+
+  <xidtype name="DAMAGE" />
+
+  <enum name="ReportLevel">
+    <item name="RawRectangles" />
+    <item name="DeltaRectangles" />
+    <item name="BoundingBox" />
+    <item name="NonEmpty" />
+  </enum>
+
+  <error name="BadDamage" number="0" />
+
+  <request name="QueryVersion" opcode="0">
+    <field type="CARD32" name="client_major_version" />
+    <field type="CARD32" name="client_minor_version" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="major_version" />
+      <field type="CARD32" name="minor_version" />
+      <pad bytes="16" />
+    </reply>
+  </request>
+
+  <request name="Create" opcode="1">
+    <field type="DAMAGE"   name="damage" />
+    <field type="DRAWABLE" name="drawable" />
+    <field type="CARD8"    name="level" enum="ReportLevel" />
+    <pad bytes="3" />
+  </request>
+
+  <request name="Destroy" opcode="2">
+    <field type="DAMAGE" name="damage" />
+  </request>
+
+  <request name="Subtract" opcode="3">
+    <field type="DAMAGE" name="damage" />
+    <field type="REGION" name="repair" altenum="Region" />
+    <field type="REGION" name="parts" altenum="Region" />
+  </request>
+
+  <request name="Add" opcode="4">
+    <field type="DRAWABLE" name="drawable" />
+    <field type="REGION" name="region" />
+  </request>
+
+  <event name="Notify" number="0">
+    <field type="CARD8"     name="level" enum="ReportLevel" />
+    <field type="DRAWABLE"  name="drawable" />
+    <field type="DAMAGE"    name="damage" />
+    <field type="TIMESTAMP" name="timestamp" />
+    <field type="RECTANGLE" name="area" />
+    <field type="RECTANGLE" name="geometry" />
+  </event>
+</xcb>
diff --git a/libxcb/xcb-proto/src/dpms.xml b/libxcb/xcb-proto/src/dpms.xml
index 32a9fca52..0c2ac2027 100644
--- a/libxcb/xcb-proto/src/dpms.xml
+++ b/libxcb/xcb-proto/src/dpms.xml
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.

-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="dpms" extension-xname="DPMS" extension-name="DPMS"

-    major-version="0" minor-version="0">

-  <request name="GetVersion" opcode="0">

-    <field type="CARD16" name="client_major_version" />

-    <field type="CARD16" name="client_minor_version" />

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD16" name="server_major_version" />

-      <field type="CARD16" name="server_minor_version" />

-    </reply>

-  </request>

-

-  <request name="Capable" opcode="1">

-    <reply>

-      <pad bytes="1" />

-      <field type="BOOL" name="capable" />

-      <pad bytes="23" />

-    </reply>

-  </request>

-

-  <request name="GetTimeouts" opcode="2">

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD16" name="standby_timeout" />

-      <field type="CARD16" name="suspend_timeout" />

-      <field type="CARD16" name="off_timeout" />

-      <pad bytes="18" />

-    </reply>

-  </request>

-

-  <request name="SetTimeouts" opcode="3">

-    <field type="CARD16" name="standby_timeout" />

-    <field type="CARD16" name="suspend_timeout" />

-    <field type="CARD16" name="off_timeout" />

-  </request>

-

-  <request name="Enable" opcode="4" />

-

-  <request name="Disable" opcode="5" />

-

-  <enum name="DPMSMode">

-    <item name="On" />

-    <item name="Standby" />

-    <item name="Suspend" />

-    <item name="Off" />

-  </enum>

-

-  <request name="ForceLevel" opcode="6">

-    <field type="CARD16" name="power_level" enum="DPMSMode" />

-  </request>

-

-  <request name="Info" opcode="7">

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD16" name="power_level" enum="DPMSMode" />

-      <field type="BOOL" name="state" />

-      <pad bytes="21" />

-    </reply>

-  </request>

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
+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="dpms" extension-xname="DPMS" extension-name="DPMS"
+    major-version="0" minor-version="0">
+  <request name="GetVersion" opcode="0">
+    <field type="CARD16" name="client_major_version" />
+    <field type="CARD16" name="client_minor_version" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="server_major_version" />
+      <field type="CARD16" name="server_minor_version" />
+    </reply>
+  </request>
+
+  <request name="Capable" opcode="1">
+    <reply>
+      <pad bytes="1" />
+      <field type="BOOL" name="capable" />
+      <pad bytes="23" />
+    </reply>
+  </request>
+
+  <request name="GetTimeouts" opcode="2">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="standby_timeout" />
+      <field type="CARD16" name="suspend_timeout" />
+      <field type="CARD16" name="off_timeout" />
+      <pad bytes="18" />
+    </reply>
+  </request>
+
+  <request name="SetTimeouts" opcode="3">
+    <field type="CARD16" name="standby_timeout" />
+    <field type="CARD16" name="suspend_timeout" />
+    <field type="CARD16" name="off_timeout" />
+  </request>
+
+  <request name="Enable" opcode="4" />
+
+  <request name="Disable" opcode="5" />
+
+  <enum name="DPMSMode">
+    <item name="On" />
+    <item name="Standby" />
+    <item name="Suspend" />
+    <item name="Off" />
+  </enum>
+
+  <request name="ForceLevel" opcode="6">
+    <field type="CARD16" name="power_level" enum="DPMSMode" />
+  </request>
+
+  <request name="Info" opcode="7">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="power_level" enum="DPMSMode" />
+      <field type="BOOL" name="state" />
+      <pad bytes="21" />
+    </reply>
+  </request>
+</xcb>
diff --git a/libxcb/xcb-proto/src/ge.xml b/libxcb/xcb-proto/src/ge.xml
index b9ecacc4e..3a6210d97 100644
--- a/libxcb/xcb-proto/src/ge.xml
+++ b/libxcb/xcb-proto/src/ge.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2009 Open Text Corporation.  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="ge" extension-xname="Generic Event Extension" extension-name="GenericEvent"

-    major-version="1" minor-version="0">

-

-  <!-- Version 1 -->

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

-    <field type="CARD16" name="client_major_version" />

-    <field type="CARD16" name="client_minor_version" />

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD16" name="major_version" />

-      <field type="CARD16" name="minor_version" />

-      <pad bytes="20" />

-    </reply>

-  </request>

-

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2009 Open Text Corporation.  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="ge" extension-xname="Generic Event Extension" extension-name="GenericEvent"
+    major-version="1" minor-version="0">
+
+  <!-- Version 1 -->
+  <request name="QueryVersion" opcode="0">
+    <field type="CARD16" name="client_major_version" />
+    <field type="CARD16" name="client_minor_version" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="major_version" />
+      <field type="CARD16" name="minor_version" />
+      <pad bytes="20" />
+    </reply>
+  </request>
+
+</xcb>
diff --git a/libxcb/xcb-proto/src/randr.xml b/libxcb/xcb-proto/src/randr.xml
index b28372e9c..4f0716f7c 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>
diff --git a/libxcb/xcb-proto/src/record.xml b/libxcb/xcb-proto/src/record.xml
index 11fb9fc6a..74c16fe5b 100644
--- a/libxcb/xcb-proto/src/record.xml
+++ b/libxcb/xcb-proto/src/record.xml
@@ -1,178 +1,178 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2005 Jeremy Kolb.

-All Rights Reserved.

-

-Permission is hereby granted, free of charge, to any person ob/Sintaining 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="record" extension-xname="RECORD" extension-name="Record"

-    major-version="1" minor-version="13">

-

-    <!-- Types -->

-    <xidtype name="CONTEXT" />

-    

-    <struct name="Range8">

-	<field type="CARD8" name="first" />

-	<field type="CARD8" name="last" />

-    </struct>

-

-    <struct name="Range16">

-	<field type="CARD16" name="first" />

-	<field type="CARD16" name="last" />

-    </struct>

-

-    <struct name="ExtRange">

-	<field type="Range8" name="major" />

-	<field type="Range16" name="minor" />

-    </struct>

-

-    <struct name="Range">

-	<field type="Range8" name="core_requests" />

-	<field type="Range8" name="core_replies" />

-	<field type="ExtRange" name="ext_requests" />

-	<field type="ExtRange" name="ext_replies" />

-	<field type="Range8" name="delivered_events" />

-	<field type="Range8" name="device_events" />

-	<field type="Range8" name="errors" />

-	<field type="BOOL" name="client_started" />

-	<field type="BOOL" name="client_died" />

-    </struct>

-

-    <typedef oldname="CARD8" newname="ElementHeader" />

-    <enum name="HType">

-	<item name="FromServerTime"><bit>0</bit></item>

-	<item name="FromClientTime"><bit>1</bit></item>

-	<item name="FromClientSequence"><bit>2</bit></item>

-    </enum>

-

-    <typedef oldname="CARD32" newname="ClientSpec" />

-    <enum name="CS">

-	<item name="CurrentClients"><value>1</value></item>

-	<item name="FutureClients"><value>2</value></item>

-	<item name="AllClients"><value>3</value></item>

-    </enum>

-

-    <struct name="ClientInfo">

-	<field type="ClientSpec" name="client_resource" />

-	<field type="CARD32" name="num_ranges" />

-	<list type="Range" name="ranges">

-	    <fieldref>num_ranges</fieldref>

-	</list>

-    </struct>

-

-    <!-- Errors -->

-    <error name="BadContext" number="0">

-	<field type="CARD32" name="invalid_record" />

-    </error>

-	

-    <!-- Requests -->

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

-	<field type="CARD16" name="major_version" />

-	<field type="CARD16" name="minor_version" />

-	<reply>

-	    <pad bytes="1"/>

-	    <field type="CARD16" name="major_version" />

-	    <field type="CARD16" name="minor_version" />

-	</reply>

-    </request>

-

-    <request name="CreateContext" opcode="1">

-	<field type="record:CONTEXT" name="context" />

-	<field type="ElementHeader" name="element_header" />

-	<pad bytes="3" />

-	<field type="CARD32" name="num_client_specs" />

-	<field type="CARD32" name="num_ranges" />

-	<list type="ClientSpec" name="client_specs">

-	    <fieldref>num_client_specs</fieldref>

-	</list>

-	<list type="Range" name="ranges">

-	    <fieldref>num_ranges</fieldref>

-	</list>

-    </request>

-

-    <request name="RegisterClients" opcode="2">

-	<field type="record:CONTEXT" name="context" />

-	<field type="ElementHeader" name="element_header" />

-	<pad bytes="3" />

-	<field type="CARD32" name="num_client_specs" />

-	<field type="CARD32" name="num_ranges" />

-	<list type="ClientSpec" name="client_specs">

-	    <fieldref>num_client_specs</fieldref>

-	</list>

-	<list type="Range" name="ranges">

-	    <fieldref>num_ranges</fieldref>

-	</list>

-    </request>

-

-    <request name="UnregisterClients" opcode="3">

-	<field type="record:CONTEXT" name="context" />

-	<field type="CARD32" name="num_client_specs" />

-	<list type="ClientSpec" name="client_specs">

-	    <fieldref>num_client_specs</fieldref>

-	</list>

-    </request>

-

-    <request name="GetContext" opcode="4">

-	<field type="record:CONTEXT" name="context" />

-	<reply>

-	    <field type="BOOL" name="enabled" />

-	    <field type="ElementHeader" name="element_header" />

-	    <pad bytes="3" />

-	    <field type="CARD32" name="num_intercepted_clients" />

-	    <pad bytes="16" />

-	    <list type="ClientInfo" name="intercepted_clients">

-		<fieldref>num_intercepted_clients</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <request name="EnableContext" opcode="5">

-	<field type="record:CONTEXT" name="context" />

-	<reply>

-	    <field type="CARD8" name="category" />

-	    <field type="ElementHeader" name="element_header" />

-	    <field type="BOOL" name="client_swapped" />

-	    <pad bytes="2" />

-	    <field type="CARD32" name="xid_base" />

-	    <field type="CARD32" name="server_time" />

-	    <field type="CARD32" name="rec_sequence_num" />

-	    <pad bytes="8" />

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

-		<op op="*">

-		    <fieldref>length</fieldref>

-		    <value>4</value>

-		</op>

-	    </list>

-	</reply>

-    </request>

-	    

-    <request name="DisableContext" opcode="6">

-	<field type="record:CONTEXT" name="context" />

-    </request>

-

-    <request name="FreeContext" opcode="7">

-	<field type="record:CONTEXT" name="context" />

-    </request>

-    

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2005 Jeremy Kolb.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person ob/Sintaining 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="record" extension-xname="RECORD" extension-name="Record"
+    major-version="1" minor-version="13">
+
+    <!-- Types -->
+    <xidtype name="CONTEXT" />
+    
+    <struct name="Range8">
+	<field type="CARD8" name="first" />
+	<field type="CARD8" name="last" />
+    </struct>
+
+    <struct name="Range16">
+	<field type="CARD16" name="first" />
+	<field type="CARD16" name="last" />
+    </struct>
+
+    <struct name="ExtRange">
+	<field type="Range8" name="major" />
+	<field type="Range16" name="minor" />
+    </struct>
+
+    <struct name="Range">
+	<field type="Range8" name="core_requests" />
+	<field type="Range8" name="core_replies" />
+	<field type="ExtRange" name="ext_requests" />
+	<field type="ExtRange" name="ext_replies" />
+	<field type="Range8" name="delivered_events" />
+	<field type="Range8" name="device_events" />
+	<field type="Range8" name="errors" />
+	<field type="BOOL" name="client_started" />
+	<field type="BOOL" name="client_died" />
+    </struct>
+
+    <typedef oldname="CARD8" newname="ElementHeader" />
+    <enum name="HType">
+	<item name="FromServerTime"><bit>0</bit></item>
+	<item name="FromClientTime"><bit>1</bit></item>
+	<item name="FromClientSequence"><bit>2</bit></item>
+    </enum>
+
+    <typedef oldname="CARD32" newname="ClientSpec" />
+    <enum name="CS">
+	<item name="CurrentClients"><value>1</value></item>
+	<item name="FutureClients"><value>2</value></item>
+	<item name="AllClients"><value>3</value></item>
+    </enum>
+
+    <struct name="ClientInfo">
+	<field type="ClientSpec" name="client_resource" />
+	<field type="CARD32" name="num_ranges" />
+	<list type="Range" name="ranges">
+	    <fieldref>num_ranges</fieldref>
+	</list>
+    </struct>
+
+    <!-- Errors -->
+    <error name="BadContext" number="0">
+	<field type="CARD32" name="invalid_record" />
+    </error>
+	
+    <!-- Requests -->
+    <request name="QueryVersion" opcode="0">
+	<field type="CARD16" name="major_version" />
+	<field type="CARD16" name="minor_version" />
+	<reply>
+	    <pad bytes="1"/>
+	    <field type="CARD16" name="major_version" />
+	    <field type="CARD16" name="minor_version" />
+	</reply>
+    </request>
+
+    <request name="CreateContext" opcode="1">
+	<field type="record:CONTEXT" name="context" />
+	<field type="ElementHeader" name="element_header" />
+	<pad bytes="3" />
+	<field type="CARD32" name="num_client_specs" />
+	<field type="CARD32" name="num_ranges" />
+	<list type="ClientSpec" name="client_specs">
+	    <fieldref>num_client_specs</fieldref>
+	</list>
+	<list type="Range" name="ranges">
+	    <fieldref>num_ranges</fieldref>
+	</list>
+    </request>
+
+    <request name="RegisterClients" opcode="2">
+	<field type="record:CONTEXT" name="context" />
+	<field type="ElementHeader" name="element_header" />
+	<pad bytes="3" />
+	<field type="CARD32" name="num_client_specs" />
+	<field type="CARD32" name="num_ranges" />
+	<list type="ClientSpec" name="client_specs">
+	    <fieldref>num_client_specs</fieldref>
+	</list>
+	<list type="Range" name="ranges">
+	    <fieldref>num_ranges</fieldref>
+	</list>
+    </request>
+
+    <request name="UnregisterClients" opcode="3">
+	<field type="record:CONTEXT" name="context" />
+	<field type="CARD32" name="num_client_specs" />
+	<list type="ClientSpec" name="client_specs">
+	    <fieldref>num_client_specs</fieldref>
+	</list>
+    </request>
+
+    <request name="GetContext" opcode="4">
+	<field type="record:CONTEXT" name="context" />
+	<reply>
+	    <field type="BOOL" name="enabled" />
+	    <field type="ElementHeader" name="element_header" />
+	    <pad bytes="3" />
+	    <field type="CARD32" name="num_intercepted_clients" />
+	    <pad bytes="16" />
+	    <list type="ClientInfo" name="intercepted_clients">
+		<fieldref>num_intercepted_clients</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <request name="EnableContext" opcode="5">
+	<field type="record:CONTEXT" name="context" />
+	<reply>
+	    <field type="CARD8" name="category" />
+	    <field type="ElementHeader" name="element_header" />
+	    <field type="BOOL" name="client_swapped" />
+	    <pad bytes="2" />
+	    <field type="CARD32" name="xid_base" />
+	    <field type="CARD32" name="server_time" />
+	    <field type="CARD32" name="rec_sequence_num" />
+	    <pad bytes="8" />
+	    <list type="BYTE" name="data">
+		<op op="*">
+		    <fieldref>length</fieldref>
+		    <value>4</value>
+		</op>
+	    </list>
+	</reply>
+    </request>
+	    
+    <request name="DisableContext" opcode="6">
+	<field type="record:CONTEXT" name="context" />
+    </request>
+
+    <request name="FreeContext" opcode="7">
+	<field type="record:CONTEXT" name="context" />
+    </request>
+    
+</xcb>
diff --git a/libxcb/xcb-proto/src/res.xml b/libxcb/xcb-proto/src/res.xml
index fed2cf712..d758d893b 100644
--- a/libxcb/xcb-proto/src/res.xml
+++ b/libxcb/xcb-proto/src/res.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2006 Jeremy Kolb

-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="res" extension-xname="X-Resource" extension-name="Res"

-    major-version="1" minor-version="0">

-    <import>xproto</import>

-

-    <struct name="Client">

-        <field type="CARD32" name="resource_base" />

-        <field type="CARD32" name="resource_mask" />

-    </struct>

-

-    <struct name="Type">

-        <field type="ATOM" name="resource_type" />

-        <field type="CARD32" name="count" />

-    </struct>

-

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

-        <field type="CARD8" name="client_major" />

-        <field type="CARD8" name="client_minor" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD16" name="server_major" />

-            <field type="CARD16" name="server_minor" />

-        </reply>

-    </request>

-

-    <request name="QueryClients" opcode="1">

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="num_clients" />

-            <pad bytes="20" />

-            <list type="Client" name="clients">

-                <fieldref>num_clients</fieldref>

-            </list>

-        </reply>

-    </request>

-

-    <request name="QueryClientResources" opcode="2">

-        <field type="CARD32" name="xid" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="num_types" />

-            <pad bytes="20" />

-            <list type="Type" name="types">

-                <fieldref>num_types</fieldref>

-            </list>

-        </reply>

-    </request>

-

-    <request name="QueryClientPixmapBytes" opcode="3">

-        <field type="CARD32" name="xid" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="bytes" />

-            <field type="CARD32" name="bytes_overflow" />

-        </reply>

-    </request>

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2006 Jeremy Kolb
+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="res" extension-xname="X-Resource" extension-name="Res"
+    major-version="1" minor-version="0">
+    <import>xproto</import>
+
+    <struct name="Client">
+        <field type="CARD32" name="resource_base" />
+        <field type="CARD32" name="resource_mask" />
+    </struct>
+
+    <struct name="Type">
+        <field type="ATOM" name="resource_type" />
+        <field type="CARD32" name="count" />
+    </struct>
+
+    <request name="QueryVersion" opcode="0">
+        <field type="CARD8" name="client_major" />
+        <field type="CARD8" name="client_minor" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD16" name="server_major" />
+            <field type="CARD16" name="server_minor" />
+        </reply>
+    </request>
+
+    <request name="QueryClients" opcode="1">
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="num_clients" />
+            <pad bytes="20" />
+            <list type="Client" name="clients">
+                <fieldref>num_clients</fieldref>
+            </list>
+        </reply>
+    </request>
+
+    <request name="QueryClientResources" opcode="2">
+        <field type="CARD32" name="xid" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="num_types" />
+            <pad bytes="20" />
+            <list type="Type" name="types">
+                <fieldref>num_types</fieldref>
+            </list>
+        </reply>
+    </request>
+
+    <request name="QueryClientPixmapBytes" opcode="3">
+        <field type="CARD32" name="xid" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="bytes" />
+            <field type="CARD32" name="bytes_overflow" />
+        </reply>
+    </request>
+</xcb>
diff --git a/libxcb/xcb-proto/src/screensaver.xml b/libxcb/xcb-proto/src/screensaver.xml
index 52af00427..9c7bccb08 100644
--- a/libxcb/xcb-proto/src/screensaver.xml
+++ b/libxcb/xcb-proto/src/screensaver.xml
@@ -1,128 +1,128 @@
-<!--

-

-Copyright (C) 2005 Vincent Torri.

-All Rights Reserved.

-

-Permission is hereby granted, free of charge, to any person ob/Sintaining 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.

--->

-<!--

-Screen Saver Extension to the X Protocol

-Draft Standard Version 1.1

--->

-<xcb header="screensaver" extension-xname="MIT-SCREEN-SAVER" extension-name="ScreenSaver" major-version="1" minor-version="1">

-

-  <!-- Types -->

-

-  <import>xproto</import>

-

-  <enum name="Kind">

-    <item name="Blanked" />

-    <item name="Internal" />

-    <item name="External" />

-  </enum>

-

-  <enum name="Event">

-    <item name="NotifyMask"><bit>0</bit></item>

-    <item name="CycleMask"> <bit>1</bit></item>

-  </enum>

-

-  <enum name="State">

-    <item name="Off" />

-    <item name="On" />

-    <item name="Cycle" />

-    <item name="Disabled" />

-  </enum>

-

-  <!-- Errors -->

-  <!-- Requests -->

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

-    <field type="CARD8" name="client_major_version"/>

-    <field type="CARD8" name="client_minor_version"/>

-    <pad bytes="2"/>

-    <reply>

-      <pad bytes="1"/>

-      <field type="CARD16" name="server_major_version"/>

-      <field type="CARD16" name="server_minor_version"/>

-      <pad bytes="20"/>

-    </reply>

-  </request>

-

-  <request name="QueryInfo" opcode="1">

-    <field type="DRAWABLE" name="drawable"/>

-    <reply>

-      <field type="CARD8" name="state"/>

-      <field type="WINDOW" name="saver_window"/>

-      <field type="CARD32" name="ms_until_server"/>

-      <field type="CARD32" name="ms_since_user_input"/>

-      <field type="CARD32" name="event_mask" />

-      <field type="BYTE" name="kind"/>  <!-- enum Kind -->

-      <pad bytes="7"/>

-    </reply>

-  </request>

-

-  <request name="SelectInput" opcode="2">

-    <field type="DRAWABLE" name="drawable"/>

-    <field type="CARD32" name="event_mask" />   <!-- enum Event -->

-  </request>

-

-  <request name="SetAttributes" opcode="3">

-    <field type="DRAWABLE" name="drawable"/>

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

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

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

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

-    <field type="CARD16" name="border_width"/>

-    <field type="BYTE" name="class"/>   <!-- enum XCBWindowClass -->

-    <field type="CARD8" name="depth"/>

-    <field type="VISUALID" name="visual"/>

-    <valueparam value-mask-type="CARD32"

-                value-mask-name="value_mask"

-                value-list-name="value_list" />

-  </request>

-

-  <request name="UnsetAttributes" opcode="4">

-    <field type="DRAWABLE" name="drawable"/>

-  </request>

-  

-  <!-- version 1.1 -->

-  <request name="Suspend" opcode="5">

-    <field type="BOOL" name="suspend" />

-    <pad bytes="3" />

-  </request>

-

-  <!-- Events -->

-

-  <event name="Notify" number="0">

-    <field type="CARD8" name="code"/>

-    <field type="BYTE" name="state"/>    <!-- enum State -->

-    <pad bytes="1" />

-    <field type="CARD16" name="sequence_number"/>

-    <field type="TIMESTAMP" name="time"/>

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

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

-    <field type="BYTE" name="kind"/>     <!-- enum Kind -->

-    <field type="BOOL" name="forced"/>

-    <pad bytes="14"/>

-  </event>

-

-</xcb>

+<!--
+
+Copyright (C) 2005 Vincent Torri.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person ob/Sintaining 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.
+-->
+<!--
+Screen Saver Extension to the X Protocol
+Draft Standard Version 1.1
+-->
+<xcb header="screensaver" extension-xname="MIT-SCREEN-SAVER" extension-name="ScreenSaver" major-version="1" minor-version="1">
+
+  <!-- Types -->
+
+  <import>xproto</import>
+
+  <enum name="Kind">
+    <item name="Blanked" />
+    <item name="Internal" />
+    <item name="External" />
+  </enum>
+
+  <enum name="Event">
+    <item name="NotifyMask"><bit>0</bit></item>
+    <item name="CycleMask"> <bit>1</bit></item>
+  </enum>
+
+  <enum name="State">
+    <item name="Off" />
+    <item name="On" />
+    <item name="Cycle" />
+    <item name="Disabled" />
+  </enum>
+
+  <!-- Errors -->
+  <!-- Requests -->
+  <request name="QueryVersion" opcode="0">
+    <field type="CARD8" name="client_major_version"/>
+    <field type="CARD8" name="client_minor_version"/>
+    <pad bytes="2"/>
+    <reply>
+      <pad bytes="1"/>
+      <field type="CARD16" name="server_major_version"/>
+      <field type="CARD16" name="server_minor_version"/>
+      <pad bytes="20"/>
+    </reply>
+  </request>
+
+  <request name="QueryInfo" opcode="1">
+    <field type="DRAWABLE" name="drawable"/>
+    <reply>
+      <field type="CARD8" name="state"/>
+      <field type="WINDOW" name="saver_window"/>
+      <field type="CARD32" name="ms_until_server"/>
+      <field type="CARD32" name="ms_since_user_input"/>
+      <field type="CARD32" name="event_mask" />
+      <field type="BYTE" name="kind"/>  <!-- enum Kind -->
+      <pad bytes="7"/>
+    </reply>
+  </request>
+
+  <request name="SelectInput" opcode="2">
+    <field type="DRAWABLE" name="drawable"/>
+    <field type="CARD32" name="event_mask" />   <!-- enum Event -->
+  </request>
+
+  <request name="SetAttributes" opcode="3">
+    <field type="DRAWABLE" name="drawable"/>
+    <field type="INT16" name="x"/>
+    <field type="INT16" name="y"/>
+    <field type="CARD16" name="width"/>
+    <field type="CARD16" name="height"/>
+    <field type="CARD16" name="border_width"/>
+    <field type="BYTE" name="class"/>   <!-- enum XCBWindowClass -->
+    <field type="CARD8" name="depth"/>
+    <field type="VISUALID" name="visual"/>
+    <valueparam value-mask-type="CARD32"
+                value-mask-name="value_mask"
+                value-list-name="value_list" />
+  </request>
+
+  <request name="UnsetAttributes" opcode="4">
+    <field type="DRAWABLE" name="drawable"/>
+  </request>
+  
+  <!-- version 1.1 -->
+  <request name="Suspend" opcode="5">
+    <field type="BOOL" name="suspend" />
+    <pad bytes="3" />
+  </request>
+
+  <!-- Events -->
+
+  <event name="Notify" number="0">
+    <field type="CARD8" name="code"/>
+    <field type="BYTE" name="state"/>    <!-- enum State -->
+    <pad bytes="1" />
+    <field type="CARD16" name="sequence_number"/>
+    <field type="TIMESTAMP" name="time"/>
+    <field type="WINDOW" name="root"/>
+    <field type="WINDOW" name="window"/>
+    <field type="BYTE" name="kind"/>     <!-- enum Kind -->
+    <field type="BOOL" name="forced"/>
+    <pad bytes="14"/>
+  </event>
+
+</xcb>
diff --git a/libxcb/xcb-proto/src/shape.xml b/libxcb/xcb-proto/src/shape.xml
index ce54d3112..c128ade32 100644
--- a/libxcb/xcb-proto/src/shape.xml
+++ b/libxcb/xcb-proto/src/shape.xml
@@ -1,155 +1,155 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.

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

--->

-<!-- This file describes version 1.1 of the Shape extension. -->

-<xcb header="shape" extension-xname="SHAPE" extension-name="Shape" major-version="1" minor-version="1">

-  <import>xproto</import>

-

-  <typedef oldname="CARD8" newname="OP" />

-  <typedef oldname="CARD8" newname="KIND" />

-

-  <!-- Shape attributes of type OP. -->

-  <enum name="SO">

-    <item name="Set" />

-    <item name="Union" />

-    <item name="Intersect" />

-    <item name="Subtract" />

-    <item name="Invert" />

-  </enum>

-

-  <!-- Shape attributes of type KIND. -->

-  <enum name="SK">

-    <item name="Bounding" />

-    <item name="Clip" />

-    <item name="Input" />      <!-- added in version 1.1 -->

-  </enum>

-

-  <event name="Notify" number="0">

-    <field type="KIND" name="shape_kind" enum="SK" />

-    <field type="WINDOW" name="affected_window" />

-    <field type="INT16" name="extents_x" />

-    <field type="INT16" name="extents_y" />

-    <field type="CARD16" name="extents_width" />

-    <field type="CARD16" name="extents_height" />

-    <field type="TIMESTAMP" name="server_time" />

-    <field type="BOOL" name="shaped" />

-    <pad bytes="11" />

-  </event>

-

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

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD16" name="major_version" />

-      <field type="CARD16" name="minor_version" />

-    </reply>

-  </request>

-

-  <request name="Rectangles" opcode="1">

-    <field type="OP" name="operation" enum="SO" />

-    <field type="KIND" name="destination_kind" enum="SK" />

-    <field type="BYTE" name="ordering" enum="ClipOrdering" />

-    <pad bytes="1" />

-    <field type="WINDOW" name="destination_window" />

-    <field type="INT16" name="x_offset" />

-    <field type="INT16" name="y_offset" />

-    <list type="RECTANGLE" name="rectangles" />

-  </request>

-

-  <request name="Mask" opcode="2">

-    <field type="OP" name="operation" enum="SO" />

-    <field type="KIND" name="destination_kind" enum="SK" />

-    <pad bytes="2" />

-    <field type="WINDOW" name="destination_window" />

-    <field type="INT16" name="x_offset" />

-    <field type="INT16" name="y_offset" />

-    <field type="PIXMAP" name="source_bitmap" altenum="Pixmap" />

-  </request>

-

-  <request name="Combine" opcode="3">

-    <field type="OP" name="operation" enum="SO" />

-    <field type="KIND" name="destination_kind" enum="SK" />

-    <field type="KIND" name="source_kind" enum="SK" />

-    <pad bytes="1" />

-    <field type="WINDOW" name="destination_window" />

-    <field type="INT16" name="x_offset" />

-    <field type="INT16" name="y_offset" />

-    <field type="WINDOW" name="source_window" />

-  </request>

-

-  <request name="Offset" opcode="4">

-    <field type="KIND" name="destination_kind" enum="SK" />

-    <pad bytes="3" />

-    <field type="WINDOW" name="destination_window" />

-    <field type="INT16" name="x_offset" />

-    <field type="INT16" name="y_offset" />

-  </request>

-

-  <request name="QueryExtents" opcode="5">

-    <field type="WINDOW" name="destination_window" />

-    <reply>

-      <pad bytes="1" />

-      <field type="BOOL" name="bounding_shaped" />

-      <field type="BOOL" name="clip_shaped" />

-      <pad bytes="2" />

-      <field type="INT16" name="bounding_shape_extents_x" />

-      <field type="INT16" name="bounding_shape_extents_y" />

-      <field type="CARD16" name="bounding_shape_extents_width" />

-      <field type="CARD16" name="bounding_shape_extents_height" />

-      <field type="INT16" name="clip_shape_extents_x" />

-      <field type="INT16" name="clip_shape_extents_y" />

-      <field type="CARD16" name="clip_shape_extents_width" />

-      <field type="CARD16" name="clip_shape_extents_height" />

-    </reply>

-  </request>

-

-  <request name="SelectInput" opcode="6">

-    <field type="WINDOW" name="destination_window" />

-    <field type="BOOL" name="enable" />

-    <pad bytes="3" />

-  </request>

-

-  <request name="InputSelected" opcode="7">

-    <field type="WINDOW" name="destination_window" />

-    <reply>

-      <field type="BOOL" name="enabled" />

-    </reply>

-  </request>

-

-  <request name="GetRectangles" opcode="8">

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

-    <field type="KIND" name="source_kind" enum="SK" />

-    <pad bytes="3" />

-    <reply>

-      <field type="BYTE" name="ordering" enum="ClipOrdering" />

-      <field type="CARD32" name="rectangles_len" />

-      <pad bytes="20" />

-      <list type="RECTANGLE" name="rectangles">

-        <fieldref>rectangles_len</fieldref>

-      </list>

-    </reply>

-  </request>

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
+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.
+-->
+<!-- This file describes version 1.1 of the Shape extension. -->
+<xcb header="shape" extension-xname="SHAPE" extension-name="Shape" major-version="1" minor-version="1">
+  <import>xproto</import>
+
+  <typedef oldname="CARD8" newname="OP" />
+  <typedef oldname="CARD8" newname="KIND" />
+
+  <!-- Shape attributes of type OP. -->
+  <enum name="SO">
+    <item name="Set" />
+    <item name="Union" />
+    <item name="Intersect" />
+    <item name="Subtract" />
+    <item name="Invert" />
+  </enum>
+
+  <!-- Shape attributes of type KIND. -->
+  <enum name="SK">
+    <item name="Bounding" />
+    <item name="Clip" />
+    <item name="Input" />      <!-- added in version 1.1 -->
+  </enum>
+
+  <event name="Notify" number="0">
+    <field type="KIND" name="shape_kind" enum="SK" />
+    <field type="WINDOW" name="affected_window" />
+    <field type="INT16" name="extents_x" />
+    <field type="INT16" name="extents_y" />
+    <field type="CARD16" name="extents_width" />
+    <field type="CARD16" name="extents_height" />
+    <field type="TIMESTAMP" name="server_time" />
+    <field type="BOOL" name="shaped" />
+    <pad bytes="11" />
+  </event>
+
+  <request name="QueryVersion" opcode="0">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="major_version" />
+      <field type="CARD16" name="minor_version" />
+    </reply>
+  </request>
+
+  <request name="Rectangles" opcode="1">
+    <field type="OP" name="operation" enum="SO" />
+    <field type="KIND" name="destination_kind" enum="SK" />
+    <field type="BYTE" name="ordering" enum="ClipOrdering" />
+    <pad bytes="1" />
+    <field type="WINDOW" name="destination_window" />
+    <field type="INT16" name="x_offset" />
+    <field type="INT16" name="y_offset" />
+    <list type="RECTANGLE" name="rectangles" />
+  </request>
+
+  <request name="Mask" opcode="2">
+    <field type="OP" name="operation" enum="SO" />
+    <field type="KIND" name="destination_kind" enum="SK" />
+    <pad bytes="2" />
+    <field type="WINDOW" name="destination_window" />
+    <field type="INT16" name="x_offset" />
+    <field type="INT16" name="y_offset" />
+    <field type="PIXMAP" name="source_bitmap" altenum="Pixmap" />
+  </request>
+
+  <request name="Combine" opcode="3">
+    <field type="OP" name="operation" enum="SO" />
+    <field type="KIND" name="destination_kind" enum="SK" />
+    <field type="KIND" name="source_kind" enum="SK" />
+    <pad bytes="1" />
+    <field type="WINDOW" name="destination_window" />
+    <field type="INT16" name="x_offset" />
+    <field type="INT16" name="y_offset" />
+    <field type="WINDOW" name="source_window" />
+  </request>
+
+  <request name="Offset" opcode="4">
+    <field type="KIND" name="destination_kind" enum="SK" />
+    <pad bytes="3" />
+    <field type="WINDOW" name="destination_window" />
+    <field type="INT16" name="x_offset" />
+    <field type="INT16" name="y_offset" />
+  </request>
+
+  <request name="QueryExtents" opcode="5">
+    <field type="WINDOW" name="destination_window" />
+    <reply>
+      <pad bytes="1" />
+      <field type="BOOL" name="bounding_shaped" />
+      <field type="BOOL" name="clip_shaped" />
+      <pad bytes="2" />
+      <field type="INT16" name="bounding_shape_extents_x" />
+      <field type="INT16" name="bounding_shape_extents_y" />
+      <field type="CARD16" name="bounding_shape_extents_width" />
+      <field type="CARD16" name="bounding_shape_extents_height" />
+      <field type="INT16" name="clip_shape_extents_x" />
+      <field type="INT16" name="clip_shape_extents_y" />
+      <field type="CARD16" name="clip_shape_extents_width" />
+      <field type="CARD16" name="clip_shape_extents_height" />
+    </reply>
+  </request>
+
+  <request name="SelectInput" opcode="6">
+    <field type="WINDOW" name="destination_window" />
+    <field type="BOOL" name="enable" />
+    <pad bytes="3" />
+  </request>
+
+  <request name="InputSelected" opcode="7">
+    <field type="WINDOW" name="destination_window" />
+    <reply>
+      <field type="BOOL" name="enabled" />
+    </reply>
+  </request>
+
+  <request name="GetRectangles" opcode="8">
+    <field type="WINDOW" name="window" />
+    <field type="KIND" name="source_kind" enum="SK" />
+    <pad bytes="3" />
+    <reply>
+      <field type="BYTE" name="ordering" enum="ClipOrdering" />
+      <field type="CARD32" name="rectangles_len" />
+      <pad bytes="20" />
+      <list type="RECTANGLE" name="rectangles">
+        <fieldref>rectangles_len</fieldref>
+      </list>
+    </reply>
+  </request>
+</xcb>
diff --git a/libxcb/xcb-proto/src/shm.xml b/libxcb/xcb-proto/src/shm.xml
index e2f575f10..adda50957 100644
--- a/libxcb/xcb-proto/src/shm.xml
+++ b/libxcb/xcb-proto/src/shm.xml
@@ -1,116 +1,116 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.

-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="shm" extension-xname="MIT-SHM" extension-name="Shm"

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

-  <import>xproto</import>

-

-  <xidtype name="SEG" />

-

-  <event name="Completion" number="0">

-    <pad bytes="1" />

-    <field type="DRAWABLE" name="drawable" />

-    <field type="CARD16" name="minor_event" />

-    <field type="BYTE" name="major_event" />

-    <pad bytes="1" />

-    <field type="SEG" name="shmseg" />

-    <field type="CARD32" name="offset" />

-  </event>

-

-  <errorcopy name="BadSeg" number="0" ref="Value" />

-

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

-    <reply>

-      <field type="BOOL" name="shared_pixmaps" />

-      <field type="CARD16" name="major_version" />

-      <field type="CARD16" name="minor_version" />

-      <field type="CARD16" name="uid" />

-      <field type="CARD16" name="gid" />

-      <field type="CARD8" name="pixmap_format" />

-      <pad bytes="15" />

-    </reply>

-  </request>

-

-  <request name="Attach" opcode="1">

-    <field type="SEG" name="shmseg" />

-    <field type="CARD32" name="shmid" />

-    <field type="BOOL" name="read_only" />

-    <pad bytes="3" />

-  </request>

-

-  <request name="Detach" opcode="2">

-    <field type="SEG" name="shmseg" />

-  </request>

-

-  <request name="PutImage" opcode="3">

-    <field type="DRAWABLE" name="drawable" />

-    <field type="GCONTEXT" name="gc" />

-    <field type="CARD16" name="total_width" />

-    <field type="CARD16" name="total_height" />

-    <field type="CARD16" name="src_x" />

-    <field type="CARD16" name="src_y" />

-    <field type="CARD16" name="src_width" />

-    <field type="CARD16" name="src_height" />

-    <field type="INT16" name="dst_x" />

-    <field type="INT16" name="dst_y" />

-    <field type="CARD8" name="depth" />

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

-    <field type="CARD8" name="send_event" />

-    <pad bytes="1" />

-    <field type="SEG" name="shmseg" />

-    <field type="CARD32" name="offset" />

-  </request>

-

-  <request name="GetImage" opcode="4">

-    <field type="DRAWABLE" name="drawable" />

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

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

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

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

-    <field type="CARD32" name="plane_mask" />

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

-    <pad bytes="3" />

-    <field type="SEG" name="shmseg" />

-    <field type="CARD32" name="offset" />

-    <reply>

-      <field type="CARD8" name="depth" />

-      <field type="VISUALID" name="visual" />

-      <field type="CARD32" name="size" />

-    </reply>

-  </request>

-

-  <request name="CreatePixmap" opcode="5">

-    <field type="PIXMAP" name="pid" />

-    <field type="DRAWABLE" name="drawable" />

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

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

-    <field type="CARD8" name="depth" />

-    <pad bytes="3" />

-    <field type="SEG" name="shmseg" />

-    <field type="CARD32" name="offset" />

-  </request>

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
+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="shm" extension-xname="MIT-SHM" extension-name="Shm"
+    major-version="1" minor-version="1">
+  <import>xproto</import>
+
+  <xidtype name="SEG" />
+
+  <event name="Completion" number="0">
+    <pad bytes="1" />
+    <field type="DRAWABLE" name="drawable" />
+    <field type="CARD16" name="minor_event" />
+    <field type="BYTE" name="major_event" />
+    <pad bytes="1" />
+    <field type="SEG" name="shmseg" />
+    <field type="CARD32" name="offset" />
+  </event>
+
+  <errorcopy name="BadSeg" number="0" ref="Value" />
+
+  <request name="QueryVersion" opcode="0">
+    <reply>
+      <field type="BOOL" name="shared_pixmaps" />
+      <field type="CARD16" name="major_version" />
+      <field type="CARD16" name="minor_version" />
+      <field type="CARD16" name="uid" />
+      <field type="CARD16" name="gid" />
+      <field type="CARD8" name="pixmap_format" />
+      <pad bytes="15" />
+    </reply>
+  </request>
+
+  <request name="Attach" opcode="1">
+    <field type="SEG" name="shmseg" />
+    <field type="CARD32" name="shmid" />
+    <field type="BOOL" name="read_only" />
+    <pad bytes="3" />
+  </request>
+
+  <request name="Detach" opcode="2">
+    <field type="SEG" name="shmseg" />
+  </request>
+
+  <request name="PutImage" opcode="3">
+    <field type="DRAWABLE" name="drawable" />
+    <field type="GCONTEXT" name="gc" />
+    <field type="CARD16" name="total_width" />
+    <field type="CARD16" name="total_height" />
+    <field type="CARD16" name="src_x" />
+    <field type="CARD16" name="src_y" />
+    <field type="CARD16" name="src_width" />
+    <field type="CARD16" name="src_height" />
+    <field type="INT16" name="dst_x" />
+    <field type="INT16" name="dst_y" />
+    <field type="CARD8" name="depth" />
+    <field type="CARD8" name="format" />
+    <field type="CARD8" name="send_event" />
+    <pad bytes="1" />
+    <field type="SEG" name="shmseg" />
+    <field type="CARD32" name="offset" />
+  </request>
+
+  <request name="GetImage" opcode="4">
+    <field type="DRAWABLE" name="drawable" />
+    <field type="INT16" name="x" />
+    <field type="INT16" name="y" />
+    <field type="CARD16" name="width" />
+    <field type="CARD16" name="height" />
+    <field type="CARD32" name="plane_mask" />
+    <field type="CARD8" name="format" />
+    <pad bytes="3" />
+    <field type="SEG" name="shmseg" />
+    <field type="CARD32" name="offset" />
+    <reply>
+      <field type="CARD8" name="depth" />
+      <field type="VISUALID" name="visual" />
+      <field type="CARD32" name="size" />
+    </reply>
+  </request>
+
+  <request name="CreatePixmap" opcode="5">
+    <field type="PIXMAP" name="pid" />
+    <field type="DRAWABLE" name="drawable" />
+    <field type="CARD16" name="width" />
+    <field type="CARD16" name="height" />
+    <field type="CARD8" name="depth" />
+    <pad bytes="3" />
+    <field type="SEG" name="shmseg" />
+    <field type="CARD32" name="offset" />
+  </request>
+</xcb>
diff --git a/libxcb/xcb-proto/src/xc_misc.xml b/libxcb/xcb-proto/src/xc_misc.xml
index b9b21ca48..139ca22f0 100644
--- a/libxcb/xcb-proto/src/xc_misc.xml
+++ b/libxcb/xcb-proto/src/xc_misc.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2004 Mikko Torni and Josh Triplett.

-All Rights Reserved.  See the file COPYING in this directory

-for licensing information.

--->

-<xcb header="xc_misc" extension-xname="XC-MISC" extension-name="XCMisc"

-    extension-multiword="true" major-version="1" minor-version="1">

-  <request name="GetVersion" opcode="0">

-    <field type="CARD16" name="client_major_version" />

-    <field type="CARD16" name="client_minor_version" />

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD16" name="server_major_version" />

-      <field type="CARD16" name="server_minor_version" />

-    </reply>

-  </request>

-

-  <request name="GetXIDRange" opcode="1">

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="start_id" />

-      <field type="CARD32" name="count" />

-    </reply>

-  </request>

-

-  <request name="GetXIDList" opcode="2">

-    <field type="CARD32" name="count" />

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="ids_len" />

-      <pad bytes="20" />

-      <list type="CARD32" name="ids">

-        <fieldref>ids_len</fieldref>

-      </list>

-    </reply>

-  </request>

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004 Mikko Torni and Josh Triplett.
+All Rights Reserved.  See the file COPYING in this directory
+for licensing information.
+-->
+<xcb header="xc_misc" extension-xname="XC-MISC" extension-name="XCMisc"
+    extension-multiword="true" major-version="1" minor-version="1">
+  <request name="GetVersion" opcode="0">
+    <field type="CARD16" name="client_major_version" />
+    <field type="CARD16" name="client_minor_version" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="server_major_version" />
+      <field type="CARD16" name="server_minor_version" />
+    </reply>
+  </request>
+
+  <request name="GetXIDRange" opcode="1">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="start_id" />
+      <field type="CARD32" name="count" />
+    </reply>
+  </request>
+
+  <request name="GetXIDList" opcode="2">
+    <field type="CARD32" name="count" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="ids_len" />
+      <pad bytes="20" />
+      <list type="CARD32" name="ids">
+        <fieldref>ids_len</fieldref>
+      </list>
+    </reply>
+  </request>
+</xcb>
diff --git a/libxcb/xcb-proto/src/xevie.xml b/libxcb/xcb-proto/src/xevie.xml
index a88f1590b..222b412e4 100644
--- a/libxcb/xcb-proto/src/xevie.xml
+++ b/libxcb/xcb-proto/src/xevie.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2004 Josh Triplett.  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.

--->

-<!-- This file describes version 1 of XEVIE. -->

-<xcb header="xevie" extension-xname="XEVIE" extension-name="Xevie"

-    major-version="1" minor-version="0">

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

-    <field type="CARD16" name="client_major_version" />

-    <field type="CARD16" name="client_minor_version" />

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD16" name="server_major_version" />

-      <field type="CARD16" name="server_minor_version" />

-      <pad bytes="20" />

-    </reply>

-  </request>

-

-  <request name="Start" opcode="1">

-    <field type="CARD32" name="screen" />

-    <reply>

-      <pad bytes="1" />

-      <pad bytes="24" />

-    </reply>

-  </request>

-

-  <request name="End" opcode="2">

-    <field type="CARD32" name="cmap" />

-    <reply>

-      <pad bytes="1" />

-      <pad bytes="24" />

-    </reply>

-  </request>

-

-  <enum name="Datatype">

-    <item name="Unmodified" />

-    <item name="Modified" />

-  </enum>

-

-  <!-- The Send request needs to send an arbitrary Event; this type is used

-       to reserve the necessary structure size. -->

-  <struct name="Event">

-    <pad bytes="32" />

-  </struct>

-

-  <request name="Send" opcode="3">

-    <field type="Event" name="event" />

-    <field type="CARD32" name="data_type" /> <!-- Datatype -->

-    <pad bytes="64" />

-    <reply>

-      <pad bytes="1" />

-      <pad bytes="24" />

-    </reply>

-  </request>

-

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

-    <field type="CARD32" name="event_mask" />

-    <reply>

-      <pad bytes="1" />

-      <pad bytes="24" />

-    </reply>

-  </request>

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004 Josh Triplett.  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.
+-->
+<!-- This file describes version 1 of XEVIE. -->
+<xcb header="xevie" extension-xname="XEVIE" extension-name="Xevie"
+    major-version="1" minor-version="0">
+  <request name="QueryVersion" opcode="0">
+    <field type="CARD16" name="client_major_version" />
+    <field type="CARD16" name="client_minor_version" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="server_major_version" />
+      <field type="CARD16" name="server_minor_version" />
+      <pad bytes="20" />
+    </reply>
+  </request>
+
+  <request name="Start" opcode="1">
+    <field type="CARD32" name="screen" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="24" />
+    </reply>
+  </request>
+
+  <request name="End" opcode="2">
+    <field type="CARD32" name="cmap" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="24" />
+    </reply>
+  </request>
+
+  <enum name="Datatype">
+    <item name="Unmodified" />
+    <item name="Modified" />
+  </enum>
+
+  <!-- The Send request needs to send an arbitrary Event; this type is used
+       to reserve the necessary structure size. -->
+  <struct name="Event">
+    <pad bytes="32" />
+  </struct>
+
+  <request name="Send" opcode="3">
+    <field type="Event" name="event" />
+    <field type="CARD32" name="data_type" /> <!-- Datatype -->
+    <pad bytes="64" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="24" />
+    </reply>
+  </request>
+
+  <request name="SelectInput" opcode="4">
+    <field type="CARD32" name="event_mask" />
+    <reply>
+      <pad bytes="1" />
+      <pad bytes="24" />
+    </reply>
+  </request>
+</xcb>
diff --git a/libxcb/xcb-proto/src/xf86dri.xml b/libxcb/xcb-proto/src/xf86dri.xml
index 003728dd8..5bfc5727a 100644
--- a/libxcb/xcb-proto/src/xf86dri.xml
+++ b/libxcb/xcb-proto/src/xf86dri.xml
@@ -1,172 +1,172 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2005 Jeremy Kolb.

-All Rights Reserved.

-

-Permission is hereby granted, free of charge, to any person ob/Sintaining 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="xf86dri" extension-xname="XFree86-DRI" extension-name="XF86Dri"

-    major-version="4" minor-version="1">

-

-    <!-- Using http://dri.sourceforge.net/doc/dri_extensions_low_level.txt -->

-

-    <!-- Types -->

-

-    <struct name="DrmClipRect">

-	<field type="INT16" name="x1" />

-	<field type="INT16" name="y1" />

-	<field type="INT16" name="x2" />

-	<field type="INT16" name="x3" />

-    </struct>

-	

-    <!-- Requests -->

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

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD16" name="dri_major_version" />

-	    <field type="CARD16" name="dri_minor_version" />

-	    <field type="CARD32" name="dri_minor_patch" />

-	</reply>

-    </request>

-

-    <request name="QueryDirectRenderingCapable" opcode="1">

-	<field type="CARD32" name="screen" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="BOOL" name="is_capable" />

-	</reply>

-    </request>

-

-    <request name="OpenConnection" opcode="2">

-	<field type="CARD32" name="screen" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="sarea_handle_low" />

-	    <field type="CARD32" name="sarea_handle_high" />

-	    <field type="CARD32" name="bus_id_len" />

-	    <pad bytes="12" />

-	    <list type="char" name="bus_id">

-		<fieldref>bus_id_len</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <request name="CloseConnection" opcode="3">

-	<field type="CARD32" name="screen" />

-    </request>

-

-    <request name="GetClientDriverName" opcode="4">

-	<field type="CARD32" name="screen" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="client_driver_major_version" />

-	    <field type="CARD32" name="client_driver_minor_version" />

-	    <field type="CARD32" name="client_driver_patch_version" />

-	    <field type="CARD32" name="client_driver_name_len" />

-	    <pad bytes="8" />

-	    <list type="char" name="client_driver_name">

-		<fieldref>client_driver_name_len</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <request name="CreateContext" opcode="5">

-	<field type="CARD32" name="screen" />

-	<field type="CARD32" name="visual" />

-	<field type="CARD32" name="context" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="hw_context" />

-	</reply>

-    </request>

-

-    <request name="DestroyContext" opcode="6">

-	<field type="CARD32" name="screen" />

-	<field type="CARD32" name="context" />

-    </request>

-

-    <request name="CreateDrawable" opcode="7">

-	<field type="CARD32" name="screen" />

-	<field type="CARD32" name="drawable" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="hw_drawable_handle" />

-	</reply>

-    </request>

-

-    <request name="DestroyDrawable" opcode="8">

-	<field type="CARD32" name="screen" />

-	<field type="CARD32" name="drawable" />

-    </request>

-

-    <request name="GetDrawableInfo" opcode="9">

-	<field type="CARD32" name="screen" />

-	<field type="CARD32" name="drawable" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="drawable_table_index" />

-	    <field type="CARD32" name="drawable_table_stamp" />

-	    <field type="INT16" name="drawable_origin_X" />

-	    <field type="INT16" name="drawable_origin_Y" />

-	    <field type="INT16" name="drawable_size_W" />

-	    <field type="INT16" name="drawable_size_H" />

-	    <field type="CARD32" name="num_clip_rects" />

-	    <field type="INT16" name="back_x" />

-	    <field type="INT16" name="back_y" />

-	    <field type="CARD32" name="num_back_clip_rects" />

-	    <list type="DrmClipRect" name="clip_rects">

-		<fieldref>num_clip_rects</fieldref>

-	    </list>

-	    <list type="DrmClipRect" name="back_clip_rects">

-		<fieldref>num_back_clip_rects</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <request name="GetDeviceInfo" opcode="10">

-	<field type="CARD32" name="screen" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="framebuffer_handle_low" />

-	    <field type="CARD32" name="framebuffer_handle_high" />

-	    <field type="CARD32" name="framebuffer_origin_offset" />

-	    <field type="CARD32" name="framebuffer_size" />

-	    <field type="CARD32" name="framebuffer_stride" />

-	    <field type="CARD32" name="device_private_size" />

-	    <list type="CARD32" name="device_private">

-		<fieldref>device_private_size</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <!-- Not in this doc, but specified in Mesa/src/glx/x11/xf86dri.h -->

-    <request name="AuthConnection" opcode="11">

-	<field type="CARD32" name="screen" />

-	<field type="CARD32" name="magic" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="authenticated" />

-	</reply>

-    </request>	    

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2005 Jeremy Kolb.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person ob/Sintaining 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="xf86dri" extension-xname="XFree86-DRI" extension-name="XF86Dri"
+    major-version="4" minor-version="1">
+
+    <!-- Using http://dri.sourceforge.net/doc/dri_extensions_low_level.txt -->
+
+    <!-- Types -->
+
+    <struct name="DrmClipRect">
+	<field type="INT16" name="x1" />
+	<field type="INT16" name="y1" />
+	<field type="INT16" name="x2" />
+	<field type="INT16" name="x3" />
+    </struct>
+	
+    <!-- Requests -->
+    <request name="QueryVersion" opcode="0">
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD16" name="dri_major_version" />
+	    <field type="CARD16" name="dri_minor_version" />
+	    <field type="CARD32" name="dri_minor_patch" />
+	</reply>
+    </request>
+
+    <request name="QueryDirectRenderingCapable" opcode="1">
+	<field type="CARD32" name="screen" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="BOOL" name="is_capable" />
+	</reply>
+    </request>
+
+    <request name="OpenConnection" opcode="2">
+	<field type="CARD32" name="screen" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="sarea_handle_low" />
+	    <field type="CARD32" name="sarea_handle_high" />
+	    <field type="CARD32" name="bus_id_len" />
+	    <pad bytes="12" />
+	    <list type="char" name="bus_id">
+		<fieldref>bus_id_len</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <request name="CloseConnection" opcode="3">
+	<field type="CARD32" name="screen" />
+    </request>
+
+    <request name="GetClientDriverName" opcode="4">
+	<field type="CARD32" name="screen" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="client_driver_major_version" />
+	    <field type="CARD32" name="client_driver_minor_version" />
+	    <field type="CARD32" name="client_driver_patch_version" />
+	    <field type="CARD32" name="client_driver_name_len" />
+	    <pad bytes="8" />
+	    <list type="char" name="client_driver_name">
+		<fieldref>client_driver_name_len</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <request name="CreateContext" opcode="5">
+	<field type="CARD32" name="screen" />
+	<field type="CARD32" name="visual" />
+	<field type="CARD32" name="context" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="hw_context" />
+	</reply>
+    </request>
+
+    <request name="DestroyContext" opcode="6">
+	<field type="CARD32" name="screen" />
+	<field type="CARD32" name="context" />
+    </request>
+
+    <request name="CreateDrawable" opcode="7">
+	<field type="CARD32" name="screen" />
+	<field type="CARD32" name="drawable" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="hw_drawable_handle" />
+	</reply>
+    </request>
+
+    <request name="DestroyDrawable" opcode="8">
+	<field type="CARD32" name="screen" />
+	<field type="CARD32" name="drawable" />
+    </request>
+
+    <request name="GetDrawableInfo" opcode="9">
+	<field type="CARD32" name="screen" />
+	<field type="CARD32" name="drawable" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="drawable_table_index" />
+	    <field type="CARD32" name="drawable_table_stamp" />
+	    <field type="INT16" name="drawable_origin_X" />
+	    <field type="INT16" name="drawable_origin_Y" />
+	    <field type="INT16" name="drawable_size_W" />
+	    <field type="INT16" name="drawable_size_H" />
+	    <field type="CARD32" name="num_clip_rects" />
+	    <field type="INT16" name="back_x" />
+	    <field type="INT16" name="back_y" />
+	    <field type="CARD32" name="num_back_clip_rects" />
+	    <list type="DrmClipRect" name="clip_rects">
+		<fieldref>num_clip_rects</fieldref>
+	    </list>
+	    <list type="DrmClipRect" name="back_clip_rects">
+		<fieldref>num_back_clip_rects</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <request name="GetDeviceInfo" opcode="10">
+	<field type="CARD32" name="screen" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="framebuffer_handle_low" />
+	    <field type="CARD32" name="framebuffer_handle_high" />
+	    <field type="CARD32" name="framebuffer_origin_offset" />
+	    <field type="CARD32" name="framebuffer_size" />
+	    <field type="CARD32" name="framebuffer_stride" />
+	    <field type="CARD32" name="device_private_size" />
+	    <list type="CARD32" name="device_private">
+		<fieldref>device_private_size</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <!-- Not in this doc, but specified in Mesa/src/glx/x11/xf86dri.h -->
+    <request name="AuthConnection" opcode="11">
+	<field type="CARD32" name="screen" />
+	<field type="CARD32" name="magic" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="authenticated" />
+	</reply>
+    </request>	    
+</xcb>
diff --git a/libxcb/xcb-proto/src/xf86vidmode.xml b/libxcb/xcb-proto/src/xf86vidmode.xml
index 4a193f58d..9dacaef41 100644
--- a/libxcb/xcb-proto/src/xf86vidmode.xml
+++ b/libxcb/xcb-proto/src/xf86vidmode.xml
@@ -1,478 +1,478 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2009 Open Text Corporation.  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="xf86vidmode" extension-xname="XFree86-VidModeExtension" extension-name="XF86VidMode"

-    major-version="2" minor-version="2">

-

-    <!-- In places where there are multiple versions of the protocol, this

-	 describes version 2.2. If you do not call xcb_xf86vidmode_set_client_version()

-	 then some requests may fail and some replies may not be what you expect. -->

-

-    <typedef oldname="CARD32" newname="SYNCRANGE" />  <!-- Min and Max fixed-decimal-point values -->

-    <typedef oldname="CARD32" newname="DOTCLOCK" />   <!-- A single fixed-decimal-point value -->

-

-    <enum name="ModeFlag">

-	<item name="Positive_HSync">	<bit>0</bit></item>

-	<item name="Negative_HSync">	<bit>1</bit></item>

-	<item name="Positive_VSync">	<bit>2</bit></item>

-	<item name="Negative_VSync">	<bit>3</bit></item>

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

-	<item name="Composite_Sync">	<bit>5</bit></item>

-	<item name="Positive_CSync">	<bit>6</bit></item>

-	<item name="Negative_CSync">	<bit>7</bit></item>

-	<item name="HSkew">		<bit>8</bit></item>

-	<item name="Broadcast">		<bit>9</bit></item>

-	<item name="Pixmux">		<bit>10</bit></item>

-	<item name="Double_Clock">	<bit>11</bit></item>

-	<item name="Half_Clock">	<bit>12</bit></item>

-    </enum>

-

-    <enum name="ClockFlag">

-	<item name="Programable">	<bit>0</bit></item>

-    </enum>

-

-    <enum name="Permission">

-	<item name="Read">		<bit>0</bit></item>

-	<item name="Write">		<bit>1</bit></item>

-    </enum>

-

-    <struct name="ModeInfo">

-	<field type="DOTCLOCK" name="dotclock" />

-	<field type="CARD16" name= "hdisplay" />

-	<field type="CARD16" name= "hsyncstart" />

-	<field type="CARD16" name= "hsyncend" />

-	<field type="CARD16" name= "htotal" />

-	<field type="CARD32" name= "hskew" />

-	<field type="CARD16" name= "vdisplay" />

-	<field type="CARD16" name= "vsyncstart" />

-	<field type="CARD16" name= "vsyncend" />

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

-	<pad bytes="4" />

-	<field type="CARD32" name="flags" mask="ModeFlag" />

-	<pad bytes="12" />

-	<field type="CARD32" name="privsize" />

-    </struct>

-

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

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD16" name="major_version" />

-	    <field type="CARD16" name="minor_version" />

-	</reply>

-    </request>

-

-    <request name="GetModeLine" opcode="1">

-	<field type="CARD16" name="screen" />

-	<pad bytes="2" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="DOTCLOCK" name="dotclock" />

-	    <field type="CARD16" name= "hdisplay" />

-	    <field type="CARD16" name= "hsyncstart" />

-	    <field type="CARD16" name= "hsyncend" />

-	    <field type="CARD16" name= "htotal" />

-	    <field type="CARD16" name= "hskew" />

-	    <field type="CARD16" name= "vdisplay" />

-	    <field type="CARD16" name= "vsyncstart" />

-	    <field type="CARD16" name= "vsyncend" />

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

-	    <pad bytes="2" />

-	    <field type="CARD32" name="flags" mask="ModeFlag" />

-	    <pad bytes="12" />

-	    <field type="CARD32" name="privsize" />

-	    <list type="CARD8" name="private">

-		<fieldref>privsize</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <request name="ModModeLine" opcode="2">

-	<field type="CARD32" name="screen" />

-	<field type="CARD16" name= "hdisplay" />

-	<field type="CARD16" name= "hsyncstart" />

-	<field type="CARD16" name= "hsyncend" />

-	<field type="CARD16" name= "htotal" />

-	<field type="CARD16" name= "hskew" />

-	<field type="CARD16" name= "vdisplay" />

-	<field type="CARD16" name= "vsyncstart" />

-	<field type="CARD16" name= "vsyncend" />

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

-	<pad bytes="2" />

-	<field type="CARD32" name="flags" mask="ModeFlag" />

-	<pad bytes="12" />

-	<field type="CARD32" name="privsize" />

-	<list type="CARD8" name="private">

-	    <fieldref>privsize</fieldref>

-	</list>

-    </request>

-

-    <request name="SwitchMode" opcode="3">

-	<field type="CARD16" name="screen" />

-	<field type="CARD16" name="zoom" />

-    </request>

-

-    <request name="GetMonitor" opcode="4">

-	<field type="CARD16" name="screen" />

-	<pad bytes="2" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="vendor_length" />

-	    <field type="CARD8" name="model_length" />

-	    <field type="CARD8" name="num_hsync" />

-	    <field type="CARD8" name="num_vsync" />

-	    <pad bytes="20" />

-	    <list type="SYNCRANGE" name="hsync">

-		<fieldref>num_hsync</fieldref>

-	    </list>

-	    <list type="SYNCRANGE" name="vsync">

-		<fieldref>num_vsync</fieldref>

-	    </list>

-	    <list type="char" name="vendor">

-		<fieldref>vendor_length</fieldref>

-	    </list>

-	    <list type="void" name="alignment_pad">

-		<op op="-">

-		    <op op="&amp;">

-			<op op="+">

-			    <fieldref>vendor_length</fieldref>

-			    <value> 3 </value>

-			</op>

-			<unop op="~">

-			    <value>3</value>

-			</unop>

-		    </op>

-		    <fieldref>vendor_length</fieldref>

-		</op>

-	    </list>

-	    <list type="char" name="model">

-		<fieldref>model_length</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <request name="LockModeSwitch" opcode="5">

-	<field type="CARD16" name="screen" />

-	<field type="CARD16" name="lock" />

-    </request>

-

-    <request name="GetAllModeLines" opcode="6">

-	<field type="CARD16" name="screen" />

-	<pad bytes="2" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="modecount" />

-	    <pad bytes="20" />

-	    <list type="ModeInfo" name="modeinfo">

-		<fieldref>modecount</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <request name="AddModeLine" opcode="7">

-	<field type="CARD32" name="screen" />

-	<field type="DOTCLOCK" name="dotclock" />

-	<field type="CARD16" name= "hdisplay" />

-	<field type="CARD16" name= "hsyncstart" />

-	<field type="CARD16" name= "hsyncend" />

-	<field type="CARD16" name= "htotal" />

-	<field type="CARD16" name= "hskew" />

-	<field type="CARD16" name= "vdisplay" />

-	<field type="CARD16" name= "vsyncstart" />

-	<field type="CARD16" name= "vsyncend" />

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

-	<pad bytes="2" />

-	<field type="CARD32" name="flags" mask="ModeFlag" />

-	<pad bytes="12" />

-	<field type="CARD32" name="privsize" />

-	<field type="DOTCLOCK" name="after_dotclock" />

-	<field type="CARD16" name= "after_hdisplay" />

-	<field type="CARD16" name= "after_hsyncstart" />

-	<field type="CARD16" name= "after_hsyncend" />

-	<field type="CARD16" name= "after_htotal" />

-	<field type="CARD16" name= "after_hskew" />

-	<field type="CARD16" name= "after_vdisplay" />

-	<field type="CARD16" name= "after_vsyncstart" />

-	<field type="CARD16" name= "after_vsyncend" />

-	<field type="CARD16" name= "after_vtotal" />

-	<pad bytes="2" />

-	<field type="CARD32" name="after_flags" mask="ModeFlag" />

-	<pad bytes="12" />

-	<list type="CARD8" name="private">

-	    <fieldref>privsize</fieldref>

-	</list>

-    </request>

-

-    <request name="DeleteModeLine" opcode="8">

-	<field type="CARD32" name="screen" />

-	<field type="DOTCLOCK" name="dotclock" />

-	<field type="CARD16" name= "hdisplay" />

-	<field type="CARD16" name= "hsyncstart" />

-	<field type="CARD16" name= "hsyncend" />

-	<field type="CARD16" name= "htotal" />

-	<field type="CARD16" name= "hskew" />

-	<field type="CARD16" name= "vdisplay" />

-	<field type="CARD16" name= "vsyncstart" />

-	<field type="CARD16" name= "vsyncend" />

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

-	<pad bytes="2" />

-	<field type="CARD32" name="flags" mask="ModeFlag" />

-	<pad bytes="12" />

-	<field type="CARD32" name="privsize" />

-	<list type="CARD8" name="private">

-	    <fieldref>privsize</fieldref>

-	</list>

-    </request>

-

-    <request name="ValidateModeLine" opcode="9">

-	<field type="CARD32" name="screen" />

-	<field type="DOTCLOCK" name="dotclock" />

-	<field type="CARD16" name= "hdisplay" />

-	<field type="CARD16" name= "hsyncstart" />

-	<field type="CARD16" name= "hsyncend" />

-	<field type="CARD16" name= "htotal" />

-	<field type="CARD16" name= "hskew" />

-	<field type="CARD16" name= "vdisplay" />

-	<field type="CARD16" name= "vsyncstart" />

-	<field type="CARD16" name= "vsyncend" />

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

-	<pad bytes="2" />

-	<field type="CARD32" name="flags" mask="ModeFlag" />

-	<pad bytes="12" />

-	<field type="CARD32" name="privsize" />

-	<list type="CARD8" name="private">

-	    <fieldref>privsize</fieldref>

-	</list>

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="status" />

-	    <pad bytes="20" />

-	</reply>

-    </request>

-

-    <request name="SwitchToMode" opcode="10">

-	<field type="CARD32" name="screen" />

-	<field type="DOTCLOCK" name="dotclock" />

-	<field type="CARD16" name= "hdisplay" />

-	<field type="CARD16" name= "hsyncstart" />

-	<field type="CARD16" name= "hsyncend" />

-	<field type="CARD16" name= "htotal" />

-	<field type="CARD16" name= "hskew" />

-	<field type="CARD16" name= "vdisplay" />

-	<field type="CARD16" name= "vsyncstart" />

-	<field type="CARD16" name= "vsyncend" />

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

-	<pad bytes="2" />

-	<field type="CARD32" name="flags" mask="ModeFlag" />

-	<pad bytes="12" />

-	<field type="CARD32" name="privsize" />

-	<list type="CARD8" name="private">

-	    <fieldref>privsize</fieldref>

-	</list>

-    </request>

-

-    <request name="GetViewPort" opcode="11">

-	<field type="CARD16" name="screen" />

-	<pad bytes="2" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="x" />

-	    <field type="CARD32" name="y" />

-	    <pad bytes="16" />

-	</reply>

-    </request>

-

-    <request name="SetViewPort" opcode="12">

-	<field type="CARD16" name="screen" />

-	<pad bytes="2" />

-	<field type="CARD32" name="x" />

-	<field type="CARD32" name="y" />

-    </request>

-

-    <!-- new for version 2.x  -->

-    <request name="GetDotClocks" opcode="13">

-	<field type="CARD16" name="screen" />

-	<pad bytes="2" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="flags" mask="ClockFlag" />

-	    <field type="CARD32" name="clocks" />

-	    <field type="CARD32" name="maxclocks" />

-	    <pad bytes="12" />

-	    <list type="CARD32" name="clock">

-		<!-- Only if flags does not include Programable:

-		    (1 - (flags & 1)) * clocks

-		-->

-		<op op="*">

-		    <op op = "-">

-			<value>1</value>

-			<op op="&amp;">

-			    <fieldref>flags</fieldref>

-			    <value>1</value>

-			</op>

-		    </op>

-		    <fieldref>clocks</fieldref>

-		</op>

-	    </list>

-	</reply>

-    </request>

-

-    <request name="SetClientVersion" opcode="14">

-	<field type="CARD16" name="major" />

-	<field type="CARD16" name="minor" />

-    </request>

-

-    <request name="SetGamma" opcode="15">

-	<field type="CARD16" name="screen" />

-	<pad bytes="2" />

-	<field type="CARD32" name="red" />

-	<field type="CARD32" name="green" />

-	<field type="CARD32" name="blue" />

-	<pad bytes="12" />

-    </request>

-

-    <request name="GetGamma" opcode="16">

-	<field type="CARD16" name="screen" />

-	<pad bytes="26" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="red" />

-	    <field type="CARD32" name="green" />

-	    <field type="CARD32" name="blue" />

-	    <pad bytes="12" />

-	</reply>

-    </request>

-

-    <request name="GetGammaRamp" opcode="17">

-	<field type="CARD16" name="screen" />

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

-	<reply>

-	    <pad bytes="1" />

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

-	    <pad bytes="22" />

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

-		<op op="&amp;">

-		    <op op = "+">

-			<fieldref>size</fieldref>

-			<value>1</value>

-		    </op>

-		    <unop op="~">

-			<value>1</value>

-		    </unop>

-		</op>

-	    </list>

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

-		<op op="&amp;">

-		    <op op = "+">

-			<fieldref>size</fieldref>

-			<value>1</value>

-		    </op>

-		    <unop op="~">

-			<value>1</value>

-		    </unop>

-		</op>

-	    </list>

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

-		<op op="&amp;">

-		    <op op = "+">

-			<fieldref>size</fieldref>

-			<value>1</value>

-		    </op>

-		    <unop op="~">

-			<value>1</value>

-		    </unop>

-		</op>

-	    </list>

-	</reply>

-    </request>

-

-    <request name="SetGammaRamp" opcode="18">

-	<field type="CARD16" name="screen" />

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

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

-	    <op op="&amp;">

-		<op op = "+">

-		    <fieldref>size</fieldref>

-		    <value>1</value>

-		</op>

-		<unop op="~">

-		    <value>1</value>

-		</unop>

-	    </op>

-	</list>

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

-	    <op op="&amp;">

-		<op op = "+">

-		    <fieldref>size</fieldref>

-		    <value>1</value>

-		</op>

-		<unop op="~">

-		    <value>1</value>

-		</unop>

-	    </op>

-	</list>

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

-	    <op op="&amp;">

-		<op op = "+">

-		    <fieldref>size</fieldref>

-		    <value>1</value>

-		</op>

-		<unop op="~">

-		    <value>1</value>

-		</unop>

-	    </op>

-	</list>

-    </request>

-

-    <request name="GetGammaRampSize" opcode="19">

-	<field type="CARD16" name="screen" />

-	<pad bytes="2" />

-	<reply>

-	    <pad bytes="1" />

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

-	    <pad bytes="22" />

-	</reply>

-    </request>

-

-    <request name="GetPermissions" opcode="20">

-	<field type="CARD16" name="screen" />

-	<pad bytes="2" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="permissions" mask="Permission" />

-	    <pad bytes="20" />

-	</reply>

-    </request>

-

-    <error name="BadClock" number="0" />

-    <error name="BadHTimings" number="1" />

-    <error name="BadVTimings" number="2" />

-    <error name="ModeUnsuitable" number="3" />

-    <error name="ExtensionDisabled" number="4" />

-    <error name="ClientNotLocal" number="5" />

-    <error name="ZoomLocked" number="6" />

-

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2009 Open Text Corporation.  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="xf86vidmode" extension-xname="XFree86-VidModeExtension" extension-name="XF86VidMode"
+    major-version="2" minor-version="2">
+
+    <!-- In places where there are multiple versions of the protocol, this
+	 describes version 2.2. If you do not call xcb_xf86vidmode_set_client_version()
+	 then some requests may fail and some replies may not be what you expect. -->
+
+    <typedef oldname="CARD32" newname="SYNCRANGE" />  <!-- Min and Max fixed-decimal-point values -->
+    <typedef oldname="CARD32" newname="DOTCLOCK" />   <!-- A single fixed-decimal-point value -->
+
+    <enum name="ModeFlag">
+	<item name="Positive_HSync">	<bit>0</bit></item>
+	<item name="Negative_HSync">	<bit>1</bit></item>
+	<item name="Positive_VSync">	<bit>2</bit></item>
+	<item name="Negative_VSync">	<bit>3</bit></item>
+	<item name="Interlace">		<bit>4</bit></item>
+	<item name="Composite_Sync">	<bit>5</bit></item>
+	<item name="Positive_CSync">	<bit>6</bit></item>
+	<item name="Negative_CSync">	<bit>7</bit></item>
+	<item name="HSkew">		<bit>8</bit></item>
+	<item name="Broadcast">		<bit>9</bit></item>
+	<item name="Pixmux">		<bit>10</bit></item>
+	<item name="Double_Clock">	<bit>11</bit></item>
+	<item name="Half_Clock">	<bit>12</bit></item>
+    </enum>
+
+    <enum name="ClockFlag">
+	<item name="Programable">	<bit>0</bit></item>
+    </enum>
+
+    <enum name="Permission">
+	<item name="Read">		<bit>0</bit></item>
+	<item name="Write">		<bit>1</bit></item>
+    </enum>
+
+    <struct name="ModeInfo">
+	<field type="DOTCLOCK" name="dotclock" />
+	<field type="CARD16" name= "hdisplay" />
+	<field type="CARD16" name= "hsyncstart" />
+	<field type="CARD16" name= "hsyncend" />
+	<field type="CARD16" name= "htotal" />
+	<field type="CARD32" name= "hskew" />
+	<field type="CARD16" name= "vdisplay" />
+	<field type="CARD16" name= "vsyncstart" />
+	<field type="CARD16" name= "vsyncend" />
+	<field type="CARD16" name= "vtotal" />
+	<pad bytes="4" />
+	<field type="CARD32" name="flags" mask="ModeFlag" />
+	<pad bytes="12" />
+	<field type="CARD32" name="privsize" />
+    </struct>
+
+    <request name="QueryVersion" opcode="0">
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD16" name="major_version" />
+	    <field type="CARD16" name="minor_version" />
+	</reply>
+    </request>
+
+    <request name="GetModeLine" opcode="1">
+	<field type="CARD16" name="screen" />
+	<pad bytes="2" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="DOTCLOCK" name="dotclock" />
+	    <field type="CARD16" name= "hdisplay" />
+	    <field type="CARD16" name= "hsyncstart" />
+	    <field type="CARD16" name= "hsyncend" />
+	    <field type="CARD16" name= "htotal" />
+	    <field type="CARD16" name= "hskew" />
+	    <field type="CARD16" name= "vdisplay" />
+	    <field type="CARD16" name= "vsyncstart" />
+	    <field type="CARD16" name= "vsyncend" />
+	    <field type="CARD16" name= "vtotal" />
+	    <pad bytes="2" />
+	    <field type="CARD32" name="flags" mask="ModeFlag" />
+	    <pad bytes="12" />
+	    <field type="CARD32" name="privsize" />
+	    <list type="CARD8" name="private">
+		<fieldref>privsize</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <request name="ModModeLine" opcode="2">
+	<field type="CARD32" name="screen" />
+	<field type="CARD16" name= "hdisplay" />
+	<field type="CARD16" name= "hsyncstart" />
+	<field type="CARD16" name= "hsyncend" />
+	<field type="CARD16" name= "htotal" />
+	<field type="CARD16" name= "hskew" />
+	<field type="CARD16" name= "vdisplay" />
+	<field type="CARD16" name= "vsyncstart" />
+	<field type="CARD16" name= "vsyncend" />
+	<field type="CARD16" name= "vtotal" />
+	<pad bytes="2" />
+	<field type="CARD32" name="flags" mask="ModeFlag" />
+	<pad bytes="12" />
+	<field type="CARD32" name="privsize" />
+	<list type="CARD8" name="private">
+	    <fieldref>privsize</fieldref>
+	</list>
+    </request>
+
+    <request name="SwitchMode" opcode="3">
+	<field type="CARD16" name="screen" />
+	<field type="CARD16" name="zoom" />
+    </request>
+
+    <request name="GetMonitor" opcode="4">
+	<field type="CARD16" name="screen" />
+	<pad bytes="2" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="vendor_length" />
+	    <field type="CARD8" name="model_length" />
+	    <field type="CARD8" name="num_hsync" />
+	    <field type="CARD8" name="num_vsync" />
+	    <pad bytes="20" />
+	    <list type="SYNCRANGE" name="hsync">
+		<fieldref>num_hsync</fieldref>
+	    </list>
+	    <list type="SYNCRANGE" name="vsync">
+		<fieldref>num_vsync</fieldref>
+	    </list>
+	    <list type="char" name="vendor">
+		<fieldref>vendor_length</fieldref>
+	    </list>
+	    <list type="void" name="alignment_pad">
+		<op op="-">
+		    <op op="&amp;">
+			<op op="+">
+			    <fieldref>vendor_length</fieldref>
+			    <value> 3 </value>
+			</op>
+			<unop op="~">
+			    <value>3</value>
+			</unop>
+		    </op>
+		    <fieldref>vendor_length</fieldref>
+		</op>
+	    </list>
+	    <list type="char" name="model">
+		<fieldref>model_length</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <request name="LockModeSwitch" opcode="5">
+	<field type="CARD16" name="screen" />
+	<field type="CARD16" name="lock" />
+    </request>
+
+    <request name="GetAllModeLines" opcode="6">
+	<field type="CARD16" name="screen" />
+	<pad bytes="2" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="modecount" />
+	    <pad bytes="20" />
+	    <list type="ModeInfo" name="modeinfo">
+		<fieldref>modecount</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <request name="AddModeLine" opcode="7">
+	<field type="CARD32" name="screen" />
+	<field type="DOTCLOCK" name="dotclock" />
+	<field type="CARD16" name= "hdisplay" />
+	<field type="CARD16" name= "hsyncstart" />
+	<field type="CARD16" name= "hsyncend" />
+	<field type="CARD16" name= "htotal" />
+	<field type="CARD16" name= "hskew" />
+	<field type="CARD16" name= "vdisplay" />
+	<field type="CARD16" name= "vsyncstart" />
+	<field type="CARD16" name= "vsyncend" />
+	<field type="CARD16" name= "vtotal" />
+	<pad bytes="2" />
+	<field type="CARD32" name="flags" mask="ModeFlag" />
+	<pad bytes="12" />
+	<field type="CARD32" name="privsize" />
+	<field type="DOTCLOCK" name="after_dotclock" />
+	<field type="CARD16" name= "after_hdisplay" />
+	<field type="CARD16" name= "after_hsyncstart" />
+	<field type="CARD16" name= "after_hsyncend" />
+	<field type="CARD16" name= "after_htotal" />
+	<field type="CARD16" name= "after_hskew" />
+	<field type="CARD16" name= "after_vdisplay" />
+	<field type="CARD16" name= "after_vsyncstart" />
+	<field type="CARD16" name= "after_vsyncend" />
+	<field type="CARD16" name= "after_vtotal" />
+	<pad bytes="2" />
+	<field type="CARD32" name="after_flags" mask="ModeFlag" />
+	<pad bytes="12" />
+	<list type="CARD8" name="private">
+	    <fieldref>privsize</fieldref>
+	</list>
+    </request>
+
+    <request name="DeleteModeLine" opcode="8">
+	<field type="CARD32" name="screen" />
+	<field type="DOTCLOCK" name="dotclock" />
+	<field type="CARD16" name= "hdisplay" />
+	<field type="CARD16" name= "hsyncstart" />
+	<field type="CARD16" name= "hsyncend" />
+	<field type="CARD16" name= "htotal" />
+	<field type="CARD16" name= "hskew" />
+	<field type="CARD16" name= "vdisplay" />
+	<field type="CARD16" name= "vsyncstart" />
+	<field type="CARD16" name= "vsyncend" />
+	<field type="CARD16" name= "vtotal" />
+	<pad bytes="2" />
+	<field type="CARD32" name="flags" mask="ModeFlag" />
+	<pad bytes="12" />
+	<field type="CARD32" name="privsize" />
+	<list type="CARD8" name="private">
+	    <fieldref>privsize</fieldref>
+	</list>
+    </request>
+
+    <request name="ValidateModeLine" opcode="9">
+	<field type="CARD32" name="screen" />
+	<field type="DOTCLOCK" name="dotclock" />
+	<field type="CARD16" name= "hdisplay" />
+	<field type="CARD16" name= "hsyncstart" />
+	<field type="CARD16" name= "hsyncend" />
+	<field type="CARD16" name= "htotal" />
+	<field type="CARD16" name= "hskew" />
+	<field type="CARD16" name= "vdisplay" />
+	<field type="CARD16" name= "vsyncstart" />
+	<field type="CARD16" name= "vsyncend" />
+	<field type="CARD16" name= "vtotal" />
+	<pad bytes="2" />
+	<field type="CARD32" name="flags" mask="ModeFlag" />
+	<pad bytes="12" />
+	<field type="CARD32" name="privsize" />
+	<list type="CARD8" name="private">
+	    <fieldref>privsize</fieldref>
+	</list>
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="status" />
+	    <pad bytes="20" />
+	</reply>
+    </request>
+
+    <request name="SwitchToMode" opcode="10">
+	<field type="CARD32" name="screen" />
+	<field type="DOTCLOCK" name="dotclock" />
+	<field type="CARD16" name= "hdisplay" />
+	<field type="CARD16" name= "hsyncstart" />
+	<field type="CARD16" name= "hsyncend" />
+	<field type="CARD16" name= "htotal" />
+	<field type="CARD16" name= "hskew" />
+	<field type="CARD16" name= "vdisplay" />
+	<field type="CARD16" name= "vsyncstart" />
+	<field type="CARD16" name= "vsyncend" />
+	<field type="CARD16" name= "vtotal" />
+	<pad bytes="2" />
+	<field type="CARD32" name="flags" mask="ModeFlag" />
+	<pad bytes="12" />
+	<field type="CARD32" name="privsize" />
+	<list type="CARD8" name="private">
+	    <fieldref>privsize</fieldref>
+	</list>
+    </request>
+
+    <request name="GetViewPort" opcode="11">
+	<field type="CARD16" name="screen" />
+	<pad bytes="2" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="x" />
+	    <field type="CARD32" name="y" />
+	    <pad bytes="16" />
+	</reply>
+    </request>
+
+    <request name="SetViewPort" opcode="12">
+	<field type="CARD16" name="screen" />
+	<pad bytes="2" />
+	<field type="CARD32" name="x" />
+	<field type="CARD32" name="y" />
+    </request>
+
+    <!-- new for version 2.x  -->
+    <request name="GetDotClocks" opcode="13">
+	<field type="CARD16" name="screen" />
+	<pad bytes="2" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="flags" mask="ClockFlag" />
+	    <field type="CARD32" name="clocks" />
+	    <field type="CARD32" name="maxclocks" />
+	    <pad bytes="12" />
+	    <list type="CARD32" name="clock">
+		<!-- Only if flags does not include Programable:
+		    (1 - (flags & 1)) * clocks
+		-->
+		<op op="*">
+		    <op op = "-">
+			<value>1</value>
+			<op op="&amp;">
+			    <fieldref>flags</fieldref>
+			    <value>1</value>
+			</op>
+		    </op>
+		    <fieldref>clocks</fieldref>
+		</op>
+	    </list>
+	</reply>
+    </request>
+
+    <request name="SetClientVersion" opcode="14">
+	<field type="CARD16" name="major" />
+	<field type="CARD16" name="minor" />
+    </request>
+
+    <request name="SetGamma" opcode="15">
+	<field type="CARD16" name="screen" />
+	<pad bytes="2" />
+	<field type="CARD32" name="red" />
+	<field type="CARD32" name="green" />
+	<field type="CARD32" name="blue" />
+	<pad bytes="12" />
+    </request>
+
+    <request name="GetGamma" opcode="16">
+	<field type="CARD16" name="screen" />
+	<pad bytes="26" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="red" />
+	    <field type="CARD32" name="green" />
+	    <field type="CARD32" name="blue" />
+	    <pad bytes="12" />
+	</reply>
+    </request>
+
+    <request name="GetGammaRamp" opcode="17">
+	<field type="CARD16" name="screen" />
+	<field type="CARD16" name="size" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD16" name="size" />
+	    <pad bytes="22" />
+	    <list type="CARD16" name="red">
+		<op op="&amp;">
+		    <op op = "+">
+			<fieldref>size</fieldref>
+			<value>1</value>
+		    </op>
+		    <unop op="~">
+			<value>1</value>
+		    </unop>
+		</op>
+	    </list>
+	    <list type="CARD16" name="green">
+		<op op="&amp;">
+		    <op op = "+">
+			<fieldref>size</fieldref>
+			<value>1</value>
+		    </op>
+		    <unop op="~">
+			<value>1</value>
+		    </unop>
+		</op>
+	    </list>
+	    <list type="CARD16" name="blue">
+		<op op="&amp;">
+		    <op op = "+">
+			<fieldref>size</fieldref>
+			<value>1</value>
+		    </op>
+		    <unop op="~">
+			<value>1</value>
+		    </unop>
+		</op>
+	    </list>
+	</reply>
+    </request>
+
+    <request name="SetGammaRamp" opcode="18">
+	<field type="CARD16" name="screen" />
+	<field type="CARD16" name="size" />
+	<list type="CARD16" name="red">
+	    <op op="&amp;">
+		<op op = "+">
+		    <fieldref>size</fieldref>
+		    <value>1</value>
+		</op>
+		<unop op="~">
+		    <value>1</value>
+		</unop>
+	    </op>
+	</list>
+	<list type="CARD16" name="green">
+	    <op op="&amp;">
+		<op op = "+">
+		    <fieldref>size</fieldref>
+		    <value>1</value>
+		</op>
+		<unop op="~">
+		    <value>1</value>
+		</unop>
+	    </op>
+	</list>
+	<list type="CARD16" name="blue">
+	    <op op="&amp;">
+		<op op = "+">
+		    <fieldref>size</fieldref>
+		    <value>1</value>
+		</op>
+		<unop op="~">
+		    <value>1</value>
+		</unop>
+	    </op>
+	</list>
+    </request>
+
+    <request name="GetGammaRampSize" opcode="19">
+	<field type="CARD16" name="screen" />
+	<pad bytes="2" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD16" name="size" />
+	    <pad bytes="22" />
+	</reply>
+    </request>
+
+    <request name="GetPermissions" opcode="20">
+	<field type="CARD16" name="screen" />
+	<pad bytes="2" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="permissions" mask="Permission" />
+	    <pad bytes="20" />
+	</reply>
+    </request>
+
+    <error name="BadClock" number="0" />
+    <error name="BadHTimings" number="1" />
+    <error name="BadVTimings" number="2" />
+    <error name="ModeUnsuitable" number="3" />
+    <error name="ExtensionDisabled" number="4" />
+    <error name="ClientNotLocal" number="5" />
+    <error name="ZoomLocked" number="6" />
+
+</xcb>
diff --git a/libxcb/xcb-proto/src/xfixes.xml b/libxcb/xcb-proto/src/xfixes.xml
index 7ddea0db5..9bbeaab1e 100644
--- a/libxcb/xcb-proto/src/xfixes.xml
+++ b/libxcb/xcb-proto/src/xfixes.xml
@@ -1,334 +1,334 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2004 Josh Triplett.  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.

--->

-<!-- This file describes version 4 of XFixes. -->

-<xcb header="xfixes" extension-xname="XFIXES" extension-name="XFixes"

-    major-version="4" minor-version="0">

-  <import>xproto</import>

-  <import>render</import>

-  <import>shape</import>

-

-  <!-- Version 1 -->

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

-    <field type="CARD32" name="client_major_version" />

-    <field type="CARD32" name="client_minor_version" />

-    <reply>

-      <pad bytes="1" />

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

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

-      <pad bytes="16" />

-    </reply>

-  </request>

-

-  <enum name="SaveSetMode">

-    <item name="Insert" />

-    <item name="Delete" />

-  </enum>

-

-  <enum name="SaveSetTarget">

-    <item name="Nearest" />

-    <item name="Root" />

-  </enum>

-

-  <enum name="SaveSetMapping">

-    <item name="Map" />

-    <item name="Unmap" />

-  </enum>

-

-  <request name="ChangeSaveSet" opcode="1">

-    <field type="BYTE" name="mode"   enum="SaveSetMode" />

-    <field type="BYTE" name="target" enum="SaveSetTarget" />

-    <field type="BYTE" name="map"    enum="SaveSetMapping" />

-    <pad bytes="1" />

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

-  </request>

-

-  <enum name="SelectionEvent">

-    <item name="SetSelectionOwner" />

-    <item name="SelectionWindowDestroy" />

-    <item name="SelectionClientClose" />

-  </enum>

-

-  <enum name="SelectionEventMask">

-    <item name="SetSelectionOwner">     <bit>0</bit></item>

-    <item name="SelectionWindowDestroy"><bit>1</bit></item>

-    <item name="SelectionClientClose">  <bit>2</bit></item>

-  </enum>

-

-  <event name="SelectionNotify" number="0">

-    <field type="CARD8"     name="subtype" enum="SelectionEvent" />

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

-    <field type="WINDOW"    name="owner" />

-    <field type="ATOM"      name="selection" />

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

-    <field type="TIMESTAMP" name="selection_timestamp" />

-    <pad bytes="8" />

-  </event>

-

-  <request name="SelectSelectionInput" opcode="2">

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

-    <field type="ATOM"   name="selection" />

-    <field type="CARD32" name="event_mask" mask="SelectionEventMask" />

-  </request>

-

-  <enum name="CursorNotify">

-    <item name="DisplayCursor" />

-  </enum>

-

-  <enum name="CursorNotifyMask">

-    <item name="DisplayCursor"><bit>0</bit></item>

-  </enum>

-

-  <event name="CursorNotify" number="1">

-    <field type="CARD8"     name="subtype" enum="CursorNotify" />

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

-    <field type="CARD32"    name="cursor_serial" />

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

-    <field type="ATOM"      name="name" altenum="Atom" /> <!-- Added in version 2 -->

-    <pad bytes="12" />

-  </event>

-

-  <request name="SelectCursorInput" opcode="3">

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

-    <field type="CARD32" name="event_mask" mask="CursorNotifyMask" />

-  </request>

-

-  <request name="GetCursorImage" opcode="4">

-    <reply>

-      <pad bytes="1" />

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

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

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

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

-      <field type="CARD16" name="xhot" />

-      <field type="CARD16" name="yhot" />

-      <field type="CARD32" name="cursor_serial" />

-      <pad bytes="8" />

-      <list  type="CARD32" name="cursor_image">

-        <op op="*">

-          <fieldref>width</fieldref>

-          <fieldref>height</fieldref>

-        </op>

-      </list>

-    </reply>

-  </request>

-

-  <!-- Version 2 -->

-

-  <xidtype name="REGION" />

-

-  <error name="BadRegion" number="0" />

-

-  <enum name="Region">

-    <item name="None" />

-  </enum>

-

-  <request name="CreateRegion" opcode="5">

-    <field type="REGION"    name="region" />

-    <list  type="RECTANGLE" name="rectangles" />

-  </request>

-

-  <request name="CreateRegionFromBitmap" opcode="6">

-    <field type="REGION" name="region" />

-    <field type="PIXMAP" name="bitmap" />

-  </request>

-

-  <request name="CreateRegionFromWindow" opcode="7">

-    <field type="REGION"     name="region" />

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

-    <field type="shape:KIND" name="kind"   enum="SK" />

-    <pad bytes="3" />

-  </request>

-

-  <request name="CreateRegionFromGC" opcode="8">

-    <field type="REGION"   name="region" />

-    <field type="GCONTEXT" name="gc" />

-  </request>

-

-  <request name="CreateRegionFromPicture" opcode="9">

-    <field type="REGION"  name="region" />

-    <field type="PICTURE" name="picture" />

-  </request>

-

-  <request name="DestroyRegion" opcode="10">

-    <field type="REGION"  name="region" />

-  </request>

-

-  <request name="SetRegion" opcode="11">

-    <field type="REGION"    name="region" />

-    <list  type="RECTANGLE" name="rectangles" />

-  </request>

-

-  <request name="CopyRegion" opcode="12">

-    <field type="REGION" name="source" />

-    <field type="REGION" name="destination" />

-  </request>

-

-  <request name="UnionRegion" opcode="13">

-    <field type="REGION" name="source1" />

-    <field type="REGION" name="source2" />

-    <field type="REGION" name="destination" />

-  </request>

-

-  <request name="IntersectRegion" opcode="14">

-    <field type="REGION" name="source1" />

-    <field type="REGION" name="source2" />

-    <field type="REGION" name="destination" />

-  </request>

-

-  <request name="SubtractRegion" opcode="15">

-    <field type="REGION" name="source1" />

-    <field type="REGION" name="source2" />

-    <field type="REGION" name="destination" />

-  </request>

-

-  <request name="InvertRegion" opcode="16">

-    <field type="REGION"    name="source" />

-    <field type="RECTANGLE" name="bounds" />

-    <field type="REGION"    name="destination" />

-  </request>

-

-  <request name="TranslateRegion" opcode="17">

-    <field type="REGION" name="region" />

-    <field type="INT16"  name="dx" />

-    <field type="INT16"  name="dy" />

-  </request>

-

-  <request name="RegionExtents" opcode="18"> 	

-    <field type="REGION" name="source" />

-    <field type="REGION" name="destination" />

-  </request>

-

-  <request name="FetchRegion" opcode="19">

-    <field type="REGION" name="region" />

-    <reply>

-      <pad bytes="1" />

-      <field type="RECTANGLE" name="extents" />

-      <pad bytes="16" />

-      <list  type="RECTANGLE" name="rectangles">

-	<op op='/'>

-		<fieldref>length</fieldref>

-		<value>2</value>

-	</op>

-      </list>

-    </reply>

-  </request>

-

-  <request name="SetGCClipRegion" opcode="20">

-    <field type="GCONTEXT" name="gc" />

-    <field type="REGION"   name="region" altenum="Region" />

-    <field type="INT16"    name="x_origin" />

-    <field type="INT16"    name="y_origin" />

-  </request>

-

-  <request name="SetWindowShapeRegion" opcode="21">

-    <field type="WINDOW"     name="dest" />

-    <field type="shape:KIND" name="dest_kind" enum="SK" />

-    <pad bytes="3" />

-    <field type="INT16"      name="x_offset" />

-    <field type="INT16"      name="y_offset" />

-    <field type="REGION"     name="region" altenum="Region" />

-  </request>

-

-  <request name="SetPictureClipRegion" opcode="22">

-    <field type="PICTURE" name="picture" />

-    <field type="REGION"  name="region" altenum="Region" />

-    <field type="INT16"   name="x_origin" />

-    <field type="INT16"   name="y_origin" />

-  </request>

-

-  <request name="SetCursorName" opcode="23">

-    <field type="CURSOR" name="cursor" />

-    <field type="CARD16" name="nbytes" />

-    <pad bytes="2" />

-    <list  type="char"   name="name"><fieldref>nbytes</fieldref></list>

-  </request>

-

-  <request name="GetCursorName" opcode="24">

-    <field type="CURSOR" name="cursor" />

-    <reply>

-      <pad bytes="1" />

-      <field type="ATOM"   name="atom" altenum="Atom" />

-      <field type="CARD16" name="nbytes" />

-      <pad bytes="18" />

-      <list  type="char"   name="name"><fieldref>nbytes</fieldref></list>

-    </reply>

-  </request>

-

-  <request name="GetCursorImageAndName" opcode="25">

-    <reply>

-      <pad bytes="1" />

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

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

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

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

-      <field type="CARD16" name="xhot" />

-      <field type="CARD16" name="yhot" />

-      <field type="CARD32" name="cursor_serial" />

-      <field type="ATOM"   name="cursor_atom" altenum="Atom" />

-      <field type="CARD16" name="nbytes" />

-      <pad bytes="2" />

-      <list  type="char"   name="name"><fieldref>nbytes</fieldref></list>

-      <list  type="CARD32" name="cursor_image">

-        <op op="*">

-          <fieldref>width</fieldref>

-          <fieldref>height</fieldref>

-        </op>

-      </list>

-    </reply>

-  </request>

-

-  <request name="ChangeCursor" opcode="26">

-    <field type="CURSOR" name="source" />

-    <field type="CURSOR" name="destination" />

-  </request>

-

-  <request name="ChangeCursorByName" opcode="27">

-    <field type="CURSOR" name="src" />

-    <field type="CARD16" name="nbytes" />

-    <pad bytes="2" />

-    <list  type="char"   name="name"><fieldref>nbytes</fieldref></list>

-  </request>

-

-  <!-- Version 3 -->

-  <request name="ExpandRegion" opcode="28">

-    <field type="REGION" name="source" />

-    <field type="REGION" name="destination" />

-    <field type="CARD16" name="left" />

-    <field type="CARD16" name="right" />

-    <field type="CARD16" name="top" />

-    <field type="CARD16" name="bottom" />

-  </request>

-  

-  <!-- Version 4 -->

-  <request name="HideCursor" opcode="29">

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

-  </request>

-

-  <request name="ShowCursor" opcode="30">

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

-  </request>

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004 Josh Triplett.  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.
+-->
+<!-- This file describes version 4 of XFixes. -->
+<xcb header="xfixes" extension-xname="XFIXES" extension-name="XFixes"
+    major-version="4" minor-version="0">
+  <import>xproto</import>
+  <import>render</import>
+  <import>shape</import>
+
+  <!-- Version 1 -->
+  <request name="QueryVersion" opcode="0">
+    <field type="CARD32" name="client_major_version" />
+    <field type="CARD32" name="client_minor_version" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="major_version" />
+      <field type="CARD32" name="minor_version" />
+      <pad bytes="16" />
+    </reply>
+  </request>
+
+  <enum name="SaveSetMode">
+    <item name="Insert" />
+    <item name="Delete" />
+  </enum>
+
+  <enum name="SaveSetTarget">
+    <item name="Nearest" />
+    <item name="Root" />
+  </enum>
+
+  <enum name="SaveSetMapping">
+    <item name="Map" />
+    <item name="Unmap" />
+  </enum>
+
+  <request name="ChangeSaveSet" opcode="1">
+    <field type="BYTE" name="mode"   enum="SaveSetMode" />
+    <field type="BYTE" name="target" enum="SaveSetTarget" />
+    <field type="BYTE" name="map"    enum="SaveSetMapping" />
+    <pad bytes="1" />
+    <field type="WINDOW" name="window" />
+  </request>
+
+  <enum name="SelectionEvent">
+    <item name="SetSelectionOwner" />
+    <item name="SelectionWindowDestroy" />
+    <item name="SelectionClientClose" />
+  </enum>
+
+  <enum name="SelectionEventMask">
+    <item name="SetSelectionOwner">     <bit>0</bit></item>
+    <item name="SelectionWindowDestroy"><bit>1</bit></item>
+    <item name="SelectionClientClose">  <bit>2</bit></item>
+  </enum>
+
+  <event name="SelectionNotify" number="0">
+    <field type="CARD8"     name="subtype" enum="SelectionEvent" />
+    <field type="WINDOW"    name="window" />
+    <field type="WINDOW"    name="owner" />
+    <field type="ATOM"      name="selection" />
+    <field type="TIMESTAMP" name="timestamp" />
+    <field type="TIMESTAMP" name="selection_timestamp" />
+    <pad bytes="8" />
+  </event>
+
+  <request name="SelectSelectionInput" opcode="2">
+    <field type="WINDOW" name="window" />
+    <field type="ATOM"   name="selection" />
+    <field type="CARD32" name="event_mask" mask="SelectionEventMask" />
+  </request>
+
+  <enum name="CursorNotify">
+    <item name="DisplayCursor" />
+  </enum>
+
+  <enum name="CursorNotifyMask">
+    <item name="DisplayCursor"><bit>0</bit></item>
+  </enum>
+
+  <event name="CursorNotify" number="1">
+    <field type="CARD8"     name="subtype" enum="CursorNotify" />
+    <field type="WINDOW"    name="window" />
+    <field type="CARD32"    name="cursor_serial" />
+    <field type="TIMESTAMP" name="timestamp" />
+    <field type="ATOM"      name="name" altenum="Atom" /> <!-- Added in version 2 -->
+    <pad bytes="12" />
+  </event>
+
+  <request name="SelectCursorInput" opcode="3">
+    <field type="WINDOW" name="window" />
+    <field type="CARD32" name="event_mask" mask="CursorNotifyMask" />
+  </request>
+
+  <request name="GetCursorImage" opcode="4">
+    <reply>
+      <pad bytes="1" />
+      <field type="INT16"  name="x" />
+      <field type="INT16"  name="y" />
+      <field type="CARD16" name="width" />
+      <field type="CARD16" name="height" />
+      <field type="CARD16" name="xhot" />
+      <field type="CARD16" name="yhot" />
+      <field type="CARD32" name="cursor_serial" />
+      <pad bytes="8" />
+      <list  type="CARD32" name="cursor_image">
+        <op op="*">
+          <fieldref>width</fieldref>
+          <fieldref>height</fieldref>
+        </op>
+      </list>
+    </reply>
+  </request>
+
+  <!-- Version 2 -->
+
+  <xidtype name="REGION" />
+
+  <error name="BadRegion" number="0" />
+
+  <enum name="Region">
+    <item name="None" />
+  </enum>
+
+  <request name="CreateRegion" opcode="5">
+    <field type="REGION"    name="region" />
+    <list  type="RECTANGLE" name="rectangles" />
+  </request>
+
+  <request name="CreateRegionFromBitmap" opcode="6">
+    <field type="REGION" name="region" />
+    <field type="PIXMAP" name="bitmap" />
+  </request>
+
+  <request name="CreateRegionFromWindow" opcode="7">
+    <field type="REGION"     name="region" />
+    <field type="WINDOW"     name="window" />
+    <field type="shape:KIND" name="kind"   enum="SK" />
+    <pad bytes="3" />
+  </request>
+
+  <request name="CreateRegionFromGC" opcode="8">
+    <field type="REGION"   name="region" />
+    <field type="GCONTEXT" name="gc" />
+  </request>
+
+  <request name="CreateRegionFromPicture" opcode="9">
+    <field type="REGION"  name="region" />
+    <field type="PICTURE" name="picture" />
+  </request>
+
+  <request name="DestroyRegion" opcode="10">
+    <field type="REGION"  name="region" />
+  </request>
+
+  <request name="SetRegion" opcode="11">
+    <field type="REGION"    name="region" />
+    <list  type="RECTANGLE" name="rectangles" />
+  </request>
+
+  <request name="CopyRegion" opcode="12">
+    <field type="REGION" name="source" />
+    <field type="REGION" name="destination" />
+  </request>
+
+  <request name="UnionRegion" opcode="13">
+    <field type="REGION" name="source1" />
+    <field type="REGION" name="source2" />
+    <field type="REGION" name="destination" />
+  </request>
+
+  <request name="IntersectRegion" opcode="14">
+    <field type="REGION" name="source1" />
+    <field type="REGION" name="source2" />
+    <field type="REGION" name="destination" />
+  </request>
+
+  <request name="SubtractRegion" opcode="15">
+    <field type="REGION" name="source1" />
+    <field type="REGION" name="source2" />
+    <field type="REGION" name="destination" />
+  </request>
+
+  <request name="InvertRegion" opcode="16">
+    <field type="REGION"    name="source" />
+    <field type="RECTANGLE" name="bounds" />
+    <field type="REGION"    name="destination" />
+  </request>
+
+  <request name="TranslateRegion" opcode="17">
+    <field type="REGION" name="region" />
+    <field type="INT16"  name="dx" />
+    <field type="INT16"  name="dy" />
+  </request>
+
+  <request name="RegionExtents" opcode="18"> 	
+    <field type="REGION" name="source" />
+    <field type="REGION" name="destination" />
+  </request>
+
+  <request name="FetchRegion" opcode="19">
+    <field type="REGION" name="region" />
+    <reply>
+      <pad bytes="1" />
+      <field type="RECTANGLE" name="extents" />
+      <pad bytes="16" />
+      <list  type="RECTANGLE" name="rectangles">
+	<op op='/'>
+		<fieldref>length</fieldref>
+		<value>2</value>
+	</op>
+      </list>
+    </reply>
+  </request>
+
+  <request name="SetGCClipRegion" opcode="20">
+    <field type="GCONTEXT" name="gc" />
+    <field type="REGION"   name="region" altenum="Region" />
+    <field type="INT16"    name="x_origin" />
+    <field type="INT16"    name="y_origin" />
+  </request>
+
+  <request name="SetWindowShapeRegion" opcode="21">
+    <field type="WINDOW"     name="dest" />
+    <field type="shape:KIND" name="dest_kind" enum="SK" />
+    <pad bytes="3" />
+    <field type="INT16"      name="x_offset" />
+    <field type="INT16"      name="y_offset" />
+    <field type="REGION"     name="region" altenum="Region" />
+  </request>
+
+  <request name="SetPictureClipRegion" opcode="22">
+    <field type="PICTURE" name="picture" />
+    <field type="REGION"  name="region" altenum="Region" />
+    <field type="INT16"   name="x_origin" />
+    <field type="INT16"   name="y_origin" />
+  </request>
+
+  <request name="SetCursorName" opcode="23">
+    <field type="CURSOR" name="cursor" />
+    <field type="CARD16" name="nbytes" />
+    <pad bytes="2" />
+    <list  type="char"   name="name"><fieldref>nbytes</fieldref></list>
+  </request>
+
+  <request name="GetCursorName" opcode="24">
+    <field type="CURSOR" name="cursor" />
+    <reply>
+      <pad bytes="1" />
+      <field type="ATOM"   name="atom" altenum="Atom" />
+      <field type="CARD16" name="nbytes" />
+      <pad bytes="18" />
+      <list  type="char"   name="name"><fieldref>nbytes</fieldref></list>
+    </reply>
+  </request>
+
+  <request name="GetCursorImageAndName" opcode="25">
+    <reply>
+      <pad bytes="1" />
+      <field type="INT16"  name="x" />
+      <field type="INT16"  name="y" />
+      <field type="CARD16" name="width" />
+      <field type="CARD16" name="height" />
+      <field type="CARD16" name="xhot" />
+      <field type="CARD16" name="yhot" />
+      <field type="CARD32" name="cursor_serial" />
+      <field type="ATOM"   name="cursor_atom" altenum="Atom" />
+      <field type="CARD16" name="nbytes" />
+      <pad bytes="2" />
+      <list  type="char"   name="name"><fieldref>nbytes</fieldref></list>
+      <list  type="CARD32" name="cursor_image">
+        <op op="*">
+          <fieldref>width</fieldref>
+          <fieldref>height</fieldref>
+        </op>
+      </list>
+    </reply>
+  </request>
+
+  <request name="ChangeCursor" opcode="26">
+    <field type="CURSOR" name="source" />
+    <field type="CURSOR" name="destination" />
+  </request>
+
+  <request name="ChangeCursorByName" opcode="27">
+    <field type="CURSOR" name="src" />
+    <field type="CARD16" name="nbytes" />
+    <pad bytes="2" />
+    <list  type="char"   name="name"><fieldref>nbytes</fieldref></list>
+  </request>
+
+  <!-- Version 3 -->
+  <request name="ExpandRegion" opcode="28">
+    <field type="REGION" name="source" />
+    <field type="REGION" name="destination" />
+    <field type="CARD16" name="left" />
+    <field type="CARD16" name="right" />
+    <field type="CARD16" name="top" />
+    <field type="CARD16" name="bottom" />
+  </request>
+  
+  <!-- Version 4 -->
+  <request name="HideCursor" opcode="29">
+    <field type="WINDOW" name="window" />
+  </request>
+
+  <request name="ShowCursor" opcode="30">
+    <field type="WINDOW" name="window" />
+  </request>
+</xcb>
diff --git a/libxcb/xcb-proto/src/xinerama.xml b/libxcb/xcb-proto/src/xinerama.xml
index 5534aa6c0..b2747eeab 100644
--- a/libxcb/xcb-proto/src/xinerama.xml
+++ b/libxcb/xcb-proto/src/xinerama.xml
@@ -1,99 +1,99 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2006 Jeremy Kolb.

-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="xinerama" extension-xname="XINERAMA" extension-name="Xinerama"

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

-

-    <!-- Version 1.1 -->

-

-    <import>xproto</import>

-

-    <struct name="ScreenInfo">

-        <field type="INT16" name="x_org" />

-        <field type="INT16" name="y_org" />

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

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

-    </struct>

-

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

-        <field type="CARD8" name="major" />

-        <field type="CARD8" name="minor" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD16" name="major" />

-            <field type="CARD16" name="minor" />

-        </reply>

-    </request>

-

-    <request name="GetState" opcode="1">

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

-        <reply>

-            <field type="BYTE" name="state" />

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

-        </reply>

-    </request>

-

-    <request name="GetScreenCount" opcode="2">

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

-        <reply>

-            <field type="BYTE" name="screen_count" />

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

-        </reply>

-    </request>

-

-    <request name="GetScreenSize" opcode="3">

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

-        <field type="CARD32" name="screen" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="width" />

-            <field type="CARD32" name="height" />

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

-            <field type="CARD32" name="screen" />

-        </reply>

-    </request>

-

-    <request name="IsActive" opcode="4">

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="state" />

-        </reply>

-    </request>

-

-    <request name="QueryScreens" opcode="5">

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="number" />

-            <pad bytes="20" />

-            <list type="ScreenInfo" name="screen_info">

-                <fieldref>number</fieldref>

-            </list>

-        </reply>

-    </request>

-

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2006 Jeremy Kolb.
+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="xinerama" extension-xname="XINERAMA" extension-name="Xinerama"
+    major-version="1" minor-version="1">
+
+    <!-- Version 1.1 -->
+
+    <import>xproto</import>
+
+    <struct name="ScreenInfo">
+        <field type="INT16" name="x_org" />
+        <field type="INT16" name="y_org" />
+        <field type="CARD16" name="width" />
+        <field type="CARD16" name="height" />
+    </struct>
+
+    <request name="QueryVersion" opcode="0">
+        <field type="CARD8" name="major" />
+        <field type="CARD8" name="minor" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD16" name="major" />
+            <field type="CARD16" name="minor" />
+        </reply>
+    </request>
+
+    <request name="GetState" opcode="1">
+        <field type="WINDOW" name="window" />
+        <reply>
+            <field type="BYTE" name="state" />
+            <field type="WINDOW" name="window" />
+        </reply>
+    </request>
+
+    <request name="GetScreenCount" opcode="2">
+        <field type="WINDOW" name="window" />
+        <reply>
+            <field type="BYTE" name="screen_count" />
+            <field type="WINDOW" name="window" />
+        </reply>
+    </request>
+
+    <request name="GetScreenSize" opcode="3">
+        <field type="WINDOW" name="window" />
+        <field type="CARD32" name="screen" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="width" />
+            <field type="CARD32" name="height" />
+            <field type="WINDOW" name="window" />
+            <field type="CARD32" name="screen" />
+        </reply>
+    </request>
+
+    <request name="IsActive" opcode="4">
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="state" />
+        </reply>
+    </request>
+
+    <request name="QueryScreens" opcode="5">
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="number" />
+            <pad bytes="20" />
+            <list type="ScreenInfo" name="screen_info">
+                <fieldref>number</fieldref>
+            </list>
+        </reply>
+    </request>
+
+</xcb>
diff --git a/libxcb/xcb-proto/src/xinput.xml b/libxcb/xcb-proto/src/xinput.xml
index b0a7a82e8..80416fe3f 100644
--- a/libxcb/xcb-proto/src/xinput.xml
+++ b/libxcb/xcb-proto/src/xinput.xml
@@ -1,1020 +1,1020 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2006 Peter Hutterer 

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

--->

-

-<!-- Spec: http://refspecs.freestandards.org/X11/Xinput.pdf -->

-

-<xcb header="xinput" extension-xname="XInputExtension" extension-name="Input"

-     major-version="1" minor-version="4">

-    <import>xproto</import>

-

-    <typedef oldname="CARD8" newname="KeyCode" />

-    <typedef oldname="CARD32" newname="EventClass" />

-

-    <enum name="ValuatorMode">

-	<item name="Relative"> <value>0</value></item>

-	<item name="Absolute"> <value>1</value></item>

-    </enum>

-

-    <enum name="PropagateMode">

-	<item name="AddToList"> <value>0</value></item>

-	<item name="DeleteFromList"> <value>1</value></item>

-    </enum>

-

-    <!-- GetExtensionVersion -->

-

-    <request name="GetExtensionVersion" opcode="1">

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

-	<pad bytes="2" />

-	<list type="char" name="name">

-	    <fieldref>name_len</fieldref>

-	</list>

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD16" name="server_major" />

-	    <field type="CARD16" name="server_minor" />

-	    <field type="BOOL" name="present" />

-	    <pad bytes="19" />

-	</reply>

-    </request>

-

-    <!-- ListInputDevices -->

-

-    <enum name="DeviceUse">

-	<item name="IsXPointer"><value>0</value></item>

-	<item name="IsXKeyboard"><value>1</value></item>

-	<item name="IsXExtensionDevice"><value>2</value></item>

-	<item name="IsXExtensionKeyboard"><value>3</value></item>

-	<item name="IsXExtensionPointer"><value>4</value></item>

-    </enum>

-

-    <struct name="DeviceInfo">

-	<field type="ATOM" name="device_type" />

-	<field type="CARD8" name="device_id" />

-	<field type="CARD8" name="num_class_info" />

-	<field type="CARD8" name="device_use" enum="DeviceUse" />

-	<pad bytes="1" />

-    </struct>

-

-    <request name="ListInputDevices" opcode="2">

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="devices_len" />

-	    <pad bytes="23" />

-	    <list type="DeviceInfo" name="devices">

-		<fieldref>devices_len</fieldref>

-	    </list>

-	    <!-- Uninterpreted: list of deviceinfo structs of 3 the subtypes -->

-	    <!-- Uninterpreted: list of null-terminated strings -->

-	</reply>

-    </request>

-

-    <enum name="InputClass">

-	<item name="Key"><value>0</value></item>

-	<item name="Button"><value>1</value></item>

-	<item name="Valuator"><value>2</value></item>

-	<item name="Feedback"><value>3</value></item>

-	<item name="Proximity"><value>4</value></item>

-	<item name="Focus"><value>5</value></item>

-	<item name="Other"><value>6</value></item>

-    </enum>

-

-    <struct name="InputInfo">

-	<field type="CARD8" name="class_id" enum="InputClass" />

-	<field type="CARD8" name="len" />

-    </struct>

-

-    <struct name="KeyInfo">

-	<field type="CARD8" name="class_id" enum="InputClass" />

-	<field type="CARD8" name="len" />

-	<field type="KeyCode" name="min_keycode" />

-	<field type="KeyCode" name="max_keycode" />

-	<field type="CARD16" name="num_keys" />

-	<pad bytes="2" />

-    </struct>

-

-    <struct name="ButtonInfo">

-	<field type="CARD8" name="class_id" enum="InputClass" />

-	<field type="CARD8" name="len" />

-	<field type="CARD16" name="num_buttons" />

-    </struct>

-

-    <struct name="AxisInfo">

-	<field type="CARD32" name="resolution" />

-	<field type="INT32" name="minimum" />

-	<field type="INT32" name="maximum" />

-    </struct>

-

-    <struct name="ValuatorInfo">

-	<field type="CARD8" name="class_id" enum="InputClass" />

-	<field type="CARD8" name="len" />

-	<field type="CARD8" name="axes_len" />

-	<field type="CARD8" name="mode" enum="ValuatorMode" />

-	<field type="CARD32" name="motion_size" />

-	<list type="AxisInfo" name="axes">

-	    <fieldref>axes_len</fieldref>

-	</list>

-    </struct>

-

-    <!-- OpenDevice -->

-

-    <struct name="InputClassInfo">

-	<field type="CARD8" name="class_id" enum="InputClass" />

-	<field type="CARD8" name="event_type_base" />

-    </struct>

-

-    <request name="OpenDevice" opcode="3">

-	<field type="CARD8" name="device_id" />

-	<pad bytes="3" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="num_classes" />

-	    <pad bytes="23" />

-	    <list type="InputClassInfo" name="class_info">

-		<fieldref>num_classes</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <!-- CloseDevice -->

-

-    <request name="CloseDevice" opcode="4">

-	<field type="CARD8" name="device_id" />

-	<pad bytes="3" />

-    </request>

-

-    <!-- SetDeviceMode -->

-

-    <request name="SetDeviceMode" opcode="5">

-	<field type="CARD8" name="device_id" />

-	<field type="CARD8" name="mode" enum="ValuatorMode" />

-	<pad bytes="2" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="status" altenum="GrabStatus" />

-	    <pad bytes="23" />

-	</reply>

-    </request>

-

-    <!-- SelectExtensionEvent -->

-

-    <request name="SelectExtensionEvent" opcode="6">

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

-	<field type="CARD16" name="num_classes" />

-	<pad bytes="2" />

-	<list type="EventClass" name="classes">

-	    <fieldref>num_classes</fieldref>

-	</list>

-    </request>

-

-    <!-- GetSelectedExtensionEvents -->

-

-    <request name="GetSelectedExtensionEvents" opcode="7">

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

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD16" name="num_this_classes" />

-	    <field type="CARD16" name="num_all_classes" />

-	    <pad bytes="20" />

-	    <list type="EventClass" name="this_classes">

-		<fieldref>num_this_classes</fieldref>

-	    </list>

-	    <list type="EventClass" name="all_classes">

-		<fieldref>num_all_classes</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <!-- ChangeDeviceDontPropagateList -->

-

-    <request name="ChangeDeviceDontPropagateList" opcode="8">

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

-	<field type="CARD16" name="num_classes" />

-	<field type="CARD8" name="mode" enum="PropagateMode" />

-	<pad bytes="1" />

-	<list type="EventClass" name="classes">

-	    <fieldref>num_classes</fieldref>

-	</list>

-    </request>

-

-    <!-- GetDeviceDontPropagateList -->

-

-    <request name="GetDeviceDontPropagateList" opcode="9">

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

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD16" name="num_classes" />

-	    <pad bytes="22" />

-	    <list type="EventClass" name="classes">

-		<fieldref>num_classes</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <!-- GetDeviceMotionEvents -->

-

-    <request name="GetDeviceMotionEvents" opcode="10">

-	<field type="TIMESTAMP" name="start" />

-	<field type="TIMESTAMP" name="stop" altenum="Time" />

-	<field type="CARD8" name="device_id" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD32" name="num_coords" />

-	    <field type="CARD8" name="num_axes" />

-	    <field type="CARD8" name="device_mode" enum="ValuatorMode" />

-	    <pad bytes="18" />

-	    <!-- Uninterpreted: list of DeviceTimeCoord structures -->

-	</reply>

-    </request>

-

-    <struct name="DeviceTimeCoord">

-	<field type="TIMESTAMP" name="time" />

-	<!-- Uninterpreted: list of CARD16 -->

-    </struct>

-

-    <!-- ChangeKeyboardDevice -->

-    <request name="ChangeKeyboardDevice" opcode="11">

-	<field type="CARD8" name="device_id" />

-	<pad bytes="3" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="status" altenum="GrabStatus" />

-	    <pad bytes="23" />

-	</reply>

-    </request>

-

-    <!-- ChangePointerDevice -->

-

-    <request name="ChangePointerDevice" opcode="12">

-	<field type="CARD8" name="x_axis" />

-	<field type="CARD8" name="y_axis" />

-	<field type="CARD8" name="device_id" />

-	<pad bytes="1" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="status" altenum="GrabStatus" />

-	    <pad bytes="23" />

-	</reply>

-    </request>

-

-    <!-- GrabDevice -->

-

-    <request name="GrabDevice" opcode="13">

-	<field type="WINDOW" name="grab_window" />

-	<field type="TIMESTAMP" name="time" altenum="Time" />

-	<field type="CARD16" name="num_classes" />

-	<field type="CARD8" name="this_device_mode" enum="GrabMode" />

-	<field type="CARD8" name="other_device_mode" enum="GrabMode" />

-	<field type="BOOL" name="owner_events" />

-	<field type="CARD8" name="device_id" />

-	<pad bytes="2" />

-	<list type="EventClass" name="classes">

-	    <fieldref>num_classes</fieldref>

-	</list>

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="status" enum="GrabStatus" />

-	    <pad bytes="23" />

-	</reply>

-    </request>

-

-    <!-- UngrabDevice -->

-

-    <request name="UngrabDevice" opcode="14">

-	<field type="TIMESTAMP" name="time" altenum="Time" />

-	<field type="CARD8" name="device_id" />

-    </request>

-

-    <!-- GrabDeviceKey -->

-

-    <request name="GrabDeviceKey" opcode="15">

-	<field type="WINDOW" name="grab_window" />

-	<field type="CARD16" name="num_classes" />

-	<field type="CARD16" name="modifiers" mask="ModMask" />

-	<field type="CARD8" name="modifier_device" />

-	<field type="CARD8" name="grabbed_device" />

-	<field type="CARD8" name="key" altenum="Grab" />

-	<field type="CARD8" name="this_device_mode" enum="GrabMode" />

-	<field type="CARD8" name="other_device_mode" enum="GrabMode" />

-	<field type="BOOL" name="owner_events" />

-	<pad bytes="2" />

-	<list type="EventClass" name="classes">

-	    <fieldref>num_classes</fieldref>

-	</list>

-    </request>

-

-    <!-- UngrabDeviceKey -->

-

-    <request name="UngrabDeviceKey" opcode="16">

-	<field type="WINDOW" name="grabWindow" />

-	<field type="CARD16" name="modifiers" mask="ModMask" />

-	<field type="CARD8" name="modifier_device" />

-	<field type="CARD8" name="key" altenum="Grab" />

-	<field type="CARD8" name="grabbed_device" />

-    </request>

-

-    <!-- GrabDeviceButton -->

-

-    <request name="GrabDeviceButton" opcode="17">

-	<field type="WINDOW" name="grab_window" />

-	<field type="CARD8" name="grabbed_device" />

-	<field type="CARD8" name="modifier_device" />

-	<field type="CARD16" name="num_classes" />

-	<field type="CARD16" name="modifiers" mask="ModMask" />

-	<field type="CARD8" name="this_device_mode" enum="GrabMode" />

-	<field type="CARD8" name="other_device_mode" enum="GrabMode" />

-	<field type="CARD8" name="button" altenum="Grab" />

-	<field type="CARD8" name="owner_events" />

-	<pad bytes="2" />

-	<list type="EventClass" name="classes">

-	    <fieldref>num_classes</fieldref>

-	</list>

-    </request>

-

-    <!-- UngrabDeviceButton -->

-

-    <request name="UngrabDeviceButton" opcode="18">

-	<field type="WINDOW" name="grab_window" />

-	<field type="CARD16" name="modifiers" mask="ModMask" />

-	<field type="CARD8" name="modifier_device" />

-	<field type="CARD8" name="button" altenum="Grab" />

-	<field type="CARD8" name="grabbed_device" />

-    </request>

-

-    <!-- AllowDeviceEvents -->

-

-    <enum name="DeviceInputMode">

-	<item name="AsyncThisDevice" />

-	<item name="SyncThisDevice" />

-	<item name="ReplayThisDevice" />

-	<item name="AsyncOtherDevices" />

-	<item name="AsyncAll" />

-	<item name="SyncAll" />

-    </enum>

-

-    <request name="AllowDeviceEvents" opcode="19">

-	<field type="TIMESTAMP" name="time" altenum="Time" />

-	<field type="CARD8" name="mode" enum="DeviceInputMode" />

-	<field type="CARD8" name="device_id" />

-    </request>

-

-    <!-- GetDeviceFocus -->

-

-    <request name="GetDeviceFocus" opcode="20">

-	<field type="CARD8" name="device_id" />

-	<pad bytes="3" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="WINDOW" name="focus" altenum="InputFocus" />

-	    <field type="TIMESTAMP" name="time" />

-	    <field type="CARD8" name="revert_to" enum="InputFocus" />

-	    <pad bytes="15" />

-	</reply>

-    </request>

-

-    <!-- SetDeviceFocus -->

-

-    <request name="SetDeviceFocus" opcode="21">

-	<field type="WINDOW" name="focus" altenum="InputFocus" />

-	<field type="TIMESTAMP" name="time" altenum="Time" />

-	<field type="CARD8" name="revert_to" enum="InputFocus" />

-	<field type="CARD8" name="device_id" />

-    </request>

-

-    <!-- GetFeedbackControl -->

-

-    <request name="GetFeedbackControl" opcode="22">

-	<field type="CARD8" name="device_id" />

-	<pad bytes="3" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD16" name="num_feedback" />

-	    <pad bytes="22" />

-	    <!-- Uninterpreted: list of FeedbackState structures -->

-	</reply>

-    </request>

-

-    <enum name="FeedbackClass">

-	<item name="Keyboard" />

-	<item name="Pointer" />

-	<item name="String" />

-	<item name="Integer" />

-	<item name="Led" />

-	<item name="Bell" />

-    </enum>

-

-    <struct name="FeedbackState">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-    </struct>

-    

-    <struct name="KbdFeedbackState">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD16" name="pitch" />

-	<field type="CARD16" name="duration" />

-	<field type="CARD32" name="led_mask" />

-	<field type="CARD32" name="led_values" />

-	<field type="BOOL" name="global_auto_repeat" />

-	<field type="CARD8" name="click" />

-	<field type="CARD8" name="percent" />

-	<pad bytes="1" />

-	<list type="CARD8" name="auto_repeats"><value>32</value></list>

-    </struct>

-

-    <struct name="PtrFeedbackState">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-	<pad bytes="2" />

-	<field type="CARD16" name="accel_num" />

-	<field type="CARD16" name="accel_denom" />

-	<field type="CARD16" name="threshold" />

-    </struct>

-

-    <struct name="IntegerFeedbackState">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD32" name="resolution" />

-	<field type="INT32" name="min_value" />

-	<field type="INT32" name="max_value" />

-    </struct>

-

-    <struct name="StringFeedbackState">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD16" name="max_symbols" />

-	<field type="CARD16" name="num_keysyms" />

-	<list type="KEYSYM" name="keysyms">

-	    <fieldref>num_keysyms</fieldref>

-	</list>

-    </struct>

-

-    <struct name="BellFeedbackState">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD8" name="percent" />

-	<pad bytes="3" />

-	<field type="CARD16" name="pitch" />

-	<field type="CARD16" name="duration" />

-    </struct>

-

-    <struct name="LedFeedbackState">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD32" name="led_mask" />

-	<field type="CARD32" name="led_values" />

-    </struct>

-

-    <!-- ChangeFeedbackControl

-

-    <request name="ChangeFeedbackControl" opcode="23">

-	<field type="CARD32" name="mask" />

-	<field type="CARD8" name="device_id" />

-	<field type="CARD8" name="feedback_id" />

-	Uninterpreted: list of FeedbackCtl structures

-    </request>

-

-    -->

-

-    <struct name="FeedbackCtl">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-    </struct>

-

-    <struct name="KbdFeedbackCtl">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-	<field type="KeyCode" name="key" />

-	<field type="CARD8" name="auto_repeat_mode" />

-	<field type="INT8" name="key_click_percent" />

-	<field type="INT8" name="bell_percent" />

-	<field type="INT16" name="bell_pitch" />

-	<field type="INT16" name="bell_duration" />

-	<field type="CARD32" name="led_mask" />

-	<field type="CARD32" name="led_values" />

-    </struct>

-

-    <struct name="PtrFeedbackCtl">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-	<pad bytes="2" />

-	<field type="INT16" name="num" />

-	<field type="INT16" name="denom" />

-	<field type="INT16" name="threshold" />

-    </struct>

-

-    <struct name="IntegerFeedbackCtl">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-	<field type="INT32" name="int_to_display" />

-    </struct>

-

-    <struct name="StringFeedbackCtl">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-	<pad bytes="2" />

-	<field type="CARD16" name="num_keysyms" />

-	<list type="KEYSYM" name="keysyms">

-	    <fieldref>num_keysyms</fieldref>

-	</list>

-    </struct>

-

-    <struct name="BellFeedbackCtl">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-	<field type="INT8" name="percent" />

-	<pad bytes="3" />

-	<field type="INT16" name="pitch" />

-	<field type="INT16" name="duration" />

-    </struct>

-

-    <struct name="LedFeedbackCtl">

-	<field type="CARD8" name="class_id" enum="FeedbackClass" />

-	<field type="CARD8" name="id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD32" name="led_mask" />

-	<field type="CARD32" name="led_values" />

-    </struct>

-

-    <!-- GetDeviceKeyMapping -->

-

-    <request name="GetDeviceKeyMapping" opcode="24">

-	<field type="CARD8" name="device_id" />

-	<field type="KeyCode" name="first_keycode" />

-	<field type="CARD8" name="count" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="keysyms_per_keycode" />

-	    <pad bytes="23" />

-	    <list type="KEYSYM" name="keysyms">

-		<fieldref>length</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <!-- ChangeDeviceKeyMapping -->

-

-    <request name="ChangeDeviceKeyMapping" opcode="25">

-	<field type="CARD8" name="device_id" />

-	<field type="KeyCode" name="first_keycode" />

-	<field type="CARD8" name="keysyms_per_keycode" />

-	<field type="CARD8" name="keycode_count" />

-	<list type="KEYSYM" name="keysyms">

-	    <op op="*">

-		<fieldref>keycode_count</fieldref>

-		<fieldref>keysyms_per_keycode</fieldref>

-	    </op>

-	</list>

-    </request>

-

-    <!-- GetDeviceModifierMapping -->

-

-    <request name="GetDeviceModifierMapping" opcode="26">

-	<field type="CARD8" name="device_id" />

-	<pad bytes="3" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="keycodes_per_modifier" />

-	    <pad bytes="23" />

-	    <list type="CARD8" name="keymaps">

-		<op op="*">

-		    <fieldref>keycodes_per_modifier</fieldref>

-		    <value>8</value>

-		</op>

-	    </list>

-	</reply>

-    </request>

-

-    <!-- SetDeviceModifierMapping -->

-

-    <request name="SetDeviceModifierMapping" opcode="27">

-	<field type="CARD8" name="device_id" />

-	<field type="CARD8" name="keycodes_per_modifier" />

-	<pad bytes="1" />

-	<list type="CARD8" name="keymaps">

-	    <op op="*">

-		<fieldref>keycodes_per_modifier</fieldref>

-		<value>8</value>

-	    </op>

-	</list>

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="status" enum="MappingStatus" />

-	    <pad bytes="23" />

-	</reply>

-    </request>

-

-    <!-- GetDeviceButtonMapping -->

-

-    <request name="GetDeviceButtonMapping" opcode="28">

-	<field type="CARD8" name="device_id" />

-	<pad bytes="3" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="map_size" />

-	    <pad bytes="23" />

-	    <list type="CARD8" name="map">

-		<fieldref>map_size</fieldref>

-	    </list>

-	</reply>

-    </request>

-

-    <!-- SetDeviceButtonMapping -->

-

-    <request name="SetDeviceButtonMapping" opcode="29">

-	<field type="CARD8" name="device_id" />

-	<field type="CARD8" name="map_size" />

-	<pad bytes="2" />

-	<list type="CARD8" name="map">

-	    <fieldref>map_size</fieldref>

-	</list>

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="status" enum="MappingStatus" />

-	    <pad bytes="23" />

-	</reply>

-    </request>

-

-    <!-- QueryDeviceState -->

-

-    <request name="QueryDeviceState" opcode="30">

-	<field type="CARD8" name="device_id" />

-	<pad bytes="3" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="num_classes" />

-	    <pad bytes="23" />

-	    <!-- Uninterpreted: list of InputState structures -->

-	</reply>

-    </request>

-

-    <struct name="InputState">

-	<field type="CARD8" name="class_id" enum="InputClass" />

-	<field type="CARD8" name="len" />

-	<field type="CARD8" name="num_items" />

-    </struct>

-

-    <struct name="KeyState">

-	<field type="CARD8" name="class_id" enum="InputClass" />

-	<field type="CARD8" name="len" />

-	<field type="CARD8" name="num_keys" />

-	<pad bytes="1" />

-	<list type="CARD8" name="keys">

-	    <value>32</value>

-	</list>

-    </struct>

-

-    <struct name="ButtonState">

-	<field type="CARD8" name="class_id" enum="InputClass" />

-	<field type="CARD8" name="len" />

-	<field type="CARD8" name="num_buttons" />

-	<pad bytes="1" />

-	<list type="CARD8" name="buttons">

-	    <value>32</value>

-	</list>

-    </struct>

-

-    <struct name="ValuatorState">

-	<field type="CARD8" name="class_id" enum="InputClass" />

-	<field type="CARD8" name="len" />

-	<field type="CARD8" name="num_valuators" />

-	<field type="CARD8" name="mode" />

-	<list type="CARD32" name="valuators">

-	    <fieldref>num_valuators</fieldref>

-	</list>

-    </struct>

-

-    <!-- SendExtensionEvent -->

-

-    <request name="SendExtensionEvent" opcode="31">

-	<field type="WINDOW" name="destination" />

-	<field type="CARD8" name="device_id" />

-	<field type="BOOL" name="propagate" />

-	<field type="CARD16" name="num_classes" />

-	<field type="CARD8" name="num_events" />

-	<pad bytes="3" />

-	<list type="char" name="events">

-	    <op op="*">

-		<fieldref>num_events</fieldref>

-		<value>32</value>

-	    </op>

-	</list>

-	<list type="EventClass" name="classes">

-	    <fieldref>num_classes</fieldref>

-	</list>

-    </request>

-

-    <!-- DeviceBell -->

-

-    <request name="DeviceBell" opcode="32">

-	<field type="CARD8" name="device_id" />

-	<field type="CARD8" name="feedback_id" />

-	<field type="CARD8" name="feedback_class" />

-	<field type="INT8" name="percent" />

-    </request>

-

-    <!-- SetDeviceValuators -->

-

-    <request name="SetDeviceValuators" opcode="33">

-	<field type="CARD8" name="device_id" />

-	<field type="CARD8" name="first_valuator" />

-	<field type="CARD8" name="num_valuators" />

-	<pad bytes="1" />

-	<list type="INT32" name="valuators">

-	    <fieldref>num_valuators</fieldref>

-	</list>

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="status" enum="GrabStatus" />

-	    <pad bytes="23" />

-	</reply>

-    </request>

-

-    <!-- GetDeviceControl -->

-

-    <request name="GetDeviceControl" opcode="34">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD8" name="device_id" />

-	<pad bytes="1" />

-	<reply>

-	    <pad bytes="1" />

-	    <field type="CARD8" name="status" altenum="GrabStatus" />

-	    <pad bytes="23" />

-	    <!-- Uninterpreted: list of DeviceState structures -->

-	</reply>

-    </request>

-

-    <struct name="DeviceState">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD16" name="len" />

-    </struct>

-

-    <struct name="DeviceResolutionState">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD32" name="num_valuators" />

-	<list type="CARD32" name="resolution_values">

-	    <fieldref>num_valuators</fieldref>

-	</list>

-	<list type="CARD32" name="resolution_min">

-	    <fieldref>num_valuators</fieldref>

-	</list>

-	<list type="CARD32" name="resolution_max">

-	    <fieldref>num_valuators</fieldref>

-	</list>

-    </struct>

-

-    <struct name="DeviceAbsCalibState">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD16" name="len" />

-	<field type="INT32" name="min_x" />

-	<field type="INT32" name="max_x" />

-	<field type="INT32" name="min_y" />

-	<field type="INT32" name="max_y" />

-	<field type="CARD32" name="flip_x" />

-	<field type="CARD32" name="flip_y" />

-	<field type="CARD32" name="rotation" />

-	<field type="CARD32" name="button_threshold" />

-    </struct>

-

-    <struct name="DeviceAbsAreaState">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD32" name="offset_x" />

-	<field type="CARD32" name="offset_y" />

-	<field type="CARD32" name="width" />

-	<field type="CARD32" name="height" />

-	<field type="CARD32" name="screen" />

-	<field type="CARD32" name="following" />

-    </struct>

-

-    <struct name="DeviceCoreState">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD8" name="status" />

-	<field type="CARD8" name="iscore" />

-	<pad bytes="2" />

-    </struct>

-

-    <struct name="DeviceEnableState">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD8" name="enable" />

-	<pad bytes="3" />

-    </struct>

-

-    <!-- ChangeDeviceControl

-

-    <request name="ChangeDeviceControl" opcode="35">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD8" name="device_id" />

-	<pad bytes="1" />

-	Uninterpreted: list of DeviceCtl structures

-	<reply>

-            <pad byte="1" />

-            <field type="CARD8" name="status" altenum="GrabStatus" />

-            <pad bytes="23" />

-	</reply>

-    </request>

-

-    -->

-

-    <struct name="DeviceCtl">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD16" name="len" />

-    </struct>

-

-    <struct name="DeviceResolutionCtl">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD8" name="first_valuator" />

-	<field type="CARD8" name="num_valuators" />

-	<list type="CARD32" name="resolution_values">

-	    <fieldref>num_valuators</fieldref>

-	</list>

-    </struct>

-

-    <struct name="DeviceAbsCalibCtl">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD16" name="len" />

-	<field type="INT32" name="min_x" />

-	<field type="INT32" name="max_x" />

-	<field type="INT32" name="min_y" />

-	<field type="INT32" name="max_y" />

-	<field type="CARD32" name="flip_x" />

-	<field type="CARD32" name="flip_y" />

-	<field type="CARD32" name="rotation" />

-	<field type="CARD32" name="button_threshold" />

-    </struct>

-

-    <struct name="DeviceAbsAreaCtrl">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD32" name="offset_x" />

-	<field type="CARD32" name="offset_y" />

-	<field type="INT32" name="width" />

-	<field type="INT32" name="height" />

-	<field type="INT32" name="screen" />

-	<field type="CARD32" name="following" />

-    </struct>

-

-    <struct name="DeviceCoreCtrl">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD8" name="status" />

-	<pad bytes="3" />

-    </struct>

-

-    <struct name="DeviceEnableCtrl">

-	<field type="CARD16" name="control_id" />

-	<field type="CARD16" name="len" />

-	<field type="CARD8" name="enable" />

-	<pad bytes="3" />

-    </struct>

-

-    <!-- EVENTS --> 

-

-    <event name="DeviceValuator" number="0">

-	<field type="CARD8" name="device_id" />

-	<field type="CARD16" name="device_state" />

-	<field type="CARD8" name="num_valuators" />

-	<field type="CARD8" name="first_valuator" />

-	<list type="INT32" name="valuators"><value>6</value></list>

-    </event>

-

-    <event name="DeviceKeyPress" number="1">

-	<field type="BYTE" name="detail" />

-	<field type="TIMESTAMP" name="time" />

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

-	<field type="WINDOW" name="event" />

-	<field type="WINDOW" name="child" altenum="Window" />

-	<field type="INT16" name="root_x" />

-	<field type="INT16" name="root_y" />

-	<field type="INT16" name="event_x" />

-	<field type="INT16" name="event_y" />

-	<field type="CARD16" name="state" />

-	<field type="BOOL" name="same_screen" />

-	<field type="CARD8" name="device_id" />

-    </event>

-

-    <eventcopy name="DeviceKeyRelease" number="2" ref="DeviceKeyPress" />

-    <eventcopy name="DeviceButtonPress" number="3" ref="DeviceKeyPress" />

-    <eventcopy name="DeviceButtonRelease" number="4" ref="DeviceKeyPress" />

-    <eventcopy name="DeviceMotionNotify" number="5" ref="DeviceKeyPress" />

-    <eventcopy name="ProximityIn" number="8" ref="DeviceKeyPress" />

-    <eventcopy name="ProximityOut" number="9" ref="DeviceKeyPress" />

-

-    <event name="FocusIn" number="6">

-	<field type="BYTE" name="detail" enum="NotifyDetail" />

-	<field type="TIMESTAMP" name="time" />

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

-	<field type="BYTE" name="mode" enum="NotifyMode" />

-	<field type="CARD8" name="device_id" />

-	<pad bytes="18" />

-    </event>

-

-    <eventcopy name="FocusOut" number="7" ref="FocusIn" />

-

-    <event name="DeviceStateNotify" number="10">

-	<field type="BYTE" name="device_id" />

-	<field type="TIMESTAMP" name="time" />

-	<field type="CARD8" name="num_keys" />

-	<field type="CARD8" name="num_buttons" />

-	<field type="CARD8" name="num_valuators" />

-	<field type="CARD8" name="classes_reported" />

-	<list type="CARD8" name="buttons">

-            <value>4</value>

-	</list>

-	<list type="CARD8" name="keys">

-            <value>4</value>

-	</list>

-	<list type="CARD32" name="valuators">

-	    <value>3</value>

-	</list>

-    </event>

-

-    <event name="DeviceMappingNotify" number="11">

-	<field type="BYTE" name="device_id" />

-	<field type="CARD8" name="request" />

-	<field type="KeyCode" name="first_keycode" />

-	<field type="CARD8" name="count" />

-	<pad bytes="1" />

-	<field type="TIMESTAMP" name="time" />

-	<pad bytes="20" />

-    </event>

-

-    <event name="ChangeDeviceNotify" number="12">

-	<field type="BYTE" name="device_id" />

-	<field type="TIMESTAMP" name="time" />

-	<field type="CARD8" name="request" />

-	<pad bytes="23" />

-    </event>

-

-    <event name="DeviceKeyStateNotify" number="13">

-	<field type="BYTE" name="device_id" />

-	<list type="CARD8" name="keys">

-            <value>28</value>

-	</list>

-    </event>

-

-    <event name="DeviceButtonStateNotify" number="14">

-	<field type="BYTE" name="device_id" />

-	<list type="CARD8" name="buttons">

-            <value>28</value>

-	</list>

-    </event>

-

-    <event name="DevicePresenceNotify" number="15">

-        <pad bytes="1" />

-        <field type="TIMESTAMP" name="time" />

-        <field type="BYTE" name="devchange" />

-        <field type="BYTE" name="device_id" />

-        <field type="CARD16" name="control" />

-	<pad bytes="20" />

-    </event>

-

-    <!-- ERRORS -->

-    <error name="Device" number="0" />

-    <error name="Event" number="1" />

-    <error name="Mode" number="2" />

-    <error name="DeviceBusy" number="3" />

-    <error name="Class" number="4" />

-

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2006 Peter Hutterer 
+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.
+-->
+
+<!-- Spec: http://refspecs.freestandards.org/X11/Xinput.pdf -->
+
+<xcb header="xinput" extension-xname="XInputExtension" extension-name="Input"
+     major-version="1" minor-version="4">
+    <import>xproto</import>
+
+    <typedef oldname="CARD8" newname="KeyCode" />
+    <typedef oldname="CARD32" newname="EventClass" />
+
+    <enum name="ValuatorMode">
+	<item name="Relative"> <value>0</value></item>
+	<item name="Absolute"> <value>1</value></item>
+    </enum>
+
+    <enum name="PropagateMode">
+	<item name="AddToList"> <value>0</value></item>
+	<item name="DeleteFromList"> <value>1</value></item>
+    </enum>
+
+    <!-- GetExtensionVersion -->
+
+    <request name="GetExtensionVersion" opcode="1">
+	<field type="CARD16" name="name_len" />
+	<pad bytes="2" />
+	<list type="char" name="name">
+	    <fieldref>name_len</fieldref>
+	</list>
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD16" name="server_major" />
+	    <field type="CARD16" name="server_minor" />
+	    <field type="BOOL" name="present" />
+	    <pad bytes="19" />
+	</reply>
+    </request>
+
+    <!-- ListInputDevices -->
+
+    <enum name="DeviceUse">
+	<item name="IsXPointer"><value>0</value></item>
+	<item name="IsXKeyboard"><value>1</value></item>
+	<item name="IsXExtensionDevice"><value>2</value></item>
+	<item name="IsXExtensionKeyboard"><value>3</value></item>
+	<item name="IsXExtensionPointer"><value>4</value></item>
+    </enum>
+
+    <struct name="DeviceInfo">
+	<field type="ATOM" name="device_type" />
+	<field type="CARD8" name="device_id" />
+	<field type="CARD8" name="num_class_info" />
+	<field type="CARD8" name="device_use" enum="DeviceUse" />
+	<pad bytes="1" />
+    </struct>
+
+    <request name="ListInputDevices" opcode="2">
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="devices_len" />
+	    <pad bytes="23" />
+	    <list type="DeviceInfo" name="devices">
+		<fieldref>devices_len</fieldref>
+	    </list>
+	    <!-- Uninterpreted: list of deviceinfo structs of 3 the subtypes -->
+	    <!-- Uninterpreted: list of null-terminated strings -->
+	</reply>
+    </request>
+
+    <enum name="InputClass">
+	<item name="Key"><value>0</value></item>
+	<item name="Button"><value>1</value></item>
+	<item name="Valuator"><value>2</value></item>
+	<item name="Feedback"><value>3</value></item>
+	<item name="Proximity"><value>4</value></item>
+	<item name="Focus"><value>5</value></item>
+	<item name="Other"><value>6</value></item>
+    </enum>
+
+    <struct name="InputInfo">
+	<field type="CARD8" name="class_id" enum="InputClass" />
+	<field type="CARD8" name="len" />
+    </struct>
+
+    <struct name="KeyInfo">
+	<field type="CARD8" name="class_id" enum="InputClass" />
+	<field type="CARD8" name="len" />
+	<field type="KeyCode" name="min_keycode" />
+	<field type="KeyCode" name="max_keycode" />
+	<field type="CARD16" name="num_keys" />
+	<pad bytes="2" />
+    </struct>
+
+    <struct name="ButtonInfo">
+	<field type="CARD8" name="class_id" enum="InputClass" />
+	<field type="CARD8" name="len" />
+	<field type="CARD16" name="num_buttons" />
+    </struct>
+
+    <struct name="AxisInfo">
+	<field type="CARD32" name="resolution" />
+	<field type="INT32" name="minimum" />
+	<field type="INT32" name="maximum" />
+    </struct>
+
+    <struct name="ValuatorInfo">
+	<field type="CARD8" name="class_id" enum="InputClass" />
+	<field type="CARD8" name="len" />
+	<field type="CARD8" name="axes_len" />
+	<field type="CARD8" name="mode" enum="ValuatorMode" />
+	<field type="CARD32" name="motion_size" />
+	<list type="AxisInfo" name="axes">
+	    <fieldref>axes_len</fieldref>
+	</list>
+    </struct>
+
+    <!-- OpenDevice -->
+
+    <struct name="InputClassInfo">
+	<field type="CARD8" name="class_id" enum="InputClass" />
+	<field type="CARD8" name="event_type_base" />
+    </struct>
+
+    <request name="OpenDevice" opcode="3">
+	<field type="CARD8" name="device_id" />
+	<pad bytes="3" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="num_classes" />
+	    <pad bytes="23" />
+	    <list type="InputClassInfo" name="class_info">
+		<fieldref>num_classes</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <!-- CloseDevice -->
+
+    <request name="CloseDevice" opcode="4">
+	<field type="CARD8" name="device_id" />
+	<pad bytes="3" />
+    </request>
+
+    <!-- SetDeviceMode -->
+
+    <request name="SetDeviceMode" opcode="5">
+	<field type="CARD8" name="device_id" />
+	<field type="CARD8" name="mode" enum="ValuatorMode" />
+	<pad bytes="2" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="status" altenum="GrabStatus" />
+	    <pad bytes="23" />
+	</reply>
+    </request>
+
+    <!-- SelectExtensionEvent -->
+
+    <request name="SelectExtensionEvent" opcode="6">
+	<field type="WINDOW" name="window" />
+	<field type="CARD16" name="num_classes" />
+	<pad bytes="2" />
+	<list type="EventClass" name="classes">
+	    <fieldref>num_classes</fieldref>
+	</list>
+    </request>
+
+    <!-- GetSelectedExtensionEvents -->
+
+    <request name="GetSelectedExtensionEvents" opcode="7">
+	<field type="WINDOW" name="window" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD16" name="num_this_classes" />
+	    <field type="CARD16" name="num_all_classes" />
+	    <pad bytes="20" />
+	    <list type="EventClass" name="this_classes">
+		<fieldref>num_this_classes</fieldref>
+	    </list>
+	    <list type="EventClass" name="all_classes">
+		<fieldref>num_all_classes</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <!-- ChangeDeviceDontPropagateList -->
+
+    <request name="ChangeDeviceDontPropagateList" opcode="8">
+	<field type="WINDOW" name="window" />
+	<field type="CARD16" name="num_classes" />
+	<field type="CARD8" name="mode" enum="PropagateMode" />
+	<pad bytes="1" />
+	<list type="EventClass" name="classes">
+	    <fieldref>num_classes</fieldref>
+	</list>
+    </request>
+
+    <!-- GetDeviceDontPropagateList -->
+
+    <request name="GetDeviceDontPropagateList" opcode="9">
+	<field type="WINDOW" name="window" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD16" name="num_classes" />
+	    <pad bytes="22" />
+	    <list type="EventClass" name="classes">
+		<fieldref>num_classes</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <!-- GetDeviceMotionEvents -->
+
+    <request name="GetDeviceMotionEvents" opcode="10">
+	<field type="TIMESTAMP" name="start" />
+	<field type="TIMESTAMP" name="stop" altenum="Time" />
+	<field type="CARD8" name="device_id" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD32" name="num_coords" />
+	    <field type="CARD8" name="num_axes" />
+	    <field type="CARD8" name="device_mode" enum="ValuatorMode" />
+	    <pad bytes="18" />
+	    <!-- Uninterpreted: list of DeviceTimeCoord structures -->
+	</reply>
+    </request>
+
+    <struct name="DeviceTimeCoord">
+	<field type="TIMESTAMP" name="time" />
+	<!-- Uninterpreted: list of CARD16 -->
+    </struct>
+
+    <!-- ChangeKeyboardDevice -->
+    <request name="ChangeKeyboardDevice" opcode="11">
+	<field type="CARD8" name="device_id" />
+	<pad bytes="3" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="status" altenum="GrabStatus" />
+	    <pad bytes="23" />
+	</reply>
+    </request>
+
+    <!-- ChangePointerDevice -->
+
+    <request name="ChangePointerDevice" opcode="12">
+	<field type="CARD8" name="x_axis" />
+	<field type="CARD8" name="y_axis" />
+	<field type="CARD8" name="device_id" />
+	<pad bytes="1" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="status" altenum="GrabStatus" />
+	    <pad bytes="23" />
+	</reply>
+    </request>
+
+    <!-- GrabDevice -->
+
+    <request name="GrabDevice" opcode="13">
+	<field type="WINDOW" name="grab_window" />
+	<field type="TIMESTAMP" name="time" altenum="Time" />
+	<field type="CARD16" name="num_classes" />
+	<field type="CARD8" name="this_device_mode" enum="GrabMode" />
+	<field type="CARD8" name="other_device_mode" enum="GrabMode" />
+	<field type="BOOL" name="owner_events" />
+	<field type="CARD8" name="device_id" />
+	<pad bytes="2" />
+	<list type="EventClass" name="classes">
+	    <fieldref>num_classes</fieldref>
+	</list>
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="status" enum="GrabStatus" />
+	    <pad bytes="23" />
+	</reply>
+    </request>
+
+    <!-- UngrabDevice -->
+
+    <request name="UngrabDevice" opcode="14">
+	<field type="TIMESTAMP" name="time" altenum="Time" />
+	<field type="CARD8" name="device_id" />
+    </request>
+
+    <!-- GrabDeviceKey -->
+
+    <request name="GrabDeviceKey" opcode="15">
+	<field type="WINDOW" name="grab_window" />
+	<field type="CARD16" name="num_classes" />
+	<field type="CARD16" name="modifiers" mask="ModMask" />
+	<field type="CARD8" name="modifier_device" />
+	<field type="CARD8" name="grabbed_device" />
+	<field type="CARD8" name="key" altenum="Grab" />
+	<field type="CARD8" name="this_device_mode" enum="GrabMode" />
+	<field type="CARD8" name="other_device_mode" enum="GrabMode" />
+	<field type="BOOL" name="owner_events" />
+	<pad bytes="2" />
+	<list type="EventClass" name="classes">
+	    <fieldref>num_classes</fieldref>
+	</list>
+    </request>
+
+    <!-- UngrabDeviceKey -->
+
+    <request name="UngrabDeviceKey" opcode="16">
+	<field type="WINDOW" name="grabWindow" />
+	<field type="CARD16" name="modifiers" mask="ModMask" />
+	<field type="CARD8" name="modifier_device" />
+	<field type="CARD8" name="key" altenum="Grab" />
+	<field type="CARD8" name="grabbed_device" />
+    </request>
+
+    <!-- GrabDeviceButton -->
+
+    <request name="GrabDeviceButton" opcode="17">
+	<field type="WINDOW" name="grab_window" />
+	<field type="CARD8" name="grabbed_device" />
+	<field type="CARD8" name="modifier_device" />
+	<field type="CARD16" name="num_classes" />
+	<field type="CARD16" name="modifiers" mask="ModMask" />
+	<field type="CARD8" name="this_device_mode" enum="GrabMode" />
+	<field type="CARD8" name="other_device_mode" enum="GrabMode" />
+	<field type="CARD8" name="button" altenum="Grab" />
+	<field type="CARD8" name="owner_events" />
+	<pad bytes="2" />
+	<list type="EventClass" name="classes">
+	    <fieldref>num_classes</fieldref>
+	</list>
+    </request>
+
+    <!-- UngrabDeviceButton -->
+
+    <request name="UngrabDeviceButton" opcode="18">
+	<field type="WINDOW" name="grab_window" />
+	<field type="CARD16" name="modifiers" mask="ModMask" />
+	<field type="CARD8" name="modifier_device" />
+	<field type="CARD8" name="button" altenum="Grab" />
+	<field type="CARD8" name="grabbed_device" />
+    </request>
+
+    <!-- AllowDeviceEvents -->
+
+    <enum name="DeviceInputMode">
+	<item name="AsyncThisDevice" />
+	<item name="SyncThisDevice" />
+	<item name="ReplayThisDevice" />
+	<item name="AsyncOtherDevices" />
+	<item name="AsyncAll" />
+	<item name="SyncAll" />
+    </enum>
+
+    <request name="AllowDeviceEvents" opcode="19">
+	<field type="TIMESTAMP" name="time" altenum="Time" />
+	<field type="CARD8" name="mode" enum="DeviceInputMode" />
+	<field type="CARD8" name="device_id" />
+    </request>
+
+    <!-- GetDeviceFocus -->
+
+    <request name="GetDeviceFocus" opcode="20">
+	<field type="CARD8" name="device_id" />
+	<pad bytes="3" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="WINDOW" name="focus" altenum="InputFocus" />
+	    <field type="TIMESTAMP" name="time" />
+	    <field type="CARD8" name="revert_to" enum="InputFocus" />
+	    <pad bytes="15" />
+	</reply>
+    </request>
+
+    <!-- SetDeviceFocus -->
+
+    <request name="SetDeviceFocus" opcode="21">
+	<field type="WINDOW" name="focus" altenum="InputFocus" />
+	<field type="TIMESTAMP" name="time" altenum="Time" />
+	<field type="CARD8" name="revert_to" enum="InputFocus" />
+	<field type="CARD8" name="device_id" />
+    </request>
+
+    <!-- GetFeedbackControl -->
+
+    <request name="GetFeedbackControl" opcode="22">
+	<field type="CARD8" name="device_id" />
+	<pad bytes="3" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD16" name="num_feedback" />
+	    <pad bytes="22" />
+	    <!-- Uninterpreted: list of FeedbackState structures -->
+	</reply>
+    </request>
+
+    <enum name="FeedbackClass">
+	<item name="Keyboard" />
+	<item name="Pointer" />
+	<item name="String" />
+	<item name="Integer" />
+	<item name="Led" />
+	<item name="Bell" />
+    </enum>
+
+    <struct name="FeedbackState">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+    </struct>
+    
+    <struct name="KbdFeedbackState">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD16" name="pitch" />
+	<field type="CARD16" name="duration" />
+	<field type="CARD32" name="led_mask" />
+	<field type="CARD32" name="led_values" />
+	<field type="BOOL" name="global_auto_repeat" />
+	<field type="CARD8" name="click" />
+	<field type="CARD8" name="percent" />
+	<pad bytes="1" />
+	<list type="CARD8" name="auto_repeats"><value>32</value></list>
+    </struct>
+
+    <struct name="PtrFeedbackState">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+	<pad bytes="2" />
+	<field type="CARD16" name="accel_num" />
+	<field type="CARD16" name="accel_denom" />
+	<field type="CARD16" name="threshold" />
+    </struct>
+
+    <struct name="IntegerFeedbackState">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD32" name="resolution" />
+	<field type="INT32" name="min_value" />
+	<field type="INT32" name="max_value" />
+    </struct>
+
+    <struct name="StringFeedbackState">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD16" name="max_symbols" />
+	<field type="CARD16" name="num_keysyms" />
+	<list type="KEYSYM" name="keysyms">
+	    <fieldref>num_keysyms</fieldref>
+	</list>
+    </struct>
+
+    <struct name="BellFeedbackState">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD8" name="percent" />
+	<pad bytes="3" />
+	<field type="CARD16" name="pitch" />
+	<field type="CARD16" name="duration" />
+    </struct>
+
+    <struct name="LedFeedbackState">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD32" name="led_mask" />
+	<field type="CARD32" name="led_values" />
+    </struct>
+
+    <!-- ChangeFeedbackControl
+
+    <request name="ChangeFeedbackControl" opcode="23">
+	<field type="CARD32" name="mask" />
+	<field type="CARD8" name="device_id" />
+	<field type="CARD8" name="feedback_id" />
+	Uninterpreted: list of FeedbackCtl structures
+    </request>
+
+    -->
+
+    <struct name="FeedbackCtl">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+    </struct>
+
+    <struct name="KbdFeedbackCtl">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+	<field type="KeyCode" name="key" />
+	<field type="CARD8" name="auto_repeat_mode" />
+	<field type="INT8" name="key_click_percent" />
+	<field type="INT8" name="bell_percent" />
+	<field type="INT16" name="bell_pitch" />
+	<field type="INT16" name="bell_duration" />
+	<field type="CARD32" name="led_mask" />
+	<field type="CARD32" name="led_values" />
+    </struct>
+
+    <struct name="PtrFeedbackCtl">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+	<pad bytes="2" />
+	<field type="INT16" name="num" />
+	<field type="INT16" name="denom" />
+	<field type="INT16" name="threshold" />
+    </struct>
+
+    <struct name="IntegerFeedbackCtl">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+	<field type="INT32" name="int_to_display" />
+    </struct>
+
+    <struct name="StringFeedbackCtl">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+	<pad bytes="2" />
+	<field type="CARD16" name="num_keysyms" />
+	<list type="KEYSYM" name="keysyms">
+	    <fieldref>num_keysyms</fieldref>
+	</list>
+    </struct>
+
+    <struct name="BellFeedbackCtl">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+	<field type="INT8" name="percent" />
+	<pad bytes="3" />
+	<field type="INT16" name="pitch" />
+	<field type="INT16" name="duration" />
+    </struct>
+
+    <struct name="LedFeedbackCtl">
+	<field type="CARD8" name="class_id" enum="FeedbackClass" />
+	<field type="CARD8" name="id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD32" name="led_mask" />
+	<field type="CARD32" name="led_values" />
+    </struct>
+
+    <!-- GetDeviceKeyMapping -->
+
+    <request name="GetDeviceKeyMapping" opcode="24">
+	<field type="CARD8" name="device_id" />
+	<field type="KeyCode" name="first_keycode" />
+	<field type="CARD8" name="count" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="keysyms_per_keycode" />
+	    <pad bytes="23" />
+	    <list type="KEYSYM" name="keysyms">
+		<fieldref>length</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <!-- ChangeDeviceKeyMapping -->
+
+    <request name="ChangeDeviceKeyMapping" opcode="25">
+	<field type="CARD8" name="device_id" />
+	<field type="KeyCode" name="first_keycode" />
+	<field type="CARD8" name="keysyms_per_keycode" />
+	<field type="CARD8" name="keycode_count" />
+	<list type="KEYSYM" name="keysyms">
+	    <op op="*">
+		<fieldref>keycode_count</fieldref>
+		<fieldref>keysyms_per_keycode</fieldref>
+	    </op>
+	</list>
+    </request>
+
+    <!-- GetDeviceModifierMapping -->
+
+    <request name="GetDeviceModifierMapping" opcode="26">
+	<field type="CARD8" name="device_id" />
+	<pad bytes="3" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="keycodes_per_modifier" />
+	    <pad bytes="23" />
+	    <list type="CARD8" name="keymaps">
+		<op op="*">
+		    <fieldref>keycodes_per_modifier</fieldref>
+		    <value>8</value>
+		</op>
+	    </list>
+	</reply>
+    </request>
+
+    <!-- SetDeviceModifierMapping -->
+
+    <request name="SetDeviceModifierMapping" opcode="27">
+	<field type="CARD8" name="device_id" />
+	<field type="CARD8" name="keycodes_per_modifier" />
+	<pad bytes="1" />
+	<list type="CARD8" name="keymaps">
+	    <op op="*">
+		<fieldref>keycodes_per_modifier</fieldref>
+		<value>8</value>
+	    </op>
+	</list>
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="status" enum="MappingStatus" />
+	    <pad bytes="23" />
+	</reply>
+    </request>
+
+    <!-- GetDeviceButtonMapping -->
+
+    <request name="GetDeviceButtonMapping" opcode="28">
+	<field type="CARD8" name="device_id" />
+	<pad bytes="3" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="map_size" />
+	    <pad bytes="23" />
+	    <list type="CARD8" name="map">
+		<fieldref>map_size</fieldref>
+	    </list>
+	</reply>
+    </request>
+
+    <!-- SetDeviceButtonMapping -->
+
+    <request name="SetDeviceButtonMapping" opcode="29">
+	<field type="CARD8" name="device_id" />
+	<field type="CARD8" name="map_size" />
+	<pad bytes="2" />
+	<list type="CARD8" name="map">
+	    <fieldref>map_size</fieldref>
+	</list>
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="status" enum="MappingStatus" />
+	    <pad bytes="23" />
+	</reply>
+    </request>
+
+    <!-- QueryDeviceState -->
+
+    <request name="QueryDeviceState" opcode="30">
+	<field type="CARD8" name="device_id" />
+	<pad bytes="3" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="num_classes" />
+	    <pad bytes="23" />
+	    <!-- Uninterpreted: list of InputState structures -->
+	</reply>
+    </request>
+
+    <struct name="InputState">
+	<field type="CARD8" name="class_id" enum="InputClass" />
+	<field type="CARD8" name="len" />
+	<field type="CARD8" name="num_items" />
+    </struct>
+
+    <struct name="KeyState">
+	<field type="CARD8" name="class_id" enum="InputClass" />
+	<field type="CARD8" name="len" />
+	<field type="CARD8" name="num_keys" />
+	<pad bytes="1" />
+	<list type="CARD8" name="keys">
+	    <value>32</value>
+	</list>
+    </struct>
+
+    <struct name="ButtonState">
+	<field type="CARD8" name="class_id" enum="InputClass" />
+	<field type="CARD8" name="len" />
+	<field type="CARD8" name="num_buttons" />
+	<pad bytes="1" />
+	<list type="CARD8" name="buttons">
+	    <value>32</value>
+	</list>
+    </struct>
+
+    <struct name="ValuatorState">
+	<field type="CARD8" name="class_id" enum="InputClass" />
+	<field type="CARD8" name="len" />
+	<field type="CARD8" name="num_valuators" />
+	<field type="CARD8" name="mode" />
+	<list type="CARD32" name="valuators">
+	    <fieldref>num_valuators</fieldref>
+	</list>
+    </struct>
+
+    <!-- SendExtensionEvent -->
+
+    <request name="SendExtensionEvent" opcode="31">
+	<field type="WINDOW" name="destination" />
+	<field type="CARD8" name="device_id" />
+	<field type="BOOL" name="propagate" />
+	<field type="CARD16" name="num_classes" />
+	<field type="CARD8" name="num_events" />
+	<pad bytes="3" />
+	<list type="char" name="events">
+	    <op op="*">
+		<fieldref>num_events</fieldref>
+		<value>32</value>
+	    </op>
+	</list>
+	<list type="EventClass" name="classes">
+	    <fieldref>num_classes</fieldref>
+	</list>
+    </request>
+
+    <!-- DeviceBell -->
+
+    <request name="DeviceBell" opcode="32">
+	<field type="CARD8" name="device_id" />
+	<field type="CARD8" name="feedback_id" />
+	<field type="CARD8" name="feedback_class" />
+	<field type="INT8" name="percent" />
+    </request>
+
+    <!-- SetDeviceValuators -->
+
+    <request name="SetDeviceValuators" opcode="33">
+	<field type="CARD8" name="device_id" />
+	<field type="CARD8" name="first_valuator" />
+	<field type="CARD8" name="num_valuators" />
+	<pad bytes="1" />
+	<list type="INT32" name="valuators">
+	    <fieldref>num_valuators</fieldref>
+	</list>
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="status" enum="GrabStatus" />
+	    <pad bytes="23" />
+	</reply>
+    </request>
+
+    <!-- GetDeviceControl -->
+
+    <request name="GetDeviceControl" opcode="34">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD8" name="device_id" />
+	<pad bytes="1" />
+	<reply>
+	    <pad bytes="1" />
+	    <field type="CARD8" name="status" altenum="GrabStatus" />
+	    <pad bytes="23" />
+	    <!-- Uninterpreted: list of DeviceState structures -->
+	</reply>
+    </request>
+
+    <struct name="DeviceState">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD16" name="len" />
+    </struct>
+
+    <struct name="DeviceResolutionState">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD32" name="num_valuators" />
+	<list type="CARD32" name="resolution_values">
+	    <fieldref>num_valuators</fieldref>
+	</list>
+	<list type="CARD32" name="resolution_min">
+	    <fieldref>num_valuators</fieldref>
+	</list>
+	<list type="CARD32" name="resolution_max">
+	    <fieldref>num_valuators</fieldref>
+	</list>
+    </struct>
+
+    <struct name="DeviceAbsCalibState">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD16" name="len" />
+	<field type="INT32" name="min_x" />
+	<field type="INT32" name="max_x" />
+	<field type="INT32" name="min_y" />
+	<field type="INT32" name="max_y" />
+	<field type="CARD32" name="flip_x" />
+	<field type="CARD32" name="flip_y" />
+	<field type="CARD32" name="rotation" />
+	<field type="CARD32" name="button_threshold" />
+    </struct>
+
+    <struct name="DeviceAbsAreaState">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD32" name="offset_x" />
+	<field type="CARD32" name="offset_y" />
+	<field type="CARD32" name="width" />
+	<field type="CARD32" name="height" />
+	<field type="CARD32" name="screen" />
+	<field type="CARD32" name="following" />
+    </struct>
+
+    <struct name="DeviceCoreState">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD8" name="status" />
+	<field type="CARD8" name="iscore" />
+	<pad bytes="2" />
+    </struct>
+
+    <struct name="DeviceEnableState">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD8" name="enable" />
+	<pad bytes="3" />
+    </struct>
+
+    <!-- ChangeDeviceControl
+
+    <request name="ChangeDeviceControl" opcode="35">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD8" name="device_id" />
+	<pad bytes="1" />
+	Uninterpreted: list of DeviceCtl structures
+	<reply>
+            <pad byte="1" />
+            <field type="CARD8" name="status" altenum="GrabStatus" />
+            <pad bytes="23" />
+	</reply>
+    </request>
+
+    -->
+
+    <struct name="DeviceCtl">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD16" name="len" />
+    </struct>
+
+    <struct name="DeviceResolutionCtl">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD8" name="first_valuator" />
+	<field type="CARD8" name="num_valuators" />
+	<list type="CARD32" name="resolution_values">
+	    <fieldref>num_valuators</fieldref>
+	</list>
+    </struct>
+
+    <struct name="DeviceAbsCalibCtl">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD16" name="len" />
+	<field type="INT32" name="min_x" />
+	<field type="INT32" name="max_x" />
+	<field type="INT32" name="min_y" />
+	<field type="INT32" name="max_y" />
+	<field type="CARD32" name="flip_x" />
+	<field type="CARD32" name="flip_y" />
+	<field type="CARD32" name="rotation" />
+	<field type="CARD32" name="button_threshold" />
+    </struct>
+
+    <struct name="DeviceAbsAreaCtrl">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD32" name="offset_x" />
+	<field type="CARD32" name="offset_y" />
+	<field type="INT32" name="width" />
+	<field type="INT32" name="height" />
+	<field type="INT32" name="screen" />
+	<field type="CARD32" name="following" />
+    </struct>
+
+    <struct name="DeviceCoreCtrl">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD8" name="status" />
+	<pad bytes="3" />
+    </struct>
+
+    <struct name="DeviceEnableCtrl">
+	<field type="CARD16" name="control_id" />
+	<field type="CARD16" name="len" />
+	<field type="CARD8" name="enable" />
+	<pad bytes="3" />
+    </struct>
+
+    <!-- EVENTS --> 
+
+    <event name="DeviceValuator" number="0">
+	<field type="CARD8" name="device_id" />
+	<field type="CARD16" name="device_state" />
+	<field type="CARD8" name="num_valuators" />
+	<field type="CARD8" name="first_valuator" />
+	<list type="INT32" name="valuators"><value>6</value></list>
+    </event>
+
+    <event name="DeviceKeyPress" number="1">
+	<field type="BYTE" name="detail" />
+	<field type="TIMESTAMP" name="time" />
+	<field type="WINDOW" name="root" />
+	<field type="WINDOW" name="event" />
+	<field type="WINDOW" name="child" altenum="Window" />
+	<field type="INT16" name="root_x" />
+	<field type="INT16" name="root_y" />
+	<field type="INT16" name="event_x" />
+	<field type="INT16" name="event_y" />
+	<field type="CARD16" name="state" />
+	<field type="BOOL" name="same_screen" />
+	<field type="CARD8" name="device_id" />
+    </event>
+
+    <eventcopy name="DeviceKeyRelease" number="2" ref="DeviceKeyPress" />
+    <eventcopy name="DeviceButtonPress" number="3" ref="DeviceKeyPress" />
+    <eventcopy name="DeviceButtonRelease" number="4" ref="DeviceKeyPress" />
+    <eventcopy name="DeviceMotionNotify" number="5" ref="DeviceKeyPress" />
+    <eventcopy name="ProximityIn" number="8" ref="DeviceKeyPress" />
+    <eventcopy name="ProximityOut" number="9" ref="DeviceKeyPress" />
+
+    <event name="FocusIn" number="6">
+	<field type="BYTE" name="detail" enum="NotifyDetail" />
+	<field type="TIMESTAMP" name="time" />
+	<field type="WINDOW" name="window" />
+	<field type="BYTE" name="mode" enum="NotifyMode" />
+	<field type="CARD8" name="device_id" />
+	<pad bytes="18" />
+    </event>
+
+    <eventcopy name="FocusOut" number="7" ref="FocusIn" />
+
+    <event name="DeviceStateNotify" number="10">
+	<field type="BYTE" name="device_id" />
+	<field type="TIMESTAMP" name="time" />
+	<field type="CARD8" name="num_keys" />
+	<field type="CARD8" name="num_buttons" />
+	<field type="CARD8" name="num_valuators" />
+	<field type="CARD8" name="classes_reported" />
+	<list type="CARD8" name="buttons">
+            <value>4</value>
+	</list>
+	<list type="CARD8" name="keys">
+            <value>4</value>
+	</list>
+	<list type="CARD32" name="valuators">
+	    <value>3</value>
+	</list>
+    </event>
+
+    <event name="DeviceMappingNotify" number="11">
+	<field type="BYTE" name="device_id" />
+	<field type="CARD8" name="request" />
+	<field type="KeyCode" name="first_keycode" />
+	<field type="CARD8" name="count" />
+	<pad bytes="1" />
+	<field type="TIMESTAMP" name="time" />
+	<pad bytes="20" />
+    </event>
+
+    <event name="ChangeDeviceNotify" number="12">
+	<field type="BYTE" name="device_id" />
+	<field type="TIMESTAMP" name="time" />
+	<field type="CARD8" name="request" />
+	<pad bytes="23" />
+    </event>
+
+    <event name="DeviceKeyStateNotify" number="13">
+	<field type="BYTE" name="device_id" />
+	<list type="CARD8" name="keys">
+            <value>28</value>
+	</list>
+    </event>
+
+    <event name="DeviceButtonStateNotify" number="14">
+	<field type="BYTE" name="device_id" />
+	<list type="CARD8" name="buttons">
+            <value>28</value>
+	</list>
+    </event>
+
+    <event name="DevicePresenceNotify" number="15">
+        <pad bytes="1" />
+        <field type="TIMESTAMP" name="time" />
+        <field type="BYTE" name="devchange" />
+        <field type="BYTE" name="device_id" />
+        <field type="CARD16" name="control" />
+	<pad bytes="20" />
+    </event>
+
+    <!-- ERRORS -->
+    <error name="Device" number="0" />
+    <error name="Event" number="1" />
+    <error name="Mode" number="2" />
+    <error name="DeviceBusy" number="3" />
+    <error name="Class" number="4" />
+
+</xcb>
diff --git a/libxcb/xcb-proto/src/xprint.xml b/libxcb/xcb-proto/src/xprint.xml
index 4107e96e5..ffd8df1ea 100644
--- a/libxcb/xcb-proto/src/xprint.xml
+++ b/libxcb/xcb-proto/src/xprint.xml
@@ -1,329 +1,329 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2005 Jeremy Kolb.

-All Rights Reserved.

-

-Permission is hereby granted, free of charge, to any person ob/Sintaining 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="xprint" extension-xname="XpExtension" extension-name="XPrint"

-    extension-multiword="true" major-version="1" minor-version="0">

-

-    <!-- Conforms to XPRINT 1.0 -->

-

-    <import>xproto</import>

-    

-    <typedef oldname="char" newname="STRING8" />

-

-    <!-- Types -->

-    <struct name="PRINTER">

-        <field type="CARD32" name="nameLen" />

-        <list type="STRING8" name="name">

-            <fieldref>nameLen</fieldref>

-        </list>

-        <!-- Padding -->

-        <field type="CARD32" name="descLen" />

-        <list type="STRING8" name="description">

-            <fieldref>descLen</fieldref>

-        </list>

-        <!-- More padding -->

-    </struct>

-

-    <!--<typedef oldname="CARD32" newname="PCONTEXT" />-->

-    <xidtype name="PCONTEXT" />

-

-    <!-- "PrintGetDocumentData" -->

-    <enum name="GetDoc">

-        <item name="Finished"><value>0</value></item>

-            <item name="SecondConsumer"><value>1</value></item>

-    </enum>

-

-    <!-- Event Mask ("PrintSelectInput") -->

-    <enum name="EvMask">

-        <item name="NoEventMask"><value>0</value></item>

-        <item name="PrintMask"><bit>0</bit></item>

-        <item name="AttributeMask"><bit>1</bit></item>

-    </enum>

-

-    <!-- "PrintNotify" detail -->

-    <enum name="Detail">

-        <item name="StartJobNotify"><value>1</value></item>

-        <item name="EndJobNotify"><value>2</value></item>

-        <item name="StartDocNotify"><value>3</value></item>

-        <item name="EndDocNotify"><value>4</value></item>

-        <item name="StartPageNotify"><value>5</value></item>

-        <item name="EndPageNotify"><value>6</value></item>

-    </enum>

-

-    <!-- "AttributeNotify" detail -->

-    <enum name="Attr">

-        <item name="JobAttr"><value>1</value></item>

-        <item name="DocAttr"><value>2</value></item>

-        <item name="PageAttr"><value>3</value></item>

-        <item name="PrinterAttr"><value>4</value></item>

-        <item name="ServerAttr"><value>5</value></item>

-        <item name="MediumAttr"><value>6</value></item>

-        <item name="SpoolerAttr"><value>7</value></item>

-    </enum>

-    

-    

-    <!-- Requests -->

-    <request name="PrintQueryVersion" opcode="0">

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD16" name="major_version" />

-            <field type="CARD16" name="minor_version" />

-        </reply>

-    </request>

-

-    <request name="PrintGetPrinterList" opcode="1">

-        <field type="CARD32" name="printerNameLen" />

-        <field type="CARD32" name="localeLen" />

-        <list type="STRING8" name="printer_name">

-            <fieldref>printerNameLen</fieldref>

-        </list>

-        <!-- There's some padding in here... -->

-        <list type="STRING8" name="locale">

-            <fieldref>localeLen</fieldref>

-        </list>

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="listCount" />

-            <pad bytes="20" />

-            <list type="PRINTER" name="printers">

-                <fieldref>listCount</fieldref>

-            </list>

-        </reply>

-    </request>

-

-    <request name="PrintRehashPrinterList" opcode="20" />

-

-    <request name="CreateContext" opcode="2">

-        <field type="CARD32" name="context_id" />

-        <field type="CARD32" name="printerNameLen" />

-        <field type="CARD32" name="localeLen" />

-        <list type="STRING8" name="printerName">

-            <fieldref>printerNameLen</fieldref>

-        </list>

-        <!-- padding -->

-        <list type="STRING8" name="locale">

-            <fieldref>localeLen</fieldref>

-        </list>

-    </request>

-

-    <request name="PrintSetContext" opcode="3">

-        <field type="CARD32" name="context" />

-    </request>

-

-    <request name="PrintGetContext" opcode="4">

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="context" />

-        </reply>

-    </request>

-

-    <request name="PrintDestroyContext" opcode="5">

-        <field type="CARD32" name="context" />

-    </request>

-

-    <request name="PrintGetScreenOfContext" opcode="6">

-        <reply>

-            <pad bytes="1" />

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

-        </reply>

-    </request>

-

-    <request name="PrintStartJob" opcode="7">

-        <field type="CARD8" name="output_mode"/>

-    </request>

-

-    <request name="PrintEndJob" opcode="8">

-        <field type="BOOL"  name="cancel" />

-    </request>

-

-    <request name="PrintStartDoc" opcode="9">

-        <field type="CARD8" name="driver_mode" />

-    </request>

-

-    <request name="PrintEndDoc" opcode="10">

-        <field type="BOOL" name="cancel" />

-    </request>

-

-    <request name="PrintPutDocumentData" opcode="11">

-        <field type="DRAWABLE" name="drawable" />

-        <field type="CARD32" name="len_data" />

-        <field type="CARD16" name="len_fmt" />

-        <field type="CARD16" name="len_options" />

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

-            <fieldref>len_data</fieldref>

-        </list>

-        <!-- padding -->

-        <list type="STRING8" name="doc_format" />

-        <!-- padding -->

-        <list type="STRING8" name="options" />

-    </request>

-

-    <request name="PrintGetDocumentData" opcode="12">

-        <field type="PCONTEXT" name="context" />

-        <field type="CARD32" name="max_bytes" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="status_code" />

-            <field type="CARD32" name="finished_flag" />

-            <field type="CARD32" name="dataLen" />

-            <pad bytes="12" />

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

-                <fieldref>dataLen</fieldref>

-            </list>

-        </reply>

-    </request>

-

-    <request name="PrintStartPage" opcode="13">

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

-    </request>

-

-    <request name="PrintEndPage" opcode="14">

-        <field type="BOOL" name="cancel" />

-        <pad bytes="3" />

-    </request>

-

-    <request name="PrintSelectInput" opcode="15">

-        <field type="PCONTEXT" name="context" />

-        <valueparam value-mask-type="CARD32"

-                    value-mask-name="event_mask"

-                    value-list-name="event_list" />

-    </request>

-

-    <request name="PrintInputSelected" opcode="16">

-        <field type="PCONTEXT" name="context" />

-        <reply>

-            <pad bytes="1" />

-            <valueparam value-mask-type="CARD32"

-                            value-mask-name="event_mask"

-                            value-list-name="event_list" />

-            <valueparam value-mask-type="CARD32"

-                            value-mask-name="all_events_mask"

-                            value-list-name="all_events_list" />

-        </reply>

-    </request>

-

-    <request name="PrintGetAttributes" opcode="17">

-        <field type="PCONTEXT" name="context" />

-        <field type="CARD8" name="pool" />

-        <pad bytes="3" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="stringLen" />

-            <pad bytes="20" />

-            <field type="STRING8" name="attributes" />

-        </reply>

-    </request>

-

-    <request name="PrintGetOneAttributes" opcode="19">

-        <field type="PCONTEXT" name="context" />

-        <field type="CARD32" name="nameLen" />

-        <field type="CARD8" name="pool" />

-        <pad bytes="3" />

-        <list type="STRING8" name="name">

-            <fieldref>nameLen</fieldref>

-        </list>

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="valueLen" />

-            <pad bytes="20" />

-            <list type="STRING8" name="value">

-                <fieldref>valueLen</fieldref>

-            </list>

-        </reply>

-    </request>

-

-    <request name="PrintSetAttributes" opcode="18">

-        <field type="PCONTEXT" name="context" />

-        <field type="CARD32" name="stringLen" />

-        <field type="CARD8" name="pool" />

-        <field type="CARD8" name="rule" />

-        <pad bytes="2" />

-        <list type="STRING8" name="attributes" />

-    </request>

-

-    <request name="PrintGetPageDimensions" opcode="21">

-        <field type="PCONTEXT" name="context" />

-        <reply>

-            <pad bytes="1" />

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

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

-            <field type="CARD16" name="offset_x" />

-            <field type="CARD16" name="offset_y" />

-            <field type="CARD16" name="reproducible_width" />

-            <field type="CARD16" name="reproducible_height" />

-        </reply>

-    </request>

-

-    <request name="PrintQueryScreens" opcode="22">

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="listCount" />

-            <pad bytes="20" />

-            <list type="WINDOW" name="roots">

-                <fieldref>listCount</fieldref>

-            </list>

-            <!-- There may be a WINDOW rootWindow here... -->

-        </reply>

-    </request>

-

-    <request name="PrintSetImageResolution" opcode="23">

-        <field type="PCONTEXT" name="context" />

-        <field type="CARD16" name="image_resolution" />

-        <reply>

-            <field type="BOOL" name="status" />

-            <field type="CARD16" name="previous_resolutions" />

-        </reply>

-    </request>

-

-    <request name="PrintGetImageResolution" opcode="24">

-        <field type="PCONTEXT" name="context" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD16" name="image_resolution" />

-        </reply>

-    </request>

-

-

-    <!-- Events -->

-    <event name="Notify" number="0">

-        <field type="CARD8" name="detail" />

-        <field type="PCONTEXT" name="context" />

-        <field type="BOOL" name="cancel" />

-    </event>

-

-    <event name="AttributNotify" number="1">

-        <field type="CARD8" name="detail" />

-        <field type="PCONTEXT" name="context" />

-    </event>

-

-    <!-- Errors -->

-    <error name="BadContext" number="0" />

-    <error name="BadSequence" number="1" />

-

-</xcb>

-

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2005 Jeremy Kolb.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person ob/Sintaining 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="xprint" extension-xname="XpExtension" extension-name="XPrint"
+    extension-multiword="true" major-version="1" minor-version="0">
+
+    <!-- Conforms to XPRINT 1.0 -->
+
+    <import>xproto</import>
+    
+    <typedef oldname="char" newname="STRING8" />
+
+    <!-- Types -->
+    <struct name="PRINTER">
+        <field type="CARD32" name="nameLen" />
+        <list type="STRING8" name="name">
+            <fieldref>nameLen</fieldref>
+        </list>
+        <!-- Padding -->
+        <field type="CARD32" name="descLen" />
+        <list type="STRING8" name="description">
+            <fieldref>descLen</fieldref>
+        </list>
+        <!-- More padding -->
+    </struct>
+
+    <!--<typedef oldname="CARD32" newname="PCONTEXT" />-->
+    <xidtype name="PCONTEXT" />
+
+    <!-- "PrintGetDocumentData" -->
+    <enum name="GetDoc">
+        <item name="Finished"><value>0</value></item>
+            <item name="SecondConsumer"><value>1</value></item>
+    </enum>
+
+    <!-- Event Mask ("PrintSelectInput") -->
+    <enum name="EvMask">
+        <item name="NoEventMask"><value>0</value></item>
+        <item name="PrintMask"><bit>0</bit></item>
+        <item name="AttributeMask"><bit>1</bit></item>
+    </enum>
+
+    <!-- "PrintNotify" detail -->
+    <enum name="Detail">
+        <item name="StartJobNotify"><value>1</value></item>
+        <item name="EndJobNotify"><value>2</value></item>
+        <item name="StartDocNotify"><value>3</value></item>
+        <item name="EndDocNotify"><value>4</value></item>
+        <item name="StartPageNotify"><value>5</value></item>
+        <item name="EndPageNotify"><value>6</value></item>
+    </enum>
+
+    <!-- "AttributeNotify" detail -->
+    <enum name="Attr">
+        <item name="JobAttr"><value>1</value></item>
+        <item name="DocAttr"><value>2</value></item>
+        <item name="PageAttr"><value>3</value></item>
+        <item name="PrinterAttr"><value>4</value></item>
+        <item name="ServerAttr"><value>5</value></item>
+        <item name="MediumAttr"><value>6</value></item>
+        <item name="SpoolerAttr"><value>7</value></item>
+    </enum>
+    
+    
+    <!-- Requests -->
+    <request name="PrintQueryVersion" opcode="0">
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD16" name="major_version" />
+            <field type="CARD16" name="minor_version" />
+        </reply>
+    </request>
+
+    <request name="PrintGetPrinterList" opcode="1">
+        <field type="CARD32" name="printerNameLen" />
+        <field type="CARD32" name="localeLen" />
+        <list type="STRING8" name="printer_name">
+            <fieldref>printerNameLen</fieldref>
+        </list>
+        <!-- There's some padding in here... -->
+        <list type="STRING8" name="locale">
+            <fieldref>localeLen</fieldref>
+        </list>
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="listCount" />
+            <pad bytes="20" />
+            <list type="PRINTER" name="printers">
+                <fieldref>listCount</fieldref>
+            </list>
+        </reply>
+    </request>
+
+    <request name="PrintRehashPrinterList" opcode="20" />
+
+    <request name="CreateContext" opcode="2">
+        <field type="CARD32" name="context_id" />
+        <field type="CARD32" name="printerNameLen" />
+        <field type="CARD32" name="localeLen" />
+        <list type="STRING8" name="printerName">
+            <fieldref>printerNameLen</fieldref>
+        </list>
+        <!-- padding -->
+        <list type="STRING8" name="locale">
+            <fieldref>localeLen</fieldref>
+        </list>
+    </request>
+
+    <request name="PrintSetContext" opcode="3">
+        <field type="CARD32" name="context" />
+    </request>
+
+    <request name="PrintGetContext" opcode="4">
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="context" />
+        </reply>
+    </request>
+
+    <request name="PrintDestroyContext" opcode="5">
+        <field type="CARD32" name="context" />
+    </request>
+
+    <request name="PrintGetScreenOfContext" opcode="6">
+        <reply>
+            <pad bytes="1" />
+            <field type="WINDOW" name="root" />
+        </reply>
+    </request>
+
+    <request name="PrintStartJob" opcode="7">
+        <field type="CARD8" name="output_mode"/>
+    </request>
+
+    <request name="PrintEndJob" opcode="8">
+        <field type="BOOL"  name="cancel" />
+    </request>
+
+    <request name="PrintStartDoc" opcode="9">
+        <field type="CARD8" name="driver_mode" />
+    </request>
+
+    <request name="PrintEndDoc" opcode="10">
+        <field type="BOOL" name="cancel" />
+    </request>
+
+    <request name="PrintPutDocumentData" opcode="11">
+        <field type="DRAWABLE" name="drawable" />
+        <field type="CARD32" name="len_data" />
+        <field type="CARD16" name="len_fmt" />
+        <field type="CARD16" name="len_options" />
+        <list type="BYTE" name="data">
+            <fieldref>len_data</fieldref>
+        </list>
+        <!-- padding -->
+        <list type="STRING8" name="doc_format" />
+        <!-- padding -->
+        <list type="STRING8" name="options" />
+    </request>
+
+    <request name="PrintGetDocumentData" opcode="12">
+        <field type="PCONTEXT" name="context" />
+        <field type="CARD32" name="max_bytes" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="status_code" />
+            <field type="CARD32" name="finished_flag" />
+            <field type="CARD32" name="dataLen" />
+            <pad bytes="12" />
+            <list type="BYTE" name="data">
+                <fieldref>dataLen</fieldref>
+            </list>
+        </reply>
+    </request>
+
+    <request name="PrintStartPage" opcode="13">
+        <field type="WINDOW" name="window" />
+    </request>
+
+    <request name="PrintEndPage" opcode="14">
+        <field type="BOOL" name="cancel" />
+        <pad bytes="3" />
+    </request>
+
+    <request name="PrintSelectInput" opcode="15">
+        <field type="PCONTEXT" name="context" />
+        <valueparam value-mask-type="CARD32"
+                    value-mask-name="event_mask"
+                    value-list-name="event_list" />
+    </request>
+
+    <request name="PrintInputSelected" opcode="16">
+        <field type="PCONTEXT" name="context" />
+        <reply>
+            <pad bytes="1" />
+            <valueparam value-mask-type="CARD32"
+                            value-mask-name="event_mask"
+                            value-list-name="event_list" />
+            <valueparam value-mask-type="CARD32"
+                            value-mask-name="all_events_mask"
+                            value-list-name="all_events_list" />
+        </reply>
+    </request>
+
+    <request name="PrintGetAttributes" opcode="17">
+        <field type="PCONTEXT" name="context" />
+        <field type="CARD8" name="pool" />
+        <pad bytes="3" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="stringLen" />
+            <pad bytes="20" />
+            <field type="STRING8" name="attributes" />
+        </reply>
+    </request>
+
+    <request name="PrintGetOneAttributes" opcode="19">
+        <field type="PCONTEXT" name="context" />
+        <field type="CARD32" name="nameLen" />
+        <field type="CARD8" name="pool" />
+        <pad bytes="3" />
+        <list type="STRING8" name="name">
+            <fieldref>nameLen</fieldref>
+        </list>
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="valueLen" />
+            <pad bytes="20" />
+            <list type="STRING8" name="value">
+                <fieldref>valueLen</fieldref>
+            </list>
+        </reply>
+    </request>
+
+    <request name="PrintSetAttributes" opcode="18">
+        <field type="PCONTEXT" name="context" />
+        <field type="CARD32" name="stringLen" />
+        <field type="CARD8" name="pool" />
+        <field type="CARD8" name="rule" />
+        <pad bytes="2" />
+        <list type="STRING8" name="attributes" />
+    </request>
+
+    <request name="PrintGetPageDimensions" opcode="21">
+        <field type="PCONTEXT" name="context" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD16" name="width" />
+            <field type="CARD16" name="height" />
+            <field type="CARD16" name="offset_x" />
+            <field type="CARD16" name="offset_y" />
+            <field type="CARD16" name="reproducible_width" />
+            <field type="CARD16" name="reproducible_height" />
+        </reply>
+    </request>
+
+    <request name="PrintQueryScreens" opcode="22">
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="listCount" />
+            <pad bytes="20" />
+            <list type="WINDOW" name="roots">
+                <fieldref>listCount</fieldref>
+            </list>
+            <!-- There may be a WINDOW rootWindow here... -->
+        </reply>
+    </request>
+
+    <request name="PrintSetImageResolution" opcode="23">
+        <field type="PCONTEXT" name="context" />
+        <field type="CARD16" name="image_resolution" />
+        <reply>
+            <field type="BOOL" name="status" />
+            <field type="CARD16" name="previous_resolutions" />
+        </reply>
+    </request>
+
+    <request name="PrintGetImageResolution" opcode="24">
+        <field type="PCONTEXT" name="context" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD16" name="image_resolution" />
+        </reply>
+    </request>
+
+
+    <!-- Events -->
+    <event name="Notify" number="0">
+        <field type="CARD8" name="detail" />
+        <field type="PCONTEXT" name="context" />
+        <field type="BOOL" name="cancel" />
+    </event>
+
+    <event name="AttributNotify" number="1">
+        <field type="CARD8" name="detail" />
+        <field type="PCONTEXT" name="context" />
+    </event>
+
+    <!-- Errors -->
+    <error name="BadContext" number="0" />
+    <error name="BadSequence" number="1" />
+
+</xcb>
+
diff --git a/libxcb/xcb-proto/src/xselinux.xml b/libxcb/xcb-proto/src/xselinux.xml
index 2031fec57..7751470ca 100644
--- a/libxcb/xcb-proto/src/xselinux.xml
+++ b/libxcb/xcb-proto/src/xselinux.xml
@@ -1,276 +1,276 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-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="xselinux" extension-xname="SELinux" extension-name="SELinux"

-     extension-multiword="false" major-version="1" minor-version="0">

-  <import>xproto</import>

-

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

-    <field type="CARD8" name="client_major" />

-    <field type="CARD8" name="client_minor" />

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD16" name="server_major" />

-      <field type="CARD16" name="server_minor" />

-    </reply>

-  </request>

-

-  <request name="SetDeviceCreateContext" opcode="1">

-    <field type="CARD32" name="context_len" />

-    <list type="char" name="context">

-      <fieldref>context_len</fieldref>

-    </list>

-  </request>

-

-  <request name="GetDeviceCreateContext" opcode="2">

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="SetDeviceContext" opcode="3">

-    <field type="CARD32" name="device" />

-    <field type="CARD32" name="context_len" />

-    <list type="char" name="context">

-      <fieldref>context_len</fieldref>

-    </list>

-  </request>

-

-  <request name="GetDeviceContext" opcode="4">

-    <field type="CARD32" name="device" />

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="SetWindowCreateContext" opcode="5">

-    <field type="CARD32" name="context_len" />

-    <list type="char" name="context">

-      <fieldref>context_len</fieldref>

-    </list>

-  </request>

-

-  <request name="GetWindowCreateContext" opcode="6">

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="GetWindowContext" opcode="7">

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

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <struct name="ListItem">

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

-    <field type="CARD32" name="object_context_len" />

-    <field type="CARD32" name="data_context_len" />

-    <list type="char" name="object_context">

-      <fieldref>object_context_len</fieldref>

-    </list>

-    <list type="char" name="data_context">

-      <fieldref>data_context_len</fieldref>

-    </list>

-  </struct>

-

-  <request name="SetPropertyCreateContext" opcode="8">

-    <field type="CARD32" name="context_len" />

-    <list type="char" name="context">

-      <fieldref>context_len</fieldref>

-    </list>

-  </request>

-

-  <request name="GetPropertyCreateContext" opcode="9">

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="SetPropertyUseContext" opcode="10">

-    <field type="CARD32" name="context_len" />

-    <list type="char" name="context">

-      <fieldref>context_len</fieldref>

-    </list>

-  </request>

-

-  <request name="GetPropertyUseContext" opcode="11">

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="GetPropertyContext" opcode="12">

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

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

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="GetPropertyDataContext" opcode="13">

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

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

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="ListProperties" opcode="14">

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

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="properties_len" />

-      <pad bytes="20" />

-      <list type="ListItem" name="properties">

-	<fieldref>properties_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="SetSelectionCreateContext" opcode="15">

-    <field type="CARD32" name="context_len" />

-    <list type="char" name="context">

-      <fieldref>context_len</fieldref>

-    </list>

-  </request>

-

-  <request name="GetSelectionCreateContext" opcode="16">

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="SetSelectionUseContext" opcode="17">

-    <field type="CARD32" name="context_len" />

-    <list type="char" name="context">

-      <fieldref>context_len</fieldref>

-    </list>

-  </request>

-

-  <request name="GetSelectionUseContext" opcode="18">

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="GetSelectionContext" opcode="19">

-    <field type="ATOM" name="selection" />

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="GetSelectionDataContext" opcode="20">

-    <field type="ATOM" name="selection" />

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="ListSelections" opcode="21">

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="selections_len" />

-      <pad bytes="20" />

-      <list type="ListItem" name="selections">

-	<fieldref>selections_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-  <request name="GetClientContext" opcode="22">

-    <field type="CARD32" name="resource" />

-    <reply>

-      <pad bytes="1" />

-      <field type="CARD32" name="context_len" />

-      <pad bytes="20" />

-      <list type="char" name="context">

-	<fieldref>context_len</fieldref>

-      </list>

-    </reply>

-  </request>

-

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+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="xselinux" extension-xname="SELinux" extension-name="SELinux"
+     extension-multiword="false" major-version="1" minor-version="0">
+  <import>xproto</import>
+
+  <request name="QueryVersion" opcode="0">
+    <field type="CARD8" name="client_major" />
+    <field type="CARD8" name="client_minor" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="server_major" />
+      <field type="CARD16" name="server_minor" />
+    </reply>
+  </request>
+
+  <request name="SetDeviceCreateContext" opcode="1">
+    <field type="CARD32" name="context_len" />
+    <list type="char" name="context">
+      <fieldref>context_len</fieldref>
+    </list>
+  </request>
+
+  <request name="GetDeviceCreateContext" opcode="2">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="SetDeviceContext" opcode="3">
+    <field type="CARD32" name="device" />
+    <field type="CARD32" name="context_len" />
+    <list type="char" name="context">
+      <fieldref>context_len</fieldref>
+    </list>
+  </request>
+
+  <request name="GetDeviceContext" opcode="4">
+    <field type="CARD32" name="device" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="SetWindowCreateContext" opcode="5">
+    <field type="CARD32" name="context_len" />
+    <list type="char" name="context">
+      <fieldref>context_len</fieldref>
+    </list>
+  </request>
+
+  <request name="GetWindowCreateContext" opcode="6">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="GetWindowContext" opcode="7">
+    <field type="WINDOW" name="window" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <struct name="ListItem">
+    <field type="ATOM" name="name" />
+    <field type="CARD32" name="object_context_len" />
+    <field type="CARD32" name="data_context_len" />
+    <list type="char" name="object_context">
+      <fieldref>object_context_len</fieldref>
+    </list>
+    <list type="char" name="data_context">
+      <fieldref>data_context_len</fieldref>
+    </list>
+  </struct>
+
+  <request name="SetPropertyCreateContext" opcode="8">
+    <field type="CARD32" name="context_len" />
+    <list type="char" name="context">
+      <fieldref>context_len</fieldref>
+    </list>
+  </request>
+
+  <request name="GetPropertyCreateContext" opcode="9">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="SetPropertyUseContext" opcode="10">
+    <field type="CARD32" name="context_len" />
+    <list type="char" name="context">
+      <fieldref>context_len</fieldref>
+    </list>
+  </request>
+
+  <request name="GetPropertyUseContext" opcode="11">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="GetPropertyContext" opcode="12">
+    <field type="WINDOW" name="window" />
+    <field type="ATOM" name="property" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="GetPropertyDataContext" opcode="13">
+    <field type="WINDOW" name="window" />
+    <field type="ATOM" name="property" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="ListProperties" opcode="14">
+    <field type="WINDOW" name="window" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="properties_len" />
+      <pad bytes="20" />
+      <list type="ListItem" name="properties">
+	<fieldref>properties_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="SetSelectionCreateContext" opcode="15">
+    <field type="CARD32" name="context_len" />
+    <list type="char" name="context">
+      <fieldref>context_len</fieldref>
+    </list>
+  </request>
+
+  <request name="GetSelectionCreateContext" opcode="16">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="SetSelectionUseContext" opcode="17">
+    <field type="CARD32" name="context_len" />
+    <list type="char" name="context">
+      <fieldref>context_len</fieldref>
+    </list>
+  </request>
+
+  <request name="GetSelectionUseContext" opcode="18">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="GetSelectionContext" opcode="19">
+    <field type="ATOM" name="selection" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="GetSelectionDataContext" opcode="20">
+    <field type="ATOM" name="selection" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="ListSelections" opcode="21">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="selections_len" />
+      <pad bytes="20" />
+      <list type="ListItem" name="selections">
+	<fieldref>selections_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+  <request name="GetClientContext" opcode="22">
+    <field type="CARD32" name="resource" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD32" name="context_len" />
+      <pad bytes="20" />
+      <list type="char" name="context">
+	<fieldref>context_len</fieldref>
+      </list>
+    </reply>
+  </request>
+
+</xcb>
diff --git a/libxcb/xcb-proto/src/xv.xml b/libxcb/xcb-proto/src/xv.xml
index 08c80b04b..d2bfc2992 100644
--- a/libxcb/xcb-proto/src/xv.xml
+++ b/libxcb/xcb-proto/src/xv.xml
@@ -1,450 +1,450 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2006 Jeremy Kolb.

-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="xv" extension-xname="XVideo" extension-name="Xv" major-version="2" minor-version="2">

-    <import>xproto</import>

-    <import>shm</import>

-    <!-- Implements version 2.2 of XV -->

-

-    <!-- XIDs -->

-    <xidtype name="PORT" />

-    <xidtype name="ENCODING" />

-

-    <enum name="Type">

-        <item name="InputMask"><bit>0</bit></item>

-        <item name="OutputMask"><bit>1</bit></item>

-        <item name="VideoMask"><bit>2</bit></item>

-        <item name="StillMask"><bit>3</bit></item>

-        <item name="ImageMask"><bit>4</bit></item>

-    </enum>

-

-    <enum name="ImageFormatInfoType">

-        <item name="RGB" />

-        <item name="YUV" />

-    </enum>

-

-    <enum name="ImageFormatInfoFormat">

-        <item name="Packed" />

-        <item name="Planar" />

-    </enum>

-

-    <enum name="AttributeFlag">

-        <item name="Gettable"><bit>0</bit></item>

-        <item name="Settable"><bit>1</bit></item>

-    </enum>

-    

-    <enum name="VideoNotifyReason">

-	<item name="Started" />

-	<item name="Stopped" />

-	<item name="Busy" />

-	<item name="Preempted" />

-	<item name="HardError" />

-    </enum>

-

-    <enum name="ScanlineOrder">

-        <item name="TopToBottom" />

-        <item name="BottomToTop" />

-    </enum>

-

-    <enum name="GrabPortStatus">

-        <item name="Success" />

-        <item name="BadExtension" />

-        <item name="AlreadyGrabbed" />

-        <item name="InvalidTime" />

-        <item name="BadReply" />

-        <item name="BadAlloc" />

-    </enum>

-

-    <struct name="Rational">

-        <field type="INT32" name="numerator" />

-        <field type="INT32" name="denominator" />

-    </struct>

-

-    <struct name="Format">

-        <field type="VISUALID" name="visual" />

-        <field type="CARD8" name="depth" />

-        <pad bytes="3" />

-    </struct>

-

-    <struct name="AdaptorInfo">

-        <field type="PORT" name="base_id" />

-        <field type="CARD16" name="name_size" />

-        <field type="CARD16" name="num_ports" />

-        <field type="CARD16" name="num_formats" />

-        <field type="CARD8" name="type" mask="Type" />

-        <pad bytes="1" />

-        <list type="char" name="name">

-            <fieldref>name_size</fieldref>

-        </list>

-        <list type="Format" name="formats">

-            <fieldref>num_formats</fieldref>

-        </list>

-

-    </struct>

-

-    <struct name="EncodingInfo">

-        <field type="ENCODING" name="encoding" />

-        <field type="CARD16" name="name_size" />

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

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

-        <!--

-        Some versions of Xvproto.h incorrectly have

-        this padding after "rate".

-        -->

-        <pad bytes="2" />

-        <field type="Rational" name="rate" />

-        <list type="char" name="name">

-            <fieldref>name_size</fieldref>

-        </list>

-    </struct>

-

-    <struct name="Image">

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

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

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

-        <field type="CARD32" name="data_size" />

-        <field type="CARD32" name="num_planes" />

-        <list type="CARD32" name="pitches">

-            <fieldref>num_planes</fieldref>

-        </list>

-        <list type="CARD32" name="offsets">

-            <fieldref>num_planes</fieldref>

-        </list>

-        <list type="CARD8" name="data">

-            <fieldref>data_size</fieldref>

-        </list>

-        <!-- Some XPointer "obdata" for SHM use-->

-    </struct>

-    

-    <struct name="AttributeInfo">

-        <field type="CARD32" name="flags" mask="AttributeFlag" />

-        <field type="INT32" name="min" />

-        <field type="INT32" name="max" />

-        <field type="CARD32" name="size" />

-        <list type="char" name="name">

-            <fieldref>size</fieldref>

-        </list>

-    </struct>

-

-    <struct name="ImageFormatInfo">

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

-        <field type="CARD8" name="type" enum="ImageFormatInfoType" />

-        <field type="CARD8" name="byte_order" enum="ImageOrder" />

-        <pad bytes="2" />

-        <list type="CARD8" name="guid">

-            <value>16</value>

-        </list>

-        <field type="CARD8" name="bpp" />

-        <field type="CARD8" name="num_planes" />

-        <pad bytes="2" />

-        <field type="CARD8" name="depth" />

-        <pad bytes="3" />

-        <field type="CARD32" name="red_mask" />

-        <field type="CARD32" name="green_mask" />

-        <field type="CARD32" name="blue_mask" />

-        <field type="CARD8" name="format" enum="ImageFormatInfoFormat" />

-        <pad bytes="3" />

-        <field type="CARD32" name="y_sample_bits" />

-        <field type="CARD32" name="u_sample_bits" />

-        <field type="CARD32" name="v_sample_bits" />

-        <field type="CARD32" name="vhorz_y_period" />

-        <field type="CARD32" name="vhorz_u_period" />

-        <field type="CARD32" name="vhorz_v_period" />

-        <field type="CARD32" name="vvert_y_period" />

-        <field type="CARD32" name="vvert_u_period" />

-        <field type="CARD32" name="vvert_v_period" />

-        <list type="CARD8" name="vcomp_order">

-            <value>32</value>

-        </list>

-        <field type="CARD8" name="vscanline_order" enum="ScanlineOrder" />

-        <pad bytes="11" />

-    </struct>

-

-

-    <!-- Errors -->

-    <error name="BadPort" number="0"/>

-    <error name="BadEncoding" number="1"/>

-    <error name="BadControl" number="2"/>

-

-    <!-- Events -->

-    <event name="VideoNotify" number="0">

-        <field type="BYTE" name="reason" enum="VideoNotifyReason" />

-        <field type="TIMESTAMP" name="time" />

-        <field type="DRAWABLE" name="drawable" />

-        <field type="PORT" name="port" />

-    </event>

-

-    <event name="PortNotify" number="1">

-        <pad bytes="1" />

-        <field type="TIMESTAMP" name="time" />

-        <field type="PORT" name="port" />

-        <field type="ATOM" name="attribute" />

-        <field type="INT32" name="value" />

-    </event>

-    

-    

-    <!-- Requests -->

-    <request name="QueryExtension" opcode="0">

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD16" name="major" />

-            <field type="CARD16" name="minor" />

-        </reply>

-    </request>

-

-    <request name="QueryAdaptors" opcode="1">

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

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD16" name="num_adaptors" />

-            <pad bytes="22" />

-            <list type="AdaptorInfo" name="info">

-                <fieldref>num_adaptors</fieldref>

-            </list>

-        </reply>

-    </request>

-

-    <request name="QueryEncodings" opcode="2">

-        <field type="PORT" name="port" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD16" name="num_encodings" />

-            <!--

-            In Xvproto.h this padding is 24 bytes

-            in actuality it is 22 bytes

-            -->

-            <pad bytes="22" />

-            <list type="EncodingInfo" name="info">

-                <fieldref>num_encodings</fieldref>

-            </list>

-        </reply>

-    </request>

-

-    <request name="GrabPort" opcode="3">

-        <field type="PORT" name="port" />

-        <field type="TIMESTAMP" name="time" altenum="Time" />

-        <reply>

-            <field type="BYTE" name="result" enum="GrabPortStatus" />

-        </reply>

-    </request>

-

-    <request name="UngrabPort" opcode="4">

-        <field type="PORT" name="port" />

-        <field type="TIMESTAMP" name="time" altenum="Time" />

-    </request>

-

-    <request name="PutVideo" opcode="5">

-        <field type="PORT" name="port" />

-        <field type="DRAWABLE" name="drawable" />

-        <field type="GCONTEXT" name="gc" />

-        <field type="INT16" name="vid_x" />

-        <field type="INT16" name="vid_y" />

-        <field type="CARD16" name="vid_w" />

-        <field type="CARD16" name="vid_h" />

-        <field type="INT16" name="drw_x" />

-        <field type="INT16" name="drw_y" />

-        <field type="CARD16" name="drw_w" />

-        <field type="CARD16" name="drw_h" />

-    </request>

-

-    <request name="PutStill" opcode="6">

-        <field type="PORT" name="port" />

-        <field type="DRAWABLE" name="drawable" />

-        <field type="GCONTEXT" name="gc" />

-        <field type="INT16" name="vid_x" />

-        <field type="INT16" name="vid_y" />

-        <field type="CARD16" name="vid_w" />

-        <field type="CARD16" name="vid_h" />

-        <field type="INT16" name="drw_x" />

-        <field type="INT16" name="drw_y" />

-        <field type="CARD16" name="drw_w" />

-        <field type="CARD16" name="drw_h" />

-    </request>

-

-    <request name="GetVideo" opcode="7">

-        <field type="PORT" name="port" />

-        <field type="DRAWABLE" name="drawable" />

-        <field type="GCONTEXT" name="gc" />

-        <field type="INT16" name="vid_x" />

-        <field type="INT16" name="vid_y" />

-        <field type="CARD16" name="vid_w" />

-        <field type="CARD16" name="vid_h" />

-        <field type="INT16" name="drw_x" />

-        <field type="INT16" name="drw_y" />

-        <field type="CARD16" name="drw_w" />

-        <field type="CARD16" name="drw_h" />

-    </request>

-

-    <request name="GetStill" opcode="8">

-        <field type="PORT" name="port" />

-        <field type="DRAWABLE" name="drawable" />

-        <field type="GCONTEXT" name="gc" />

-        <field type="INT16" name="vid_x" />

-        <field type="INT16" name="vid_y" />

-        <field type="CARD16" name="vid_w" />

-        <field type="CARD16" name="vid_h" />

-        <field type="INT16" name="drw_x" />

-        <field type="INT16" name="drw_y" />

-        <field type="CARD16" name="drw_w" />

-        <field type="CARD16" name="drw_h" />

-    </request>

-

-    <request name="StopVideo" opcode="9">

-        <field type="PORT" name="port" />

-        <field type="DRAWABLE" name="drawable" />

-    </request>

-

-    <request name="SelectVideoNotify" opcode="10">

-        <field type="DRAWABLE" name="drawable" />

-        <field type="BOOL" name="onoff" />

-        <pad bytes="3" />

-    </request>

-

-    <request name="SelectPortNotify" opcode="11">

-        <field type="PORT" name="port" />

-        <field type="BOOL" name="onoff" />

-        <pad bytes="3" />

-    </request>

-

-    <request name="QueryBestSize" opcode="12">

-        <field type="PORT" name="port" />

-        <field type="CARD16" name="vid_w" />

-        <field type="CARD16" name="vid_h" />

-        <field type="CARD16" name="drw_w" />

-        <field type="CARD16" name="drw_h" />

-        <field type="BOOL" name="motion" />

-        <pad bytes="3" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD16" name="actual_width" />

-            <field type="CARD16" name="actual_height" />

-        </reply>

-    </request>

-

-    <request name="SetPortAttribute" opcode="13">

-        <field type="PORT" name="port" />

-        <field type="ATOM" name="attribute" />

-        <field type="INT32" name="value" />

-    </request>

-

-    <request name="GetPortAttribute" opcode="14">

-        <field type="PORT" name="port" />

-        <field type="ATOM" name="attribute" />

-        <reply>

-            <pad bytes="1" />

-            <field type="INT32" name="value" />

-        </reply>

-    </request>

-

-    <!-- Not in the docs beyond this point :( -->

-

-    <request name="QueryPortAttributes" opcode="15">

-        <field type="PORT" name="port" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="num_attributes" />

-            <field type="CARD32" name="text_size" />

-            <pad bytes="16" />

-            <list type="AttributeInfo" name="attributes">

-                <fieldref>num_attributes</fieldref>

-            </list>

-        </reply>

-    </request>

-

-    <request name="ListImageFormats" opcode="16">

-        <field type="PORT" name="port" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="num_formats" />

-            <pad bytes="20" />

-            <list type="ImageFormatInfo" name="format">

-                <fieldref>num_formats</fieldref>

-            </list>

-        </reply>

-    </request>

-

-    <request name="QueryImageAttributes" opcode="17">

-        <field type="PORT" name="port" />

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

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

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

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="num_planes" />

-            <field type="CARD32" name="data_size" />

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

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

-            <pad bytes="12" />

-            <list type="CARD32" name="pitches">

-                <fieldref>num_planes</fieldref>

-            </list>

-            <list type="CARD32" name="offsets">

-                <fieldref>num_planes</fieldref>

-            </list>

-        </reply>

-    </request>

-

-    <request name="PutImage" opcode="18">

-        <field type="PORT" name="port" />

-        <field type="DRAWABLE" name="drawable" />

-        <field type="GCONTEXT" name="gc" />

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

-        <field type="INT16" name="src_x" />

-        <field type="INT16" name="src_y" />

-        <field type="CARD16" name="src_w" />

-        <field type="CARD16" name="src_h" />

-        <field type="INT16" name="drw_x" />

-        <field type="INT16" name="drw_y" />

-        <field type="CARD16" name="drw_w" />

-        <field type="CARD16" name="drw_h" />

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

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

-	<list type="CARD8" name="data" />

-    </request>

-

-    <request name="ShmPutImage" opcode="19">

-        <field type="PORT" name="port" />

-        <field type="DRAWABLE" name="drawable" />

-        <field type="GCONTEXT" name="gc" />

-        <field type="SEG" name="shmseg" />

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

-        <field type="CARD32" name="offset" />

-        <field type="INT16" name="src_x" />

-        <field type="INT16" name="src_y" />

-        <field type="CARD16" name="src_w" />

-        <field type="CARD16" name="src_h" />

-        <field type="INT16" name="drw_x" />

-        <field type="INT16" name="drw_y" />

-        <field type="CARD16" name="drw_w" />

-        <field type="CARD16" name="drw_h" />

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

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

-        <field type="CARD8" name="send_event" />

-        <pad bytes="3" />

-    </request>

-</xcb>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2006 Jeremy Kolb.
+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="xv" extension-xname="XVideo" extension-name="Xv" major-version="2" minor-version="2">
+    <import>xproto</import>
+    <import>shm</import>
+    <!-- Implements version 2.2 of XV -->
+
+    <!-- XIDs -->
+    <xidtype name="PORT" />
+    <xidtype name="ENCODING" />
+
+    <enum name="Type">
+        <item name="InputMask"><bit>0</bit></item>
+        <item name="OutputMask"><bit>1</bit></item>
+        <item name="VideoMask"><bit>2</bit></item>
+        <item name="StillMask"><bit>3</bit></item>
+        <item name="ImageMask"><bit>4</bit></item>
+    </enum>
+
+    <enum name="ImageFormatInfoType">
+        <item name="RGB" />
+        <item name="YUV" />
+    </enum>
+
+    <enum name="ImageFormatInfoFormat">
+        <item name="Packed" />
+        <item name="Planar" />
+    </enum>
+
+    <enum name="AttributeFlag">
+        <item name="Gettable"><bit>0</bit></item>
+        <item name="Settable"><bit>1</bit></item>
+    </enum>
+    
+    <enum name="VideoNotifyReason">
+	<item name="Started" />
+	<item name="Stopped" />
+	<item name="Busy" />
+	<item name="Preempted" />
+	<item name="HardError" />
+    </enum>
+
+    <enum name="ScanlineOrder">
+        <item name="TopToBottom" />
+        <item name="BottomToTop" />
+    </enum>
+
+    <enum name="GrabPortStatus">
+        <item name="Success" />
+        <item name="BadExtension" />
+        <item name="AlreadyGrabbed" />
+        <item name="InvalidTime" />
+        <item name="BadReply" />
+        <item name="BadAlloc" />
+    </enum>
+
+    <struct name="Rational">
+        <field type="INT32" name="numerator" />
+        <field type="INT32" name="denominator" />
+    </struct>
+
+    <struct name="Format">
+        <field type="VISUALID" name="visual" />
+        <field type="CARD8" name="depth" />
+        <pad bytes="3" />
+    </struct>
+
+    <struct name="AdaptorInfo">
+        <field type="PORT" name="base_id" />
+        <field type="CARD16" name="name_size" />
+        <field type="CARD16" name="num_ports" />
+        <field type="CARD16" name="num_formats" />
+        <field type="CARD8" name="type" mask="Type" />
+        <pad bytes="1" />
+        <list type="char" name="name">
+            <fieldref>name_size</fieldref>
+        </list>
+        <list type="Format" name="formats">
+            <fieldref>num_formats</fieldref>
+        </list>
+
+    </struct>
+
+    <struct name="EncodingInfo">
+        <field type="ENCODING" name="encoding" />
+        <field type="CARD16" name="name_size" />
+        <field type="CARD16" name="width" />
+        <field type="CARD16" name="height" />
+        <!--
+        Some versions of Xvproto.h incorrectly have
+        this padding after "rate".
+        -->
+        <pad bytes="2" />
+        <field type="Rational" name="rate" />
+        <list type="char" name="name">
+            <fieldref>name_size</fieldref>
+        </list>
+    </struct>
+
+    <struct name="Image">
+        <field type="CARD32" name="id" />
+        <field type="CARD16" name="width" />
+        <field type="CARD16" name="height" />
+        <field type="CARD32" name="data_size" />
+        <field type="CARD32" name="num_planes" />
+        <list type="CARD32" name="pitches">
+            <fieldref>num_planes</fieldref>
+        </list>
+        <list type="CARD32" name="offsets">
+            <fieldref>num_planes</fieldref>
+        </list>
+        <list type="CARD8" name="data">
+            <fieldref>data_size</fieldref>
+        </list>
+        <!-- Some XPointer "obdata" for SHM use-->
+    </struct>
+    
+    <struct name="AttributeInfo">
+        <field type="CARD32" name="flags" mask="AttributeFlag" />
+        <field type="INT32" name="min" />
+        <field type="INT32" name="max" />
+        <field type="CARD32" name="size" />
+        <list type="char" name="name">
+            <fieldref>size</fieldref>
+        </list>
+    </struct>
+
+    <struct name="ImageFormatInfo">
+        <field type="CARD32" name="id" />
+        <field type="CARD8" name="type" enum="ImageFormatInfoType" />
+        <field type="CARD8" name="byte_order" enum="ImageOrder" />
+        <pad bytes="2" />
+        <list type="CARD8" name="guid">
+            <value>16</value>
+        </list>
+        <field type="CARD8" name="bpp" />
+        <field type="CARD8" name="num_planes" />
+        <pad bytes="2" />
+        <field type="CARD8" name="depth" />
+        <pad bytes="3" />
+        <field type="CARD32" name="red_mask" />
+        <field type="CARD32" name="green_mask" />
+        <field type="CARD32" name="blue_mask" />
+        <field type="CARD8" name="format" enum="ImageFormatInfoFormat" />
+        <pad bytes="3" />
+        <field type="CARD32" name="y_sample_bits" />
+        <field type="CARD32" name="u_sample_bits" />
+        <field type="CARD32" name="v_sample_bits" />
+        <field type="CARD32" name="vhorz_y_period" />
+        <field type="CARD32" name="vhorz_u_period" />
+        <field type="CARD32" name="vhorz_v_period" />
+        <field type="CARD32" name="vvert_y_period" />
+        <field type="CARD32" name="vvert_u_period" />
+        <field type="CARD32" name="vvert_v_period" />
+        <list type="CARD8" name="vcomp_order">
+            <value>32</value>
+        </list>
+        <field type="CARD8" name="vscanline_order" enum="ScanlineOrder" />
+        <pad bytes="11" />
+    </struct>
+
+
+    <!-- Errors -->
+    <error name="BadPort" number="0"/>
+    <error name="BadEncoding" number="1"/>
+    <error name="BadControl" number="2"/>
+
+    <!-- Events -->
+    <event name="VideoNotify" number="0">
+        <field type="BYTE" name="reason" enum="VideoNotifyReason" />
+        <field type="TIMESTAMP" name="time" />
+        <field type="DRAWABLE" name="drawable" />
+        <field type="PORT" name="port" />
+    </event>
+
+    <event name="PortNotify" number="1">
+        <pad bytes="1" />
+        <field type="TIMESTAMP" name="time" />
+        <field type="PORT" name="port" />
+        <field type="ATOM" name="attribute" />
+        <field type="INT32" name="value" />
+    </event>
+    
+    
+    <!-- Requests -->
+    <request name="QueryExtension" opcode="0">
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD16" name="major" />
+            <field type="CARD16" name="minor" />
+        </reply>
+    </request>
+
+    <request name="QueryAdaptors" opcode="1">
+        <field type="WINDOW" name="window" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD16" name="num_adaptors" />
+            <pad bytes="22" />
+            <list type="AdaptorInfo" name="info">
+                <fieldref>num_adaptors</fieldref>
+            </list>
+        </reply>
+    </request>
+
+    <request name="QueryEncodings" opcode="2">
+        <field type="PORT" name="port" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD16" name="num_encodings" />
+            <!--
+            In Xvproto.h this padding is 24 bytes
+            in actuality it is 22 bytes
+            -->
+            <pad bytes="22" />
+            <list type="EncodingInfo" name="info">
+                <fieldref>num_encodings</fieldref>
+            </list>
+        </reply>
+    </request>
+
+    <request name="GrabPort" opcode="3">
+        <field type="PORT" name="port" />
+        <field type="TIMESTAMP" name="time" altenum="Time" />
+        <reply>
+            <field type="BYTE" name="result" enum="GrabPortStatus" />
+        </reply>
+    </request>
+
+    <request name="UngrabPort" opcode="4">
+        <field type="PORT" name="port" />
+        <field type="TIMESTAMP" name="time" altenum="Time" />
+    </request>
+
+    <request name="PutVideo" opcode="5">
+        <field type="PORT" name="port" />
+        <field type="DRAWABLE" name="drawable" />
+        <field type="GCONTEXT" name="gc" />
+        <field type="INT16" name="vid_x" />
+        <field type="INT16" name="vid_y" />
+        <field type="CARD16" name="vid_w" />
+        <field type="CARD16" name="vid_h" />
+        <field type="INT16" name="drw_x" />
+        <field type="INT16" name="drw_y" />
+        <field type="CARD16" name="drw_w" />
+        <field type="CARD16" name="drw_h" />
+    </request>
+
+    <request name="PutStill" opcode="6">
+        <field type="PORT" name="port" />
+        <field type="DRAWABLE" name="drawable" />
+        <field type="GCONTEXT" name="gc" />
+        <field type="INT16" name="vid_x" />
+        <field type="INT16" name="vid_y" />
+        <field type="CARD16" name="vid_w" />
+        <field type="CARD16" name="vid_h" />
+        <field type="INT16" name="drw_x" />
+        <field type="INT16" name="drw_y" />
+        <field type="CARD16" name="drw_w" />
+        <field type="CARD16" name="drw_h" />
+    </request>
+
+    <request name="GetVideo" opcode="7">
+        <field type="PORT" name="port" />
+        <field type="DRAWABLE" name="drawable" />
+        <field type="GCONTEXT" name="gc" />
+        <field type="INT16" name="vid_x" />
+        <field type="INT16" name="vid_y" />
+        <field type="CARD16" name="vid_w" />
+        <field type="CARD16" name="vid_h" />
+        <field type="INT16" name="drw_x" />
+        <field type="INT16" name="drw_y" />
+        <field type="CARD16" name="drw_w" />
+        <field type="CARD16" name="drw_h" />
+    </request>
+
+    <request name="GetStill" opcode="8">
+        <field type="PORT" name="port" />
+        <field type="DRAWABLE" name="drawable" />
+        <field type="GCONTEXT" name="gc" />
+        <field type="INT16" name="vid_x" />
+        <field type="INT16" name="vid_y" />
+        <field type="CARD16" name="vid_w" />
+        <field type="CARD16" name="vid_h" />
+        <field type="INT16" name="drw_x" />
+        <field type="INT16" name="drw_y" />
+        <field type="CARD16" name="drw_w" />
+        <field type="CARD16" name="drw_h" />
+    </request>
+
+    <request name="StopVideo" opcode="9">
+        <field type="PORT" name="port" />
+        <field type="DRAWABLE" name="drawable" />
+    </request>
+
+    <request name="SelectVideoNotify" opcode="10">
+        <field type="DRAWABLE" name="drawable" />
+        <field type="BOOL" name="onoff" />
+        <pad bytes="3" />
+    </request>
+
+    <request name="SelectPortNotify" opcode="11">
+        <field type="PORT" name="port" />
+        <field type="BOOL" name="onoff" />
+        <pad bytes="3" />
+    </request>
+
+    <request name="QueryBestSize" opcode="12">
+        <field type="PORT" name="port" />
+        <field type="CARD16" name="vid_w" />
+        <field type="CARD16" name="vid_h" />
+        <field type="CARD16" name="drw_w" />
+        <field type="CARD16" name="drw_h" />
+        <field type="BOOL" name="motion" />
+        <pad bytes="3" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD16" name="actual_width" />
+            <field type="CARD16" name="actual_height" />
+        </reply>
+    </request>
+
+    <request name="SetPortAttribute" opcode="13">
+        <field type="PORT" name="port" />
+        <field type="ATOM" name="attribute" />
+        <field type="INT32" name="value" />
+    </request>
+
+    <request name="GetPortAttribute" opcode="14">
+        <field type="PORT" name="port" />
+        <field type="ATOM" name="attribute" />
+        <reply>
+            <pad bytes="1" />
+            <field type="INT32" name="value" />
+        </reply>
+    </request>
+
+    <!-- Not in the docs beyond this point :( -->
+
+    <request name="QueryPortAttributes" opcode="15">
+        <field type="PORT" name="port" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="num_attributes" />
+            <field type="CARD32" name="text_size" />
+            <pad bytes="16" />
+            <list type="AttributeInfo" name="attributes">
+                <fieldref>num_attributes</fieldref>
+            </list>
+        </reply>
+    </request>
+
+    <request name="ListImageFormats" opcode="16">
+        <field type="PORT" name="port" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="num_formats" />
+            <pad bytes="20" />
+            <list type="ImageFormatInfo" name="format">
+                <fieldref>num_formats</fieldref>
+            </list>
+        </reply>
+    </request>
+
+    <request name="QueryImageAttributes" opcode="17">
+        <field type="PORT" name="port" />
+        <field type="CARD32" name="id" />
+        <field type="CARD16" name="width" />
+        <field type="CARD16" name="height" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="num_planes" />
+            <field type="CARD32" name="data_size" />
+            <field type="CARD16" name="width" />
+            <field type="CARD16" name="height" />
+            <pad bytes="12" />
+            <list type="CARD32" name="pitches">
+                <fieldref>num_planes</fieldref>
+            </list>
+            <list type="CARD32" name="offsets">
+                <fieldref>num_planes</fieldref>
+            </list>
+        </reply>
+    </request>
+
+    <request name="PutImage" opcode="18">
+        <field type="PORT" name="port" />
+        <field type="DRAWABLE" name="drawable" />
+        <field type="GCONTEXT" name="gc" />
+        <field type="CARD32" name="id" />
+        <field type="INT16" name="src_x" />
+        <field type="INT16" name="src_y" />
+        <field type="CARD16" name="src_w" />
+        <field type="CARD16" name="src_h" />
+        <field type="INT16" name="drw_x" />
+        <field type="INT16" name="drw_y" />
+        <field type="CARD16" name="drw_w" />
+        <field type="CARD16" name="drw_h" />
+        <field type="CARD16" name="width" />
+        <field type="CARD16" name="height" />
+	<list type="CARD8" name="data" />
+    </request>
+
+    <request name="ShmPutImage" opcode="19">
+        <field type="PORT" name="port" />
+        <field type="DRAWABLE" name="drawable" />
+        <field type="GCONTEXT" name="gc" />
+        <field type="SEG" name="shmseg" />
+        <field type="CARD32" name="id" />
+        <field type="CARD32" name="offset" />
+        <field type="INT16" name="src_x" />
+        <field type="INT16" name="src_y" />
+        <field type="CARD16" name="src_w" />
+        <field type="CARD16" name="src_h" />
+        <field type="INT16" name="drw_x" />
+        <field type="INT16" name="drw_y" />
+        <field type="CARD16" name="drw_w" />
+        <field type="CARD16" name="drw_h" />
+        <field type="CARD16" name="width" />
+        <field type="CARD16" name="height" />
+        <field type="CARD8" name="send_event" />
+        <pad bytes="3" />
+    </request>
+</xcb>
diff --git a/libxcb/xcb-proto/src/xvmc.xml b/libxcb/xcb-proto/src/xvmc.xml
index 1c477ae49..ac80003f9 100644
--- a/libxcb/xcb-proto/src/xvmc.xml
+++ b/libxcb/xcb-proto/src/xvmc.xml
@@ -1,146 +1,146 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-Copyright (C) 2006 Jeremy Kolb.

-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="xvmc" extension-xname="XVideo-MotionCompensation" extension-name="XvMC" major-version="1" minor-version="1">

-    <import>xv</import>

-

-    <xidtype name="CONTEXT" />

-    <xidtype name="SURFACE" />

-    <xidtype name="SUBPICTURE" />

-

-    <struct name="SurfaceInfo">

-        <field type="SURFACE" name="id" />

-        <field type="CARD16" name="chroma_format" />

-        <field type="CARD16" name="pad0" />

-        <field type="CARD16" name="max_width" />

-        <field type="CARD16" name="max_height" />

-        <field type="CARD16" name="subpicture_max_width" />

-        <field type="CARD16" name="subpicture_max_height" />

-        <field type="CARD32" name="mc_type" />

-        <field type="CARD32" name="flags" />

-    </struct>

-    

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

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="major" />

-            <field type="CARD32" name="minor" />

-        </reply>

-    </request> 

-

-    <request name="ListSurfaceTypes" opcode="1">

-        <field type="PORT" name="port_id" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="num" />

-            <pad bytes="20" />

-            <list type="SurfaceInfo" name="surfaces">

-                <fieldref>num</fieldref>

-            </list>

-        </reply>

-    </request>

-

-    <request name="CreateContext" opcode="2">

-        <field type="CONTEXT" name="context_id" />

-        <field type="PORT" name="port_id" />

-        <field type="SURFACE" name="surface_id" />

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

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

-        <field type="CARD32" name="flags" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD16" name="width_actual" />

-            <field type="CARD16" name="height_actual" />

-            <field type="CARD32" name="flags_return" />

-            <pad bytes="20" />

-            <list type="CARD32" name="priv_data">

-		<fieldref>length</fieldref>

-	    </list>

-        </reply>

-    </request>

-

-    <request name="DestroyContext" opcode="3">

-        <field type="CONTEXT" name="context_id" />

-    </request>

-    

-    <request name="CreateSurface" opcode="4">

-        <field type="SURFACE" name="surface_id" />

-        <field type="CONTEXT" name="context_id" />

-        <reply>

-            <pad bytes="1" />

-            <pad bytes="24" />

-            <list type="CARD32" name="priv_data">

-		<fieldref>length</fieldref>

-	    </list>

-        </reply>

-    </request>

-

-    <request name="DestroySurface" opcode="5">

-        <field type="SURFACE" name="surface_id" />

-    </request>

-

-    <request name="CreateSubpicture" opcode="6">

-        <field type="SUBPICTURE" name="subpicture_id" />

-        <field type="CONTEXT" name="context" />

-        <field type="CARD32" name="xvimage_id" />

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

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

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD16" name="width_actual" />

-            <field type="CARD16" name="height_actual" />

-            <field type="CARD16" name="num_palette_entries" />

-            <field type="CARD16" name="entry_bytes" />

-            <list type="CARD8" name="component_order">

-                <value>4</value>

-            </list>

-            <pad bytes="12" />

-            <list type="CARD32" name="priv_data">

-		<fieldref>length</fieldref>

-	    </list>

-        </reply>

-    </request>

-

-    <request name="DestroySubpicture" opcode="7">

-        <field type="SUBPICTURE" name="subpicture_id" />

-    </request>

-

-    <request name="ListSubpictureTypes" opcode="8">

-        <field type="PORT" name="port_id" />

-        <field type="SURFACE" name="surface_id" />

-        <reply>

-            <pad bytes="1" />

-            <field type="CARD32" name="num" />

-            <pad bytes="20" />

-            <list type="ImageFormatInfo" name="types">

-                <fieldref>num</fieldref>

-            </list>

-        </reply>    

-    </request>

-

-</xcb> 

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2006 Jeremy Kolb.
+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="xvmc" extension-xname="XVideo-MotionCompensation" extension-name="XvMC" major-version="1" minor-version="1">
+    <import>xv</import>
+
+    <xidtype name="CONTEXT" />
+    <xidtype name="SURFACE" />
+    <xidtype name="SUBPICTURE" />
+
+    <struct name="SurfaceInfo">
+        <field type="SURFACE" name="id" />
+        <field type="CARD16" name="chroma_format" />
+        <field type="CARD16" name="pad0" />
+        <field type="CARD16" name="max_width" />
+        <field type="CARD16" name="max_height" />
+        <field type="CARD16" name="subpicture_max_width" />
+        <field type="CARD16" name="subpicture_max_height" />
+        <field type="CARD32" name="mc_type" />
+        <field type="CARD32" name="flags" />
+    </struct>
+    
+    <request name="QueryVersion" opcode="0"> 
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="major" />
+            <field type="CARD32" name="minor" />
+        </reply>
+    </request> 
+
+    <request name="ListSurfaceTypes" opcode="1">
+        <field type="PORT" name="port_id" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="num" />
+            <pad bytes="20" />
+            <list type="SurfaceInfo" name="surfaces">
+                <fieldref>num</fieldref>
+            </list>
+        </reply>
+    </request>
+
+    <request name="CreateContext" opcode="2">
+        <field type="CONTEXT" name="context_id" />
+        <field type="PORT" name="port_id" />
+        <field type="SURFACE" name="surface_id" />
+        <field type="CARD16" name="width" />
+        <field type="CARD16" name="height" />
+        <field type="CARD32" name="flags" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD16" name="width_actual" />
+            <field type="CARD16" name="height_actual" />
+            <field type="CARD32" name="flags_return" />
+            <pad bytes="20" />
+            <list type="CARD32" name="priv_data">
+		<fieldref>length</fieldref>
+	    </list>
+        </reply>
+    </request>
+
+    <request name="DestroyContext" opcode="3">
+        <field type="CONTEXT" name="context_id" />
+    </request>
+    
+    <request name="CreateSurface" opcode="4">
+        <field type="SURFACE" name="surface_id" />
+        <field type="CONTEXT" name="context_id" />
+        <reply>
+            <pad bytes="1" />
+            <pad bytes="24" />
+            <list type="CARD32" name="priv_data">
+		<fieldref>length</fieldref>
+	    </list>
+        </reply>
+    </request>
+
+    <request name="DestroySurface" opcode="5">
+        <field type="SURFACE" name="surface_id" />
+    </request>
+
+    <request name="CreateSubpicture" opcode="6">
+        <field type="SUBPICTURE" name="subpicture_id" />
+        <field type="CONTEXT" name="context" />
+        <field type="CARD32" name="xvimage_id" />
+        <field type="CARD16" name="width" />
+        <field type="CARD16" name="height" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD16" name="width_actual" />
+            <field type="CARD16" name="height_actual" />
+            <field type="CARD16" name="num_palette_entries" />
+            <field type="CARD16" name="entry_bytes" />
+            <list type="CARD8" name="component_order">
+                <value>4</value>
+            </list>
+            <pad bytes="12" />
+            <list type="CARD32" name="priv_data">
+		<fieldref>length</fieldref>
+	    </list>
+        </reply>
+    </request>
+
+    <request name="DestroySubpicture" opcode="7">
+        <field type="SUBPICTURE" name="subpicture_id" />
+    </request>
+
+    <request name="ListSubpictureTypes" opcode="8">
+        <field type="PORT" name="port_id" />
+        <field type="SURFACE" name="surface_id" />
+        <reply>
+            <pad bytes="1" />
+            <field type="CARD32" name="num" />
+            <pad bytes="20" />
+            <list type="ImageFormatInfo" name="types">
+                <fieldref>num</fieldref>
+            </list>
+        </reply>    
+    </request>
+
+</xcb>