[Xcb] [PATCH 1/2] proto: Underscore placement in extension name

[Eamon Walsh]

Introduces attribute to schema and modifies currently special-cased
protocol descriptions to use it.

--
 randr.xml       |    2 +-
 screensaver.xml |    2 +-
 xcb.xsd         |    1 +
 xf86dri.xml     |    2 +-
 xfixes.xml      |    2 +-
 xvmc.xml        |    2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

--
diff --git a/src/randr.xml b/src/randr.xml
index 352b1e1..6a140de 100644
--- a/src/randr.xml
+++ b/src/randr.xml
@@ -27,7 +27,7 @@ authorization from the authors.
 -->
 
 <xcb header="randr" extension-xname="RANDR" extension-name="RandR"
-    major-version="1" minor-version="2">
+    extension-oneword="true" major-version="1" minor-version="2">
 
 	<import>xproto</import>
 	
diff --git a/src/screensaver.xml b/src/screensaver.xml
index 8acd292..311475b 100644
--- a/src/screensaver.xml
+++ b/src/screensaver.xml
@@ -29,7 +29,7 @@ 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">
+<xcb header="screensaver" extension-xname="MIT-SCREEN-SAVER" extension-name="ScreenSaver" extension-oneword="true" major-version="1" minor-version="1">
 
   <!-- Types -->
 
diff --git a/src/xcb.xsd b/src/xcb.xsd
index 674a185..ae62799 100644
--- a/src/xcb.xsd
+++ b/src/xcb.xsd
@@ -33,6 +33,7 @@ authorization from the authors.
       <xsd:attribute name="header" type="xsd:string" use="required" />
       <xsd:attribute name="extension-xname" type="xsd:string" use="optional" />
       <xsd:attribute name="extension-name"  type="xsd:string" use="optional" />
+      <xsd:attribute name="extension-oneword" type="xsd:boolean" use="optional" default="false" />
       <xsd:attribute name="major-version"   type="xsd:integer" use="optional" />
       <xsd:attribute name="minor-version"   type="xsd:integer" use="optional" />
     </xsd:complexType>
diff --git a/src/xf86dri.xml b/src/xf86dri.xml
index c05b724..65fbe55 100644
--- a/src/xf86dri.xml
+++ b/src/xf86dri.xml
@@ -27,7 +27,7 @@ authorization from the authors.
 -->
 
 <xcb header="xf86dri" extension-xname="XFree86-DRI" extension-name="XF86Dri"
-    major-version="4" minor-version="1">
+    extension-oneword="true" major-version="4" minor-version="1">
 
     <!-- Using http://dri.sourceforge.net/doc/dri_extensions_low_level.txt -->
 
diff --git a/src/xfixes.xml b/src/xfixes.xml
index 203c2a8..7565920 100644
--- a/src/xfixes.xml
+++ b/src/xfixes.xml
@@ -26,7 +26,7 @@ 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">
+    extension-oneword="true" major-version="4" minor-version="0">
   <import>xproto</import>
   <import>render</import>
   <import>shape</import>
diff --git a/src/xvmc.xml b/src/xvmc.xml
index ecfafea..40dce26 100644
--- a/src/xvmc.xml
+++ b/src/xvmc.xml
@@ -26,7 +26,7 @@ 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">
+<xcb header="xvmc" extension-xname="XVideo-MotionCompensation" extension-name="XvMC" extension-oneword="true" major-version="1" minor-version="1">
     <import>xv</import>
 
     <xidtype name="CONTEXT" />