From: Josh Triplett <josh@freedesktop.org>
Date: Thu, 15 Jun 2006 10:03:13 +0000 (-0700)
Subject: Remove arbitrary division between xcb_types and xproto by merging
X-Git-Tag: 1.0_branch~163
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab4393d3a63dde6fca2a167f7d6aaf64972b02f0;p=profile%2Fivi%2Fxcb-proto.git

Remove arbitrary division between xcb_types and xproto by merging
xcb_types.xml into xproto.xml.
---

diff --git a/doc/xml-xcb.txt b/doc/xml-xcb.txt
index b88d182..f428493 100644
--- a/doc/xml-xcb.txt
+++ b/doc/xml-xcb.txt
@@ -86,8 +86,8 @@ Top-Level Elements
   The import element allows the protocol description to reference types
   declared in another extension.  The content is be the basename of the
   extension XML file, which is also the header attribute of the extension's
-  root node.  Note that types from xcb_types and xproto are automatically
-  available, without explicitly importing them.
+  root node.  Note that types from xproto are automatically available, without
+  explicitly importing them.
 
 <struct name="identifier">structure contents</struct>
 
@@ -197,14 +197,14 @@ Structure Contents
 ------------------
 
 Note: "type" attributes below refer to types defined by previous elements,
-either in the current extension, xproto, xcb_types, or one of the imported
-extensions.  The type name must refer to only one possible type; if more than
-one type matches, an error occurs.  To avoid this, the type may be explicitly
-prefixed with a namespace, which should be the value of the header attribute
-on the protocol description containing the desired type.  The namespace and
-type are separated by a single colon.  For example, to refer to the PIXMAP
-type defined in glx rather than the one defined in xcb_types, use
-type="glx:PIXMAP" rather than type="PIXMAP".
+either in the current extension, xproto, or one of the imported extensions.
+The type name must refer to only one possible type; if more than one type
+matches, an error occurs.  To avoid this, the type may be explicitly prefixed
+with a namespace, which should be the value of the header attribute on the
+protocol description containing the desired type.  The namespace and type are
+separated by a single colon.  For example, to refer to the PIXMAP type defined
+in glx rather than the one defined in xproto, use type="glx:PIXMAP" rather
+than type="PIXMAP".
 
 <pad bytes="integer" />
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ae0f5a..d50b76e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
 nobase_xcbinclude_HEADERS = xcb.xsd \
-                            xcb_types.xml \
                             xproto.xml \
                             extensions/bigreq.xml \
                             extensions/composite.xml \
diff --git a/src/extensions/glx.xml b/src/extensions/glx.xml
index 423dd74..2e22c77 100644
--- a/src/extensions/glx.xml
+++ b/src/extensions/glx.xml
@@ -54,7 +54,7 @@ The patch that fixed this server bug in X.org CVS is here:
         <xidtype name="FBCONFIG" />
 
         <union name="DRAWABLE">
-            <field type="xcb_types:WINDOW" name="window" />
+            <field type="xproto:WINDOW" name="window" />
             <field type="PBUFFER" name="glx_pbuffer" />
             <field type="glx:PIXMAP" name="glx_pixmap" />
             <field type="glx:WINDOW" name="glx_window" />
@@ -237,7 +237,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	<request name="CreateGLXPixmap" opcode="13">
 		<field type="CARD32" name="screen" />
 		<field type="VISUALID" name="visual" />
-		<field type="xcb_types:PIXMAP" name="pixmap" />
+		<field type="xproto:PIXMAP" name="pixmap" />
 		<field type="glx:PIXMAP" name="glx_pixmap" />
 	</request>
 
@@ -336,7 +336,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	<request name="CreatePixmap" opcode="22">
 		<field type="CARD32" name="screen" />
 		<field type="CARD32" name="fbconfig" />
-		<field type="xcb_types:PIXMAP" name="pixmap" />
+		<field type="xproto:PIXMAP" name="pixmap" />
 		<field type="glx:PIXMAP" name="glx_pixmap" />
 		<field type="CARD32" name="num_attribs" />  
 	</request>
@@ -417,7 +417,7 @@ The patch that fixed this server bug in X.org CVS is here:
 	<request name="CreateWindow" opcode="31">
 		<field type="SCREEN" name="screen" />
 		<field type="FBCONFIG" name="fbconfig" />
-		<field type="xcb_types:WINDOW" name="window" />
+		<field type="xproto:WINDOW" name="window" />
 		<field type="glx:WINDOW" name="glx_window" />
 		<field type="CARD32" name="num_attribs" />
 		<valueparam value-mask-type="CARD32"
diff --git a/src/import.py b/src/import.py
index 63cba99..eb58f55 100755
--- a/src/import.py
+++ b/src/import.py
@@ -40,9 +40,7 @@ class ProcessImports(XMLFilterBase):
 		XMLFilterBase.startElement(self, name, attrs)
 		if name == 'xcb':
 			seen[attrs['header']] = True
-			if attrs['header'] != 'xcb_types':
-				self.ensure('xcb_types')
-				self.ensure('xproto')
+			self.ensure('xproto')
 
 	def characters(self, content):
 		if self.inimport is not None:
diff --git a/src/xcb_types.xml b/src/xcb_types.xml
deleted file mode 100644
index caaaee3..0000000
--- a/src/xcb_types.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?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="xcb_types">
-  <!-- Core protocol types -->
-  
-  <struct name="CHAR2B">
-    <field type="CARD8" name="byte1" />
-    <field type="CARD8" name="byte2" />
-  </struct>
-  
-  <xidtype name="WINDOW" />
-  
-  <xidtype name="PIXMAP" />
-  
-  <xidtype name="CURSOR" />
-  
-  <xidtype name="FONT" />
-  
-  <xidtype name="GCONTEXT" />
-  
-  <xidtype name="COLORMAP" />
-  
-  <xidtype name="ATOM" />
-  
-  <union name="DRAWABLE">
-    <field type="WINDOW" name="window" />
-    <field type="PIXMAP" name="pixmap" />
-  </union>
-  
-  <union name="FONTABLE">
-    <field type="FONT" name="font" />
-    <field type="GCONTEXT" name="gcontext" />
-  </union>
-  
-  <struct name="VISUALID">
-    <field type="CARD32" name="id" />
-  </struct>
-
-  <struct name="TIMESTAMP">
-    <field type="CARD32" name="id" />
-  </struct>
-
-  <struct name="KEYSYM">
-    <field type="CARD32" name="id" />
-  </struct>
-
-  <struct name="KEYCODE">
-    <field type="CARD8" name="id" />
-  </struct>
-
-  <struct name="BUTTON">
-    <field type="CARD8" name="id" />
-  </struct>
-
-  <struct name="POINT">
-    <field type="INT16" name="x" />
-    <field type="INT16" name="y" />
-  </struct>
-
-  <struct name="RECTANGLE">
-    <field type="INT16" name="x" />
-    <field type="INT16" name="y" />
-    <field type="CARD16" name="width" />
-    <field type="CARD16" name="height" />
-  </struct>
-
-  <struct name="ARC">
-    <field type="INT16" name="x" />
-    <field type="INT16" name="y" />
-    <field type="CARD16" name="width" />
-    <field type="CARD16" name="height" />
-    <field type="INT16" name="angle1" />
-    <field type="INT16" name="angle2" />
-  </struct>
-
-  <!-- Connection setup-related types -->
-
-  <struct name="FORMAT">
-    <field type="CARD8" name="depth" />
-    <field type="CARD8" name="bits_per_pixel" />
-    <field type="CARD8" name="scanline_pad" />
-    <pad bytes="5" />
-  </struct>
-
-  <enum name="VisualClass">
-    <item name="StaticGray"> <value>0</value></item>
-    <item name="GrayScale">  <value>1</value></item>
-    <item name="StaticColor"><value>2</value></item>
-    <item name="PseudoColor"><value>3</value></item>
-    <item name="TrueColor">  <value>4</value></item>
-    <item name="DirectColor"><value>5</value></item>
-  </enum>
-
-  <struct name="VISUALTYPE">
-    <field type="VISUALID" name="visual_id" />
-    <field type="CARD8" name="class" />
-    <field type="CARD8" name="bits_per_rgb_value" />
-    <field type="CARD16" name="colormap_entries" />
-    <field type="CARD32" name="red_mask" />
-    <field type="CARD32" name="green_mask" />
-    <field type="CARD32" name="blue_mask" />
-    <pad bytes="4" />
-  </struct>
-
-  <struct name="DEPTH">
-    <field type="CARD8" name="depth" />
-    <pad bytes="1" />
-    <field type="CARD16" name="visuals_len" />
-    <pad bytes="4" />
-    <list type="VISUALTYPE" name="visuals">
-      <fieldref>visuals_len</fieldref>
-    </list>
-  </struct>
-
-  <struct name="SCREEN">
-    <field type="WINDOW" name="root" />
-    <field type="COLORMAP" name="default_colormap" />
-    <field type="CARD32" name="white_pixel" />
-    <field type="CARD32" name="black_pixel" />
-    <field type="CARD32" name="current_input_masks" />
-    <field type="CARD16" name="width_in_pixels" />
-    <field type="CARD16" name="height_in_pixels" />
-    <field type="CARD16" name="width_in_millimeters" />
-    <field type="CARD16" name="height_in_millimeters" />
-    <field type="CARD16" name="min_installed_maps" />
-    <field type="CARD16" name="max_installed_maps" />
-    <field type="VISUALID" name="root_visual" />
-    <field type="BYTE" name="backing_stores" />
-    <field type="BOOL" name="save_unders" />
-    <field type="CARD8" name="root_depth" />
-    <field type="CARD8" name="allowed_depths_len" />
-    <list type="DEPTH" name="allowed_depths">
-      <fieldref>allowed_depths_len</fieldref>
-    </list>
-  </struct>
-
-  <struct name="SetupReq">
-    <field type="CARD8" name="byte_order" />
-    <pad bytes="1" />
-    <field type="CARD16" name="protocol_major_version" />
-    <field type="CARD16" name="protocol_minor_version" />
-    <field type="CARD16" name="authorization_protocol_name_len" />
-    <field type="CARD16" name="authorization_protocol_data_len" />
-    <list type="char" name="authorization_protocol_name">
-      <fieldref>authorization_protocol_name_len</fieldref>
-    </list>
-    <list type="char" name="authorization_protocol_data">
-      <fieldref>authorization_protocol_data_len</fieldref>
-    </list>
-  </struct>
-
-  <struct name="SetupFailed">
-    <field type="CARD8" name="status" /> <!-- always 0 -> Failed -->
-    <field type="CARD8" name="reason_len" />
-    <field type="CARD16" name="protocol_major_version" />
-    <field type="CARD16" name="protocol_minor_version" />
-    <field type="CARD16" name="length" />
-    <list type="char" name="reason">
-      <fieldref>reason_len</fieldref>
-    </list>
-  </struct>
-
-  <struct name="SetupAuthenticate">
-    <field type="CARD8" name="status" /> <!-- always 2 -> Authenticate -->
-    <pad bytes="5" />
-    <field type="CARD16" name="length" />
-    <list type="char" name="reason">
-      <op op="*">
-        <fieldref>length</fieldref>
-        <value>4</value>
-      </op>
-    </list>
-  </struct>
-
-  <enum name="ImageOrder">
-    <item name="LSBFirst"><value>0</value></item>
-    <item name="MSBFirst"><value>1</value></item>
-  </enum>
-
-  <struct name="Setup">
-    <field type="CARD8" name="status" /> <!-- always 1 -> Success -->
-    <pad bytes="1" />
-    <field type="CARD16" name="protocol_major_version" />
-    <field type="CARD16" name="protocol_minor_version" />
-    <field type="CARD16" name="length" />
-    <field type="CARD32" name="release_number" />
-    <field type="CARD32" name="resource_id_base" />
-    <field type="CARD32" name="resource_id_mask" />
-    <field type="CARD32" name="motion_buffer_size" />
-    <field type="CARD16" name="vendor_len" />
-    <field type="CARD16" name="maximum_request_length" />
-    <field type="CARD8" name="roots_len" />
-    <field type="CARD8" name="pixmap_formats_len" />
-    <field type="CARD8" name="image_byte_order" />
-    <field type="CARD8" name="bitmap_format_bit_order" />
-    <field type="CARD8" name="bitmap_format_scanline_unit" />
-    <field type="CARD8" name="bitmap_format_scanline_pad" />
-    <field type="KEYCODE" name="min_keycode" />
-    <field type="KEYCODE" name="max_keycode" />
-    <pad bytes="4" />
-    <list type="char" name="vendor">
-      <fieldref>vendor_len</fieldref>
-    </list>
-    <list type="FORMAT" name="pixmap_formats">
-      <fieldref>pixmap_formats_len</fieldref>
-    </list>
-    <list type="SCREEN" name="roots">
-      <fieldref>roots_len</fieldref>
-    </list>
-  </struct>
-</xcb>
diff --git a/src/xproto.xml b/src/xproto.xml
index 0a8a2de..d0c3b1f 100644
--- a/src/xproto.xml
+++ b/src/xproto.xml
@@ -26,6 +26,214 @@ sale, use or other dealings in this Software without prior written
 authorization from the authors.
 -->
 <xcb header="xproto">
+  <!-- Core protocol types -->
+  
+  <struct name="CHAR2B">
+    <field type="CARD8" name="byte1" />
+    <field type="CARD8" name="byte2" />
+  </struct>
+  
+  <xidtype name="WINDOW" />
+  
+  <xidtype name="PIXMAP" />
+  
+  <xidtype name="CURSOR" />
+  
+  <xidtype name="FONT" />
+  
+  <xidtype name="GCONTEXT" />
+  
+  <xidtype name="COLORMAP" />
+  
+  <xidtype name="ATOM" />
+  
+  <union name="DRAWABLE">
+    <field type="WINDOW" name="window" />
+    <field type="PIXMAP" name="pixmap" />
+  </union>
+  
+  <union name="FONTABLE">
+    <field type="FONT" name="font" />
+    <field type="GCONTEXT" name="gcontext" />
+  </union>
+  
+  <struct name="VISUALID">
+    <field type="CARD32" name="id" />
+  </struct>
+
+  <struct name="TIMESTAMP">
+    <field type="CARD32" name="id" />
+  </struct>
+
+  <struct name="KEYSYM">
+    <field type="CARD32" name="id" />
+  </struct>
+
+  <struct name="KEYCODE">
+    <field type="CARD8" name="id" />
+  </struct>
+
+  <struct name="BUTTON">
+    <field type="CARD8" name="id" />
+  </struct>
+
+  <struct name="POINT">
+    <field type="INT16" name="x" />
+    <field type="INT16" name="y" />
+  </struct>
+
+  <struct name="RECTANGLE">
+    <field type="INT16" name="x" />
+    <field type="INT16" name="y" />
+    <field type="CARD16" name="width" />
+    <field type="CARD16" name="height" />
+  </struct>
+
+  <struct name="ARC">
+    <field type="INT16" name="x" />
+    <field type="INT16" name="y" />
+    <field type="CARD16" name="width" />
+    <field type="CARD16" name="height" />
+    <field type="INT16" name="angle1" />
+    <field type="INT16" name="angle2" />
+  </struct>
+
+  <!-- Connection setup-related types -->
+
+  <struct name="FORMAT">
+    <field type="CARD8" name="depth" />
+    <field type="CARD8" name="bits_per_pixel" />
+    <field type="CARD8" name="scanline_pad" />
+    <pad bytes="5" />
+  </struct>
+
+  <enum name="VisualClass">
+    <item name="StaticGray"> <value>0</value></item>
+    <item name="GrayScale">  <value>1</value></item>
+    <item name="StaticColor"><value>2</value></item>
+    <item name="PseudoColor"><value>3</value></item>
+    <item name="TrueColor">  <value>4</value></item>
+    <item name="DirectColor"><value>5</value></item>
+  </enum>
+
+  <struct name="VISUALTYPE">
+    <field type="VISUALID" name="visual_id" />
+    <field type="CARD8" name="class" />
+    <field type="CARD8" name="bits_per_rgb_value" />
+    <field type="CARD16" name="colormap_entries" />
+    <field type="CARD32" name="red_mask" />
+    <field type="CARD32" name="green_mask" />
+    <field type="CARD32" name="blue_mask" />
+    <pad bytes="4" />
+  </struct>
+
+  <struct name="DEPTH">
+    <field type="CARD8" name="depth" />
+    <pad bytes="1" />
+    <field type="CARD16" name="visuals_len" />
+    <pad bytes="4" />
+    <list type="VISUALTYPE" name="visuals">
+      <fieldref>visuals_len</fieldref>
+    </list>
+  </struct>
+
+  <struct name="SCREEN">
+    <field type="WINDOW" name="root" />
+    <field type="COLORMAP" name="default_colormap" />
+    <field type="CARD32" name="white_pixel" />
+    <field type="CARD32" name="black_pixel" />
+    <field type="CARD32" name="current_input_masks" />
+    <field type="CARD16" name="width_in_pixels" />
+    <field type="CARD16" name="height_in_pixels" />
+    <field type="CARD16" name="width_in_millimeters" />
+    <field type="CARD16" name="height_in_millimeters" />
+    <field type="CARD16" name="min_installed_maps" />
+    <field type="CARD16" name="max_installed_maps" />
+    <field type="VISUALID" name="root_visual" />
+    <field type="BYTE" name="backing_stores" />
+    <field type="BOOL" name="save_unders" />
+    <field type="CARD8" name="root_depth" />
+    <field type="CARD8" name="allowed_depths_len" />
+    <list type="DEPTH" name="allowed_depths">
+      <fieldref>allowed_depths_len</fieldref>
+    </list>
+  </struct>
+
+  <struct name="SetupReq">
+    <field type="CARD8" name="byte_order" />
+    <pad bytes="1" />
+    <field type="CARD16" name="protocol_major_version" />
+    <field type="CARD16" name="protocol_minor_version" />
+    <field type="CARD16" name="authorization_protocol_name_len" />
+    <field type="CARD16" name="authorization_protocol_data_len" />
+    <list type="char" name="authorization_protocol_name">
+      <fieldref>authorization_protocol_name_len</fieldref>
+    </list>
+    <list type="char" name="authorization_protocol_data">
+      <fieldref>authorization_protocol_data_len</fieldref>
+    </list>
+  </struct>
+
+  <struct name="SetupFailed">
+    <field type="CARD8" name="status" /> <!-- always 0 -> Failed -->
+    <field type="CARD8" name="reason_len" />
+    <field type="CARD16" name="protocol_major_version" />
+    <field type="CARD16" name="protocol_minor_version" />
+    <field type="CARD16" name="length" />
+    <list type="char" name="reason">
+      <fieldref>reason_len</fieldref>
+    </list>
+  </struct>
+
+  <struct name="SetupAuthenticate">
+    <field type="CARD8" name="status" /> <!-- always 2 -> Authenticate -->
+    <pad bytes="5" />
+    <field type="CARD16" name="length" />
+    <list type="char" name="reason">
+      <op op="*">
+        <fieldref>length</fieldref>
+        <value>4</value>
+      </op>
+    </list>
+  </struct>
+
+  <enum name="ImageOrder">
+    <item name="LSBFirst"><value>0</value></item>
+    <item name="MSBFirst"><value>1</value></item>
+  </enum>
+
+  <struct name="Setup">
+    <field type="CARD8" name="status" /> <!-- always 1 -> Success -->
+    <pad bytes="1" />
+    <field type="CARD16" name="protocol_major_version" />
+    <field type="CARD16" name="protocol_minor_version" />
+    <field type="CARD16" name="length" />
+    <field type="CARD32" name="release_number" />
+    <field type="CARD32" name="resource_id_base" />
+    <field type="CARD32" name="resource_id_mask" />
+    <field type="CARD32" name="motion_buffer_size" />
+    <field type="CARD16" name="vendor_len" />
+    <field type="CARD16" name="maximum_request_length" />
+    <field type="CARD8" name="roots_len" />
+    <field type="CARD8" name="pixmap_formats_len" />
+    <field type="CARD8" name="image_byte_order" />
+    <field type="CARD8" name="bitmap_format_bit_order" />
+    <field type="CARD8" name="bitmap_format_scanline_unit" />
+    <field type="CARD8" name="bitmap_format_scanline_pad" />
+    <field type="KEYCODE" name="min_keycode" />
+    <field type="KEYCODE" name="max_keycode" />
+    <pad bytes="4" />
+    <list type="char" name="vendor">
+      <fieldref>vendor_len</fieldref>
+    </list>
+    <list type="FORMAT" name="pixmap_formats">
+      <fieldref>pixmap_formats_len</fieldref>
+    </list>
+    <list type="SCREEN" name="roots">
+      <fieldref>roots_len</fieldref>
+    </list>
+  </struct>
+
   <!-- Core event types -->
   
   <enum name="ModMask">