projects / free-sw / xcb / proto / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Change CARD8 to char when referring to a string in xfixes.xml
[free-sw/xcb/proto] / src / xproto.xml
diff --git a/src/xproto.xml b/src/xproto.xml
index 0a8a2de..89df956 100644 (file)
--- a/src/xproto.xml
+++ b/src/xproto.xml
@@ -26,6 +26,204 @@ 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" />
+  
+  <xidunion name="DRAWABLE">
+    <type>WINDOW</type>
+    <type>PIXMAP</type>
+  </xidunion>
+  
+  <xidunion name="FONTABLE">
+    <type>FONT</type>
+    <type>GCONTEXT</type>
+  </xidunion>
+  
+  <typedef oldname="CARD32" newname="VISUALID" />
+
+  <typedef oldname="CARD32" newname="TIMESTAMP" />
+
+  <typedef oldname="CARD32" newname="KEYSYM" />
+
+  <typedef oldname="CARD8" newname="KEYCODE" />
+
+  <typedef oldname="CARD8" newname="BUTTON" />
+
+  <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="SetupRequest">
+    <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">
@@ -51,6 +249,7 @@ authorization from the authors.
     <field type="INT16" name="event_y" />
     <field type="CARD16" name="state" />
     <field type="BOOL" name="same_screen" />
+    <pad bytes="1" />
   </event>
 
   <eventcopy name="KeyRelease" number="3" ref="KeyPress" />
@@ -76,6 +275,7 @@ authorization from the authors.
     <field type="INT16" name="event_y" />
     <field type="CARD16" name="state" />
     <field type="BOOL" name="same_screen" />
+    <pad bytes="1" />
   </event>
 
   <eventcopy name="ButtonRelease" number="5" ref="ButtonPress" />
@@ -98,6 +298,7 @@ authorization from the authors.
     <field type="INT16" name="event_y" />
     <field type="CARD16" name="state" />
     <field type="BOOL" name="same_screen" />
+    <pad bytes="1" />
   </event>
 
   <enum name="NotifyDetail">
@@ -139,6 +340,7 @@ authorization from the authors.
     <field type="BYTE" name="detail" />
     <field type="WINDOW" name="event" />
     <field type="BYTE" name="mode" />
+    <pad bytes="3" />
   </event>
 
   <eventcopy name="FocusOut" number="10" ref="FocusIn" />
@@ -155,6 +357,7 @@ authorization from the authors.
     <field type="CARD16" name="width" />
     <field type="CARD16" name="height" />
     <field type="CARD16" name="count" />
+    <pad bytes="2" />
   </event>
 
   <event name="GraphicsExposure" number="13">
@@ -167,6 +370,7 @@ authorization from the authors.
     <field type="CARD16" name="minor_opcode" />
     <field type="CARD16" name="count" />
     <field type="CARD8" name="major_opcode" />
+    <pad bytes="3" />
   </event>
 
   <event name="NoExposure" number="14">
@@ -174,6 +378,7 @@ authorization from the authors.
     <field type="DRAWABLE" name="drawable" />
     <field type="CARD16" name="minor_opcode" />
     <field type="CARD8" name="major_opcode" />
+    <pad bytes="1" />
   </event>
 
   <enum name="Visibility">
@@ -186,6 +391,7 @@ authorization from the authors.
     <pad bytes="1" />
     <field type="WINDOW" name="window" />
     <field type="BYTE" name="state" />
+    <pad bytes="3" />
   </event>
 
   <event name="CreateNotify" number="16">
@@ -198,6 +404,7 @@ authorization from the authors.
     <field type="CARD16" name="height" />
     <field type="CARD16" name="border_width" />
     <field type="BOOL" name="override_redirect" />
+    <pad bytes="1" />
   </event>
 
   <event name="DestroyNotify" number="17">
@@ -211,6 +418,7 @@ authorization from the authors.
     <field type="WINDOW" name="event" />
     <field type="WINDOW" name="window" />
     <field type="BOOL" name="from_configure" />
+    <pad bytes="3" />
   </event>
 
   <event name="MapNotify" number="19">
@@ -218,6 +426,7 @@ authorization from the authors.
     <field type="WINDOW" name="event" />
     <field type="WINDOW" name="window" />
     <field type="BOOL" name="override_redirect" />
+    <pad bytes="3" />
   </event>
 
   <event name="MapRequest" number="20">
@@ -234,6 +443,7 @@ authorization from the authors.
     <field type="INT16" name="x" />
     <field type="INT16" name="y" />
     <field type="BOOL" name="override_redirect" />
+    <pad bytes="3" />
   </event>
 
   <event name="ConfigureNotify" number="22">
@@ -247,6 +457,7 @@ authorization from the authors.
     <field type="CARD16" name="height" />
     <field type="CARD16" name="border_width" />
     <field type="BOOL" name="override_redirect" />
+    <pad bytes="1" />
   </event>
 
   <event name="ConfigureRequest" number="23">
@@ -288,6 +499,7 @@ authorization from the authors.
     <field type="WINDOW" name="window" />
     <pad bytes="4" />
     <field type="BYTE" name="place" />
+    <pad bytes="3" />
   </event>
 
   <eventcopy name="CirculateRequest" number="27" ref="CirculateNotify" />
@@ -303,6 +515,7 @@ authorization from the authors.
     <field type="ATOM" name="atom" />
     <field type="TIMESTAMP" name="time" />
     <field type="BYTE" name="state" />
+    <pad bytes="3" />
   </event>
 
   <event name="SelectionClear" number="29">
@@ -342,6 +555,7 @@ authorization from the authors.
     <field type="COLORMAP" name="colormap" />
     <field type="BOOL" name="new" />
     <field type="BYTE" name="state" />
+    <pad bytes="2" />
   </event>
 
   <union name="ClientMessageData">
@@ -370,6 +584,7 @@ authorization from the authors.
     <field type="BYTE" name="request" />
     <field type="KEYCODE" name="first_keycode" />
     <field type="CARD8" name="count" />
+    <pad bytes="1" />
   </event>
 
 
@@ -382,12 +597,14 @@ authorization from the authors.
     <field type="CARD32" name="bad_value" />
     <field type="CARD16" name="minor_opcode" />
     <field type="CARD8" name="major_opcode" />
+    <pad bytes="1" />
   </error>
 
   <error name="Value" number="2">
     <field type="CARD32" name="bad_value" />
     <field type="CARD16" name="minor_opcode" />
     <field type="CARD8" name="major_opcode" />
+    <pad bytes="1" />
   </error>
 
   <errorcopy name="Window" number="3" ref="Value" />
@@ -543,6 +760,7 @@ authorization from the authors.
       <field type="CARD32" name="all_event_masks" />
       <field type="CARD32" name="your_event_mask" />
       <field type="CARD16" name="do_not_propagate_mask" />
+      <pad bytes="2" />
     </reply>
   </request>
 
@@ -617,6 +835,7 @@ authorization from the authors.
     <field type="WINDOW" name="window" />
     <valueparam value-mask-type="CARD16"
                 value-mask-name="value_mask"
+                value-mask-pad="2"
                 value-list-name="value_list" />
   </request>
 
@@ -641,6 +860,7 @@ authorization from the authors.
       <field type="CARD16" name="width" />
       <field type="CARD16" name="height" />
       <field type="CARD16" name="border_width" />
+      <pad bytes="2" />
     </reply>
   </request>
 
@@ -679,7 +899,7 @@ authorization from the authors.
       <pad bytes="1" />
       <field type="CARD16" name="name_len" />
       <pad bytes="22" />
-      <list type="CARD8" name="name">
+      <list type="char" name="name">
         <fieldref>name_len</fieldref>
       </list>
     </reply>
@@ -790,8 +1010,8 @@ authorization from the authors.
   </request>
 
   <enum name="GrabMode">
-    <item name="Async"><value>0</value></item>
-    <item name="Sync"> <value>1</value></item>
+    <item name="Sync"> <value>0</value></item>
+    <item name="Async"><value>1</value></item>
   </enum>
 
   <enum name="GrabStatus">
@@ -821,7 +1041,7 @@ authorization from the authors.
     <field type="TIMESTAMP" name="time" />
   </request>
 
-  <enum name="Button">
+  <enum name="ButtonIndex">
      <item name="Any"><value>0</value></item>
      <item name="1">  <value>1</value></item>
      <item name="2">  <value>2</value></item>
@@ -855,6 +1075,7 @@ authorization from the authors.
     <field type="CURSOR" name="cursor" />
     <field type="TIMESTAMP" name="time" />
     <field type="CARD16" name="event_mask" />
+    <pad bytes="2" />
   </request>
 
   <request name="GrabKeyboard" opcode="31">
@@ -863,6 +1084,7 @@ authorization from the authors.
     <field type="TIMESTAMP" name="time" />
     <field type="BYTE" name="pointer_mode" />
     <field type="BYTE" name="keyboard_mode" />
+    <pad bytes="2" />
     <reply>
       <field type="BYTE" name="status" />
     </reply>
@@ -885,12 +1107,14 @@ authorization from the authors.
     <field type="KEYCODE" name="key" />
     <field type="CARD8" name="pointer_mode" />
     <field type="CARD8" name="keyboard_mode" />
+    <pad bytes="3" />
   </request>
 
   <request name="UngrabKey" opcode="34">
-    <field type="CARD8" name="key" />
+    <field type="KEYCODE" name="key" />
     <field type="WINDOW" name="grab_window" />
     <field type="CARD16" name="modifiers" />
+    <pad bytes="2" />
   </request>
 
   <enum name="Allow">
@@ -925,6 +1149,7 @@ authorization from the authors.
       <field type="INT16" name="win_x" />
       <field type="INT16" name="win_y" />
       <field type="CARD16" name="mask" />
+      <pad bytes="2" />
     </reply>
   </request>
 
@@ -1006,6 +1231,7 @@ authorization from the authors.
     <pad bytes="1" />
     <field type="FONT" name="fid" />
     <field type="CARD16" name="name_len" />
+    <pad bytes="2" />
     <list type="char" name="name">
       <fieldref>name_len</fieldref>
     </list>
@@ -1197,22 +1423,22 @@ authorization from the authors.
 
   <!-- GC Function values -->
   <enum name="GX">
-    <item name="clear">       <value>0x0</value></item>
-    <item name="and">         <value>0x1</value></item>
-    <item name="andReverse">  <value>0x2</value></item>
-    <item name="copy">        <value>0x3</value></item>
-    <item name="andInverted"> <value>0x4</value></item>
-    <item name="noop">        <value>0x5</value></item>
-    <item name="xor">         <value>0x6</value></item>
-    <item name="or">          <value>0x7</value></item>
-    <item name="nor">         <value>0x8</value></item>
-    <item name="equiv">       <value>0x9</value></item>
-    <item name="invert">      <value>0xa</value></item>
-    <item name="orReverse">   <value>0xb</value></item>
-    <item name="copyInverted"><value>0xc</value></item>
-    <item name="orInverted">  <value>0xd</value></item>
-    <item name="nand">        <value>0xe</value></item>
-    <item name="set">         <value>0xf</value></item>
+    <item name="clear">       <value>0</value></item>
+    <item name="and">         <value>1</value></item>
+    <item name="andReverse">  <value>2</value></item>
+    <item name="copy">        <value>3</value></item>
+    <item name="andInverted"> <value>4</value></item>
+    <item name="noop">        <value>5</value></item>
+    <item name="xor">         <value>6</value></item>
+    <item name="or">          <value>7</value></item>
+    <item name="nor">         <value>8</value></item>
+    <item name="equiv">       <value>9</value></item>
+    <item name="invert">      <value>10</value></item>
+    <item name="orReverse">   <value>11</value></item>
+    <item name="copyInverted"><value>12</value></item>
+    <item name="orInverted">  <value>13</value></item>
+    <item name="nand">        <value>14</value></item>
+    <item name="set">         <value>15</value></item>
   </enum>
 
   <enum name="LineStyle">
@@ -1223,8 +1449,8 @@ authorization from the authors.
 
   <enum name="CapStyle">
     <item name="NotLast">   <value>0</value></item>
-    <item name="Cap">       <value>1</value></item>
-    <item name="Butt">      <value>2</value></item>
+    <item name="Butt">      <value>1</value></item>
+    <item name="Round">     <value>2</value></item>
     <item name="Projecting"><value>3</value></item>
   </enum>
 
@@ -1351,7 +1577,8 @@ authorization from the authors.
     <item name="Previous"><value>1</value></item>
   </enum>
 
-  <request name="PolyPoint" opcode="64" combine-adjacent="true">
+  <!-- combine-adjacent doesn't work for mode==Relative -->
+  <request name="PolyPoint" opcode="64">
     <field type="BYTE" name="coordinate_mode" />
     <field type="DRAWABLE" name="drawable" />
     <field type="GCONTEXT" name="gc" />
@@ -1410,6 +1637,7 @@ authorization from the authors.
     <field type="GCONTEXT" name="gc" />
     <field type="CARD8" name="shape" />
     <field type="CARD8" name="coordinate_mode" />
+    <pad bytes="2" />
     <list type="POINT" name="points" />
   </request>
 
@@ -1443,6 +1671,7 @@ authorization from the authors.
     <field type="INT16" name="dst_y" />
     <field type="CARD8" name="left_pad" />
     <field type="CARD8" name="depth" />
+    <pad bytes="2" />
     <list type="BYTE" name="data" />
   </request>
 
@@ -1560,6 +1789,7 @@ authorization from the authors.
     <field type="CARD16" name="red" />
     <field type="CARD16" name="green" />
     <field type="CARD16" name="blue" />
+    <pad bytes="2" />
     <reply>
       <pad bytes="1" />
       <field type="CARD16" name="red" />
@@ -1574,6 +1804,7 @@ authorization from the authors.
     <pad bytes="1" />
     <field type="COLORMAP" name="cmap" />
     <field type="CARD16" name="name_len" />
+    <pad bytes="2" />
     <list type="char" name="name">
       <fieldref>name_len</fieldref>
     </list>
@@ -1662,6 +1893,7 @@ authorization from the authors.
     <field type="COLORMAP" name="cmap" />
     <field type="CARD32" name="pixel" />
     <field type="CARD16" name="name_len" />
+    <pad bytes="2" />
     <list type="char" name="name">
       <fieldref>name_len</fieldref>
     </list>
@@ -1692,6 +1924,7 @@ authorization from the authors.
     <pad bytes="1" />
     <field type="COLORMAP" name="cmap" />
     <field type="CARD16" name="name_len" />
+    <pad bytes="2" />
     <list type="char" name="name">
       <fieldref>name_len</fieldref>
     </list>
@@ -1815,10 +2048,7 @@ authorization from the authors.
       <field type="BYTE" name="keysyms_per_keycode" />
       <pad bytes="24" />
       <list type="KEYSYM" name="keysyms">
-        <op op="*">
-          <fieldref>length</fieldref>
-          <value>4</value>
-        </op>
+        <fieldref>length</fieldref>
       </list>
     </reply>
   </request>
@@ -1884,6 +2114,7 @@ authorization from the authors.
       <field type="CARD16" name="acceleration_numerator" />
       <field type="CARD16" name="acceleration_denominator" />
       <field type="CARD16" name="threshold" />
+      <pad bytes="18" />
     </reply>
   </request>
 
@@ -1917,10 +2148,11 @@ authorization from the authors.
       <field type="CARD16" name="interval" />
       <field type="BYTE" name="prefer_blanking" />
       <field type="BYTE" name="allow_exposures" />
+      <pad bytes="18" />
     </reply>
   </request>
 
-  <enum name="Host">
+  <enum name="HostMode">
     <item name="Insert"><value>0</value></item>
     <item name="Delete"><value>1</value></item>
   </enum>
@@ -1993,6 +2225,7 @@ authorization from the authors.
   </request>
 
   <request name="RotateProperties" opcode="114">
+    <pad bytes="1" />
     <field type="WINDOW" name="window" />
     <field type="CARD16" name="atoms_len" />
     <field type="INT16" name="delta" />
Unnamed repository; edit this file 'description' to name the repository.