Update to xcb-proto/libxcb 1.12. "Just commit it" naddy@

1 files changed, 541 insertions, 501 deletions

diff --git a/lib/libxcb/src/xv.c b/lib/libxcb/src/xv.c
index b8302fbd9..82138032f 100644
--- a/lib/libxcb/src/xv.c
+++ b/lib/libxcb/src/xv.c
@@ -20,7 +20,7 @@
 xcb_extension_t xcb_xv_id = { "XVideo", 0 };
 
 void
-xcb_xv_port_next (xcb_xv_port_iterator_t *i  /**< */)
+xcb_xv_port_next (xcb_xv_port_iterator_t *i)
 {
     --i->rem;
     ++i->data;
@@ -28,7 +28,7 @@ xcb_xv_port_next (xcb_xv_port_iterator_t *i  /**< */)
 }
 
 xcb_generic_iterator_t
-xcb_xv_port_end (xcb_xv_port_iterator_t i  /**< */)
+xcb_xv_port_end (xcb_xv_port_iterator_t i)
 {
     xcb_generic_iterator_t ret;
     ret.data = i.data + i.rem;
@@ -38,7 +38,7 @@ xcb_xv_port_end (xcb_xv_port_iterator_t i  /**< */)
 }
 
 void
-xcb_xv_encoding_next (xcb_xv_encoding_iterator_t *i  /**< */)
+xcb_xv_encoding_next (xcb_xv_encoding_iterator_t *i)
 {
     --i->rem;
     ++i->data;
@@ -46,7 +46,7 @@ xcb_xv_encoding_next (xcb_xv_encoding_iterator_t *i  /**< */)
 }
 
 xcb_generic_iterator_t
-xcb_xv_encoding_end (xcb_xv_encoding_iterator_t i  /**< */)
+xcb_xv_encoding_end (xcb_xv_encoding_iterator_t i)
 {
     xcb_generic_iterator_t ret;
     ret.data = i.data + i.rem;
@@ -56,7 +56,7 @@ xcb_xv_encoding_end (xcb_xv_encoding_iterator_t i  /**< */)
 }
 
 void
-xcb_xv_rational_next (xcb_xv_rational_iterator_t *i  /**< */)
+xcb_xv_rational_next (xcb_xv_rational_iterator_t *i)
 {
     --i->rem;
     ++i->data;
@@ -64,7 +64,7 @@ xcb_xv_rational_next (xcb_xv_rational_iterator_t *i  /**< */)
 }
 
 xcb_generic_iterator_t
-xcb_xv_rational_end (xcb_xv_rational_iterator_t i  /**< */)
+xcb_xv_rational_end (xcb_xv_rational_iterator_t i)
 {
     xcb_generic_iterator_t ret;
     ret.data = i.data + i.rem;
@@ -74,7 +74,7 @@ xcb_xv_rational_end (xcb_xv_rational_iterator_t i  /**< */)
 }
 
 void
-xcb_xv_format_next (xcb_xv_format_iterator_t *i  /**< */)
+xcb_xv_format_next (xcb_xv_format_iterator_t *i)
 {
     --i->rem;
     ++i->data;
@@ -82,7 +82,7 @@ xcb_xv_format_next (xcb_xv_format_iterator_t *i  /**< */)
 }
 
 xcb_generic_iterator_t
-xcb_xv_format_end (xcb_xv_format_iterator_t i  /**< */)
+xcb_xv_format_end (xcb_xv_format_iterator_t i)
 {
     xcb_generic_iterator_t ret;
     ret.data = i.data + i.rem;
@@ -92,7 +92,7 @@ xcb_xv_format_end (xcb_xv_format_iterator_t i  /**< */)
 }
 
 int
-xcb_xv_adaptor_info_sizeof (const void  *_buffer  /**< */)
+xcb_xv_adaptor_info_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xv_adaptor_info_t *_aux = (xcb_xv_adaptor_info_t *)_buffer;
@@ -144,19 +144,19 @@ xcb_xv_adaptor_info_sizeof (const void  *_buffer  /**< */)
 }
 
 char *
-xcb_xv_adaptor_info_name (const xcb_xv_adaptor_info_t *R  /**< */)
+xcb_xv_adaptor_info_name (const xcb_xv_adaptor_info_t *R)
 {
     return (char *) (R + 1);
 }
 
 int
-xcb_xv_adaptor_info_name_length (const xcb_xv_adaptor_info_t *R  /**< */)
+xcb_xv_adaptor_info_name_length (const xcb_xv_adaptor_info_t *R)
 {
     return R->name_size;
 }
 
 xcb_generic_iterator_t
-xcb_xv_adaptor_info_name_end (const xcb_xv_adaptor_info_t *R  /**< */)
+xcb_xv_adaptor_info_name_end (const xcb_xv_adaptor_info_t *R)
 {
     xcb_generic_iterator_t i;
     i.data = ((char *) (R + 1)) + (R->name_size);
@@ -166,20 +166,20 @@ xcb_xv_adaptor_info_name_end (const xcb_xv_adaptor_info_t *R  /**< */)
 }
 
 xcb_xv_format_t *
-xcb_xv_adaptor_info_formats (const xcb_xv_adaptor_info_t *R  /**< */)
+xcb_xv_adaptor_info_formats (const xcb_xv_adaptor_info_t *R)
 {
     xcb_generic_iterator_t prev = xcb_xv_adaptor_info_name_end(R);
     return (xcb_xv_format_t *) ((char *) prev.data + ((-prev.index) & (4 - 1)) + 0);
 }
 
 int
-xcb_xv_adaptor_info_formats_length (const xcb_xv_adaptor_info_t *R  /**< */)
+xcb_xv_adaptor_info_formats_length (const xcb_xv_adaptor_info_t *R)
 {
     return R->num_formats;
 }
 
 xcb_xv_format_iterator_t
-xcb_xv_adaptor_info_formats_iterator (const xcb_xv_adaptor_info_t *R  /**< */)
+xcb_xv_adaptor_info_formats_iterator (const xcb_xv_adaptor_info_t *R)
 {
     xcb_xv_format_iterator_t i;
     xcb_generic_iterator_t prev = xcb_xv_adaptor_info_name_end(R);
@@ -190,7 +190,7 @@ xcb_xv_adaptor_info_formats_iterator (const xcb_xv_adaptor_info_t *R  /**< */)
 }
 
 void
-xcb_xv_adaptor_info_next (xcb_xv_adaptor_info_iterator_t *i  /**< */)
+xcb_xv_adaptor_info_next (xcb_xv_adaptor_info_iterator_t *i)
 {
     xcb_xv_adaptor_info_t *R = i->data;
     xcb_generic_iterator_t child;
@@ -201,7 +201,7 @@ xcb_xv_adaptor_info_next (xcb_xv_adaptor_info_iterator_t *i  /**< */)
 }
 
 xcb_generic_iterator_t
-xcb_xv_adaptor_info_end (xcb_xv_adaptor_info_iterator_t i  /**< */)
+xcb_xv_adaptor_info_end (xcb_xv_adaptor_info_iterator_t i)
 {
     xcb_generic_iterator_t ret;
     while(i.rem > 0)
@@ -213,7 +213,7 @@ xcb_xv_adaptor_info_end (xcb_xv_adaptor_info_iterator_t i  /**< */)
 }
 
 int
-xcb_xv_encoding_info_sizeof (const void  *_buffer  /**< */)
+xcb_xv_encoding_info_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xv_encoding_info_t *_aux = (xcb_xv_encoding_info_t *)_buffer;
@@ -231,6 +231,15 @@ xcb_xv_encoding_info_sizeof (const void  *_buffer  /**< */)
     xcb_block_len += _aux->name_size * sizeof(char);
     xcb_tmp += xcb_block_len;
     xcb_align_to = ALIGNOF(char);
+    xcb_align_to = 4;
+    /* insert padding */
+    xcb_pad = -xcb_block_len & (xcb_align_to - 1);
+    xcb_buffer_len += xcb_block_len + xcb_pad;
+    if (0 != xcb_pad) {
+        xcb_tmp += xcb_pad;
+        xcb_pad = 0;
+    }
+    xcb_block_len = 0;
     /* insert padding */
     xcb_pad = -xcb_block_len & (xcb_align_to - 1);
     xcb_buffer_len += xcb_block_len + xcb_pad;
@@ -244,19 +253,19 @@ xcb_xv_encoding_info_sizeof (const void  *_buffer  /**< */)
 }
 
 char *
-xcb_xv_encoding_info_name (const xcb_xv_encoding_info_t *R  /**< */)
+xcb_xv_encoding_info_name (const xcb_xv_encoding_info_t *R)
 {
     return (char *) (R + 1);
 }
 
 int
-xcb_xv_encoding_info_name_length (const xcb_xv_encoding_info_t *R  /**< */)
+xcb_xv_encoding_info_name_length (const xcb_xv_encoding_info_t *R)
 {
     return R->name_size;
 }
 
 xcb_generic_iterator_t
-xcb_xv_encoding_info_name_end (const xcb_xv_encoding_info_t *R  /**< */)
+xcb_xv_encoding_info_name_end (const xcb_xv_encoding_info_t *R)
 {
     xcb_generic_iterator_t i;
     i.data = ((char *) (R + 1)) + (R->name_size);
@@ -266,7 +275,7 @@ xcb_xv_encoding_info_name_end (const xcb_xv_encoding_info_t *R  /**< */)
 }
 
 void
-xcb_xv_encoding_info_next (xcb_xv_encoding_info_iterator_t *i  /**< */)
+xcb_xv_encoding_info_next (xcb_xv_encoding_info_iterator_t *i)
 {
     xcb_xv_encoding_info_t *R = i->data;
     xcb_generic_iterator_t child;
@@ -277,7 +286,7 @@ xcb_xv_encoding_info_next (xcb_xv_encoding_info_iterator_t *i  /**< */)
 }
 
 xcb_generic_iterator_t
-xcb_xv_encoding_info_end (xcb_xv_encoding_info_iterator_t i  /**< */)
+xcb_xv_encoding_info_end (xcb_xv_encoding_info_iterator_t i)
 {
     xcb_generic_iterator_t ret;
     while(i.rem > 0)
@@ -289,7 +298,7 @@ xcb_xv_encoding_info_end (xcb_xv_encoding_info_iterator_t i  /**< */)
 }
 
 int
-xcb_xv_image_sizeof (const void  *_buffer  /**< */)
+xcb_xv_image_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xv_image_t *_aux = (xcb_xv_image_t *)_buffer;
@@ -344,19 +353,19 @@ xcb_xv_image_sizeof (const void  *_buffer  /**< */)
 }
 
 uint32_t *
-xcb_xv_image_pitches (const xcb_xv_image_t *R  /**< */)
+xcb_xv_image_pitches (const xcb_xv_image_t *R)
 {
     return (uint32_t *) (R + 1);
 }
 
 int
-xcb_xv_image_pitches_length (const xcb_xv_image_t *R  /**< */)
+xcb_xv_image_pitches_length (const xcb_xv_image_t *R)
 {
     return R->num_planes;
 }
 
 xcb_generic_iterator_t
-xcb_xv_image_pitches_end (const xcb_xv_image_t *R  /**< */)
+xcb_xv_image_pitches_end (const xcb_xv_image_t *R)
 {
     xcb_generic_iterator_t i;
     i.data = ((uint32_t *) (R + 1)) + (R->num_planes);
@@ -366,55 +375,55 @@ xcb_xv_image_pitches_end (const xcb_xv_image_t *R  /**< */)
 }
 
 uint32_t *
-xcb_xv_image_offsets (const xcb_xv_image_t *R  /**< */)
+xcb_xv_image_offsets (const xcb_xv_image_t *R)
 {
     xcb_generic_iterator_t prev = xcb_xv_image_pitches_end(R);
     return (uint32_t *) ((char *) prev.data + XCB_TYPE_PAD(uint32_t, prev.index) + 0);
 }
 
 int
-xcb_xv_image_offsets_length (const xcb_xv_image_t *R  /**< */)
+xcb_xv_image_offsets_length (const xcb_xv_image_t *R)
 {
     return R->num_planes;
 }
 
 xcb_generic_iterator_t
-xcb_xv_image_offsets_end (const xcb_xv_image_t *R  /**< */)
+xcb_xv_image_offsets_end (const xcb_xv_image_t *R)
 {
     xcb_generic_iterator_t i;
-    xcb_generic_iterator_t child = xcb_xv_image_pitches_end(R);
-    i.data = ((uint32_t *) child.data) + (R->num_planes);
+    xcb_generic_iterator_t prev = xcb_xv_image_pitches_end(R);
+    i.data = ((uint32_t *) ((char*) prev.data + XCB_TYPE_PAD(uint32_t, prev.index))) + (R->num_planes);
     i.rem = 0;
     i.index = (char *) i.data - (char *) R;
     return i;
 }
 
 uint8_t *
-xcb_xv_image_data (const xcb_xv_image_t *R  /**< */)
+xcb_xv_image_data (const xcb_xv_image_t *R)
 {
     xcb_generic_iterator_t prev = xcb_xv_image_offsets_end(R);
     return (uint8_t *) ((char *) prev.data + XCB_TYPE_PAD(uint8_t, prev.index) + 0);
 }
 
 int
-xcb_xv_image_data_length (const xcb_xv_image_t *R  /**< */)
+xcb_xv_image_data_length (const xcb_xv_image_t *R)
 {
     return R->data_size;
 }
 
 xcb_generic_iterator_t
-xcb_xv_image_data_end (const xcb_xv_image_t *R  /**< */)
+xcb_xv_image_data_end (const xcb_xv_image_t *R)
 {
     xcb_generic_iterator_t i;
-    xcb_generic_iterator_t child = xcb_xv_image_offsets_end(R);
-    i.data = ((uint8_t *) child.data) + (R->data_size);
+    xcb_generic_iterator_t prev = xcb_xv_image_offsets_end(R);
+    i.data = ((uint8_t *) ((char*) prev.data + XCB_TYPE_PAD(uint8_t, prev.index))) + (R->data_size);
     i.rem = 0;
     i.index = (char *) i.data - (char *) R;
     return i;
 }
 
 void
-xcb_xv_image_next (xcb_xv_image_iterator_t *i  /**< */)
+xcb_xv_image_next (xcb_xv_image_iterator_t *i)
 {
     xcb_xv_image_t *R = i->data;
     xcb_generic_iterator_t child;
@@ -425,7 +434,7 @@ xcb_xv_image_next (xcb_xv_image_iterator_t *i  /**< */)
 }
 
 xcb_generic_iterator_t
-xcb_xv_image_end (xcb_xv_image_iterator_t i  /**< */)
+xcb_xv_image_end (xcb_xv_image_iterator_t i)
 {
     xcb_generic_iterator_t ret;
     while(i.rem > 0)
@@ -437,7 +446,7 @@ xcb_xv_image_end (xcb_xv_image_iterator_t i  /**< */)
 }
 
 int
-xcb_xv_attribute_info_sizeof (const void  *_buffer  /**< */)
+xcb_xv_attribute_info_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xv_attribute_info_t *_aux = (xcb_xv_attribute_info_t *)_buffer;
@@ -455,6 +464,15 @@ xcb_xv_attribute_info_sizeof (const void  *_buffer  /**< */)
     xcb_block_len += _aux->size * sizeof(char);
     xcb_tmp += xcb_block_len;
     xcb_align_to = ALIGNOF(char);
+    xcb_align_to = 4;
+    /* insert padding */
+    xcb_pad = -xcb_block_len & (xcb_align_to - 1);
+    xcb_buffer_len += xcb_block_len + xcb_pad;
+    if (0 != xcb_pad) {
+        xcb_tmp += xcb_pad;
+        xcb_pad = 0;
+    }
+    xcb_block_len = 0;
     /* insert padding */
     xcb_pad = -xcb_block_len & (xcb_align_to - 1);
     xcb_buffer_len += xcb_block_len + xcb_pad;
@@ -468,19 +486,19 @@ xcb_xv_attribute_info_sizeof (const void  *_buffer  /**< */)
 }
 
 char *
-xcb_xv_attribute_info_name (const xcb_xv_attribute_info_t *R  /**< */)
+xcb_xv_attribute_info_name (const xcb_xv_attribute_info_t *R)
 {
     return (char *) (R + 1);
 }
 
 int
-xcb_xv_attribute_info_name_length (const xcb_xv_attribute_info_t *R  /**< */)
+xcb_xv_attribute_info_name_length (const xcb_xv_attribute_info_t *R)
 {
     return R->size;
 }
 
 xcb_generic_iterator_t
-xcb_xv_attribute_info_name_end (const xcb_xv_attribute_info_t *R  /**< */)
+xcb_xv_attribute_info_name_end (const xcb_xv_attribute_info_t *R)
 {
     xcb_generic_iterator_t i;
     i.data = ((char *) (R + 1)) + (R->size);
@@ -490,7 +508,7 @@ xcb_xv_attribute_info_name_end (const xcb_xv_attribute_info_t *R  /**< */)
 }
 
 void
-xcb_xv_attribute_info_next (xcb_xv_attribute_info_iterator_t *i  /**< */)
+xcb_xv_attribute_info_next (xcb_xv_attribute_info_iterator_t *i)
 {
     xcb_xv_attribute_info_t *R = i->data;
     xcb_generic_iterator_t child;
@@ -501,7 +519,7 @@ xcb_xv_attribute_info_next (xcb_xv_attribute_info_iterator_t *i  /**< */)
 }
 
 xcb_generic_iterator_t
-xcb_xv_attribute_info_end (xcb_xv_attribute_info_iterator_t i  /**< */)
+xcb_xv_attribute_info_end (xcb_xv_attribute_info_iterator_t i)
 {
     xcb_generic_iterator_t ret;
     while(i.rem > 0)
@@ -513,7 +531,7 @@ xcb_xv_attribute_info_end (xcb_xv_attribute_info_iterator_t i  /**< */)
 }
 
 void
-xcb_xv_image_format_info_next (xcb_xv_image_format_info_iterator_t *i  /**< */)
+xcb_xv_image_format_info_next (xcb_xv_image_format_info_iterator_t *i)
 {
     --i->rem;
     ++i->data;
@@ -521,7 +539,7 @@ xcb_xv_image_format_info_next (xcb_xv_image_format_info_iterator_t *i  /**< */)
 }
 
 xcb_generic_iterator_t
-xcb_xv_image_format_info_end (xcb_xv_image_format_info_iterator_t i  /**< */)
+xcb_xv_image_format_info_end (xcb_xv_image_format_info_iterator_t i)
 {
     xcb_generic_iterator_t ret;
     ret.data = i.data + i.rem;
@@ -531,13 +549,13 @@ xcb_xv_image_format_info_end (xcb_xv_image_format_info_iterator_t i  /**< */)
 }
 
 xcb_xv_query_extension_cookie_t
-xcb_xv_query_extension (xcb_connection_t *c  /**< */)
+xcb_xv_query_extension (xcb_connection_t *c)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_QUERY_EXTENSION,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_QUERY_EXTENSION,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -555,13 +573,13 @@ xcb_xv_query_extension (xcb_connection_t *c  /**< */)
 }
 
 xcb_xv_query_extension_cookie_t
-xcb_xv_query_extension_unchecked (xcb_connection_t *c  /**< */)
+xcb_xv_query_extension_unchecked (xcb_connection_t *c)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_QUERY_EXTENSION,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_QUERY_EXTENSION,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -579,15 +597,15 @@ xcb_xv_query_extension_unchecked (xcb_connection_t *c  /**< */)
 }
 
 xcb_xv_query_extension_reply_t *
-xcb_xv_query_extension_reply (xcb_connection_t                 *c  /**< */,
+xcb_xv_query_extension_reply (xcb_connection_t                 *c,
                               xcb_xv_query_extension_cookie_t   cookie  /**< */,
-                              xcb_generic_error_t             **e  /**< */)
+                              xcb_generic_error_t             **e)
 {
     return (xcb_xv_query_extension_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 int
-xcb_xv_query_adaptors_sizeof (const void  *_buffer  /**< */)
+xcb_xv_query_adaptors_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xv_query_adaptors_reply_t *_aux = (xcb_xv_query_adaptors_reply_t *)_buffer;
@@ -623,14 +641,14 @@ xcb_xv_query_adaptors_sizeof (const void  *_buffer  /**< */)
 }
 
 xcb_xv_query_adaptors_cookie_t
-xcb_xv_query_adaptors (xcb_connection_t *c  /**< */,
-                       xcb_window_t      window  /**< */)
+xcb_xv_query_adaptors (xcb_connection_t *c,
+                       xcb_window_t      window)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_QUERY_ADAPTORS,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_QUERY_ADAPTORS,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -649,14 +667,14 @@ xcb_xv_query_adaptors (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_query_adaptors_cookie_t
-xcb_xv_query_adaptors_unchecked (xcb_connection_t *c  /**< */,
-                                 xcb_window_t      window  /**< */)
+xcb_xv_query_adaptors_unchecked (xcb_connection_t *c,
+                                 xcb_window_t      window)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_QUERY_ADAPTORS,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_QUERY_ADAPTORS,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -675,13 +693,13 @@ xcb_xv_query_adaptors_unchecked (xcb_connection_t *c  /**< */,
 }
 
 int
-xcb_xv_query_adaptors_info_length (const xcb_xv_query_adaptors_reply_t *R  /**< */)
+xcb_xv_query_adaptors_info_length (const xcb_xv_query_adaptors_reply_t *R)
 {
     return R->num_adaptors;
 }
 
 xcb_xv_adaptor_info_iterator_t
-xcb_xv_query_adaptors_info_iterator (const xcb_xv_query_adaptors_reply_t *R  /**< */)
+xcb_xv_query_adaptors_info_iterator (const xcb_xv_query_adaptors_reply_t *R)
 {
     xcb_xv_adaptor_info_iterator_t i;
     i.data = (xcb_xv_adaptor_info_t *) (R + 1);
@@ -691,15 +709,15 @@ xcb_xv_query_adaptors_info_iterator (const xcb_xv_query_adaptors_reply_t *R  /**
 }
 
 xcb_xv_query_adaptors_reply_t *
-xcb_xv_query_adaptors_reply (xcb_connection_t                *c  /**< */,
+xcb_xv_query_adaptors_reply (xcb_connection_t                *c,
                              xcb_xv_query_adaptors_cookie_t   cookie  /**< */,
-                             xcb_generic_error_t            **e  /**< */)
+                             xcb_generic_error_t            **e)
 {
     return (xcb_xv_query_adaptors_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 int
-xcb_xv_query_encodings_sizeof (const void  *_buffer  /**< */)
+xcb_xv_query_encodings_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xv_query_encodings_reply_t *_aux = (xcb_xv_query_encodings_reply_t *)_buffer;
@@ -735,14 +753,14 @@ xcb_xv_query_encodings_sizeof (const void  *_buffer  /**< */)
 }
 
 xcb_xv_query_encodings_cookie_t
-xcb_xv_query_encodings (xcb_connection_t *c  /**< */,
-                        xcb_xv_port_t     port  /**< */)
+xcb_xv_query_encodings (xcb_connection_t *c,
+                        xcb_xv_port_t     port)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_QUERY_ENCODINGS,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_QUERY_ENCODINGS,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -761,14 +779,14 @@ xcb_xv_query_encodings (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_query_encodings_cookie_t
-xcb_xv_query_encodings_unchecked (xcb_connection_t *c  /**< */,
-                                  xcb_xv_port_t     port  /**< */)
+xcb_xv_query_encodings_unchecked (xcb_connection_t *c,
+                                  xcb_xv_port_t     port)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_QUERY_ENCODINGS,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_QUERY_ENCODINGS,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -787,13 +805,13 @@ xcb_xv_query_encodings_unchecked (xcb_connection_t *c  /**< */,
 }
 
 int
-xcb_xv_query_encodings_info_length (const xcb_xv_query_encodings_reply_t *R  /**< */)
+xcb_xv_query_encodings_info_length (const xcb_xv_query_encodings_reply_t *R)
 {
     return R->num_encodings;
 }
 
 xcb_xv_encoding_info_iterator_t
-xcb_xv_query_encodings_info_iterator (const xcb_xv_query_encodings_reply_t *R  /**< */)
+xcb_xv_query_encodings_info_iterator (const xcb_xv_query_encodings_reply_t *R)
 {
     xcb_xv_encoding_info_iterator_t i;
     i.data = (xcb_xv_encoding_info_t *) (R + 1);
@@ -803,23 +821,23 @@ xcb_xv_query_encodings_info_iterator (const xcb_xv_query_encodings_reply_t *R  /
 }
 
 xcb_xv_query_encodings_reply_t *
-xcb_xv_query_encodings_reply (xcb_connection_t                 *c  /**< */,
+xcb_xv_query_encodings_reply (xcb_connection_t                 *c,
                               xcb_xv_query_encodings_cookie_t   cookie  /**< */,
-                              xcb_generic_error_t             **e  /**< */)
+                              xcb_generic_error_t             **e)
 {
     return (xcb_xv_query_encodings_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 xcb_xv_grab_port_cookie_t
-xcb_xv_grab_port (xcb_connection_t *c  /**< */,
-                  xcb_xv_port_t     port  /**< */,
-                  xcb_timestamp_t   time  /**< */)
+xcb_xv_grab_port (xcb_connection_t *c,
+                  xcb_xv_port_t     port,
+                  xcb_timestamp_t   time)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_GRAB_PORT,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_GRAB_PORT,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -839,15 +857,15 @@ xcb_xv_grab_port (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_grab_port_cookie_t
-xcb_xv_grab_port_unchecked (xcb_connection_t *c  /**< */,
-                            xcb_xv_port_t     port  /**< */,
-                            xcb_timestamp_t   time  /**< */)
+xcb_xv_grab_port_unchecked (xcb_connection_t *c,
+                            xcb_xv_port_t     port,
+                            xcb_timestamp_t   time)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_GRAB_PORT,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_GRAB_PORT,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -867,23 +885,23 @@ xcb_xv_grab_port_unchecked (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_grab_port_reply_t *
-xcb_xv_grab_port_reply (xcb_connection_t           *c  /**< */,
+xcb_xv_grab_port_reply (xcb_connection_t           *c,
                         xcb_xv_grab_port_cookie_t   cookie  /**< */,
-                        xcb_generic_error_t       **e  /**< */)
+                        xcb_generic_error_t       **e)
 {
     return (xcb_xv_grab_port_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 xcb_void_cookie_t
-xcb_xv_ungrab_port_checked (xcb_connection_t *c  /**< */,
-                            xcb_xv_port_t     port  /**< */,
-                            xcb_timestamp_t   time  /**< */)
+xcb_xv_ungrab_port_checked (xcb_connection_t *c,
+                            xcb_xv_port_t     port,
+                            xcb_timestamp_t   time)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_UNGRAB_PORT,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_UNGRAB_PORT,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -903,15 +921,15 @@ xcb_xv_ungrab_port_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_ungrab_port (xcb_connection_t *c  /**< */,
-                    xcb_xv_port_t     port  /**< */,
-                    xcb_timestamp_t   time  /**< */)
+xcb_xv_ungrab_port (xcb_connection_t *c,
+                    xcb_xv_port_t     port,
+                    xcb_timestamp_t   time)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_UNGRAB_PORT,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_UNGRAB_PORT,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -931,24 +949,24 @@ xcb_xv_ungrab_port (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_put_video_checked (xcb_connection_t *c  /**< */,
-                          xcb_xv_port_t     port  /**< */,
-                          xcb_drawable_t    drawable  /**< */,
-                          xcb_gcontext_t    gc  /**< */,
-                          int16_t           vid_x  /**< */,
-                          int16_t           vid_y  /**< */,
-                          uint16_t          vid_w  /**< */,
-                          uint16_t          vid_h  /**< */,
-                          int16_t           drw_x  /**< */,
-                          int16_t           drw_y  /**< */,
-                          uint16_t          drw_w  /**< */,
-                          uint16_t          drw_h  /**< */)
+xcb_xv_put_video_checked (xcb_connection_t *c,
+                          xcb_xv_port_t     port,
+                          xcb_drawable_t    drawable,
+                          xcb_gcontext_t    gc,
+                          int16_t           vid_x,
+                          int16_t           vid_y,
+                          uint16_t          vid_w,
+                          uint16_t          vid_h,
+                          int16_t           drw_x,
+                          int16_t           drw_y,
+                          uint16_t          drw_w,
+                          uint16_t          drw_h)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_PUT_VIDEO,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_PUT_VIDEO,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -977,24 +995,24 @@ xcb_xv_put_video_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_put_video (xcb_connection_t *c  /**< */,
-                  xcb_xv_port_t     port  /**< */,
-                  xcb_drawable_t    drawable  /**< */,
-                  xcb_gcontext_t    gc  /**< */,
-                  int16_t           vid_x  /**< */,
-                  int16_t           vid_y  /**< */,
-                  uint16_t          vid_w  /**< */,
-                  uint16_t          vid_h  /**< */,
-                  int16_t           drw_x  /**< */,
-                  int16_t           drw_y  /**< */,
-                  uint16_t          drw_w  /**< */,
-                  uint16_t          drw_h  /**< */)
+xcb_xv_put_video (xcb_connection_t *c,
+                  xcb_xv_port_t     port,
+                  xcb_drawable_t    drawable,
+                  xcb_gcontext_t    gc,
+                  int16_t           vid_x,
+                  int16_t           vid_y,
+                  uint16_t          vid_w,
+                  uint16_t          vid_h,
+                  int16_t           drw_x,
+                  int16_t           drw_y,
+                  uint16_t          drw_w,
+                  uint16_t          drw_h)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_PUT_VIDEO,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_PUT_VIDEO,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1023,24 +1041,24 @@ xcb_xv_put_video (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_put_still_checked (xcb_connection_t *c  /**< */,
-                          xcb_xv_port_t     port  /**< */,
-                          xcb_drawable_t    drawable  /**< */,
-                          xcb_gcontext_t    gc  /**< */,
-                          int16_t           vid_x  /**< */,
-                          int16_t           vid_y  /**< */,
-                          uint16_t          vid_w  /**< */,
-                          uint16_t          vid_h  /**< */,
-                          int16_t           drw_x  /**< */,
-                          int16_t           drw_y  /**< */,
-                          uint16_t          drw_w  /**< */,
-                          uint16_t          drw_h  /**< */)
+xcb_xv_put_still_checked (xcb_connection_t *c,
+                          xcb_xv_port_t     port,
+                          xcb_drawable_t    drawable,
+                          xcb_gcontext_t    gc,
+                          int16_t           vid_x,
+                          int16_t           vid_y,
+                          uint16_t          vid_w,
+                          uint16_t          vid_h,
+                          int16_t           drw_x,
+                          int16_t           drw_y,
+                          uint16_t          drw_w,
+                          uint16_t          drw_h)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_PUT_STILL,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_PUT_STILL,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1069,24 +1087,24 @@ xcb_xv_put_still_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_put_still (xcb_connection_t *c  /**< */,
-                  xcb_xv_port_t     port  /**< */,
-                  xcb_drawable_t    drawable  /**< */,
-                  xcb_gcontext_t    gc  /**< */,
-                  int16_t           vid_x  /**< */,
-                  int16_t           vid_y  /**< */,
-                  uint16_t          vid_w  /**< */,
-                  uint16_t          vid_h  /**< */,
-                  int16_t           drw_x  /**< */,
-                  int16_t           drw_y  /**< */,
-                  uint16_t          drw_w  /**< */,
-                  uint16_t          drw_h  /**< */)
+xcb_xv_put_still (xcb_connection_t *c,
+                  xcb_xv_port_t     port,
+                  xcb_drawable_t    drawable,
+                  xcb_gcontext_t    gc,
+                  int16_t           vid_x,
+                  int16_t           vid_y,
+                  uint16_t          vid_w,
+                  uint16_t          vid_h,
+                  int16_t           drw_x,
+                  int16_t           drw_y,
+                  uint16_t          drw_w,
+                  uint16_t          drw_h)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_PUT_STILL,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_PUT_STILL,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1115,24 +1133,24 @@ xcb_xv_put_still (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_get_video_checked (xcb_connection_t *c  /**< */,
-                          xcb_xv_port_t     port  /**< */,
-                          xcb_drawable_t    drawable  /**< */,
-                          xcb_gcontext_t    gc  /**< */,
-                          int16_t           vid_x  /**< */,
-                          int16_t           vid_y  /**< */,
-                          uint16_t          vid_w  /**< */,
-                          uint16_t          vid_h  /**< */,
-                          int16_t           drw_x  /**< */,
-                          int16_t           drw_y  /**< */,
-                          uint16_t          drw_w  /**< */,
-                          uint16_t          drw_h  /**< */)
+xcb_xv_get_video_checked (xcb_connection_t *c,
+                          xcb_xv_port_t     port,
+                          xcb_drawable_t    drawable,
+                          xcb_gcontext_t    gc,
+                          int16_t           vid_x,
+                          int16_t           vid_y,
+                          uint16_t          vid_w,
+                          uint16_t          vid_h,
+                          int16_t           drw_x,
+                          int16_t           drw_y,
+                          uint16_t          drw_w,
+                          uint16_t          drw_h)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_GET_VIDEO,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_GET_VIDEO,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1161,24 +1179,24 @@ xcb_xv_get_video_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_get_video (xcb_connection_t *c  /**< */,
-                  xcb_xv_port_t     port  /**< */,
-                  xcb_drawable_t    drawable  /**< */,
-                  xcb_gcontext_t    gc  /**< */,
-                  int16_t           vid_x  /**< */,
-                  int16_t           vid_y  /**< */,
-                  uint16_t          vid_w  /**< */,
-                  uint16_t          vid_h  /**< */,
-                  int16_t           drw_x  /**< */,
-                  int16_t           drw_y  /**< */,
-                  uint16_t          drw_w  /**< */,
-                  uint16_t          drw_h  /**< */)
+xcb_xv_get_video (xcb_connection_t *c,
+                  xcb_xv_port_t     port,
+                  xcb_drawable_t    drawable,
+                  xcb_gcontext_t    gc,
+                  int16_t           vid_x,
+                  int16_t           vid_y,
+                  uint16_t          vid_w,
+                  uint16_t          vid_h,
+                  int16_t           drw_x,
+                  int16_t           drw_y,
+                  uint16_t          drw_w,
+                  uint16_t          drw_h)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_GET_VIDEO,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_GET_VIDEO,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1207,24 +1225,24 @@ xcb_xv_get_video (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_get_still_checked (xcb_connection_t *c  /**< */,
-                          xcb_xv_port_t     port  /**< */,
-                          xcb_drawable_t    drawable  /**< */,
-                          xcb_gcontext_t    gc  /**< */,
-                          int16_t           vid_x  /**< */,
-                          int16_t           vid_y  /**< */,
-                          uint16_t          vid_w  /**< */,
-                          uint16_t          vid_h  /**< */,
-                          int16_t           drw_x  /**< */,
-                          int16_t           drw_y  /**< */,
-                          uint16_t          drw_w  /**< */,
-                          uint16_t          drw_h  /**< */)
+xcb_xv_get_still_checked (xcb_connection_t *c,
+                          xcb_xv_port_t     port,
+                          xcb_drawable_t    drawable,
+                          xcb_gcontext_t    gc,
+                          int16_t           vid_x,
+                          int16_t           vid_y,
+                          uint16_t          vid_w,
+                          uint16_t          vid_h,
+                          int16_t           drw_x,
+                          int16_t           drw_y,
+                          uint16_t          drw_w,
+                          uint16_t          drw_h)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_GET_STILL,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_GET_STILL,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1253,24 +1271,24 @@ xcb_xv_get_still_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_get_still (xcb_connection_t *c  /**< */,
-                  xcb_xv_port_t     port  /**< */,
-                  xcb_drawable_t    drawable  /**< */,
-                  xcb_gcontext_t    gc  /**< */,
-                  int16_t           vid_x  /**< */,
-                  int16_t           vid_y  /**< */,
-                  uint16_t          vid_w  /**< */,
-                  uint16_t          vid_h  /**< */,
-                  int16_t           drw_x  /**< */,
-                  int16_t           drw_y  /**< */,
-                  uint16_t          drw_w  /**< */,
-                  uint16_t          drw_h  /**< */)
+xcb_xv_get_still (xcb_connection_t *c,
+                  xcb_xv_port_t     port,
+                  xcb_drawable_t    drawable,
+                  xcb_gcontext_t    gc,
+                  int16_t           vid_x,
+                  int16_t           vid_y,
+                  uint16_t          vid_w,
+                  uint16_t          vid_h,
+                  int16_t           drw_x,
+                  int16_t           drw_y,
+                  uint16_t          drw_w,
+                  uint16_t          drw_h)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_GET_STILL,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_GET_STILL,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1299,15 +1317,15 @@ xcb_xv_get_still (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_stop_video_checked (xcb_connection_t *c  /**< */,
-                           xcb_xv_port_t     port  /**< */,
-                           xcb_drawable_t    drawable  /**< */)
+xcb_xv_stop_video_checked (xcb_connection_t *c,
+                           xcb_xv_port_t     port,
+                           xcb_drawable_t    drawable)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_STOP_VIDEO,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_STOP_VIDEO,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1327,15 +1345,15 @@ xcb_xv_stop_video_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_stop_video (xcb_connection_t *c  /**< */,
-                   xcb_xv_port_t     port  /**< */,
-                   xcb_drawable_t    drawable  /**< */)
+xcb_xv_stop_video (xcb_connection_t *c,
+                   xcb_xv_port_t     port,
+                   xcb_drawable_t    drawable)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_STOP_VIDEO,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_STOP_VIDEO,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1355,15 +1373,15 @@ xcb_xv_stop_video (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_select_video_notify_checked (xcb_connection_t *c  /**< */,
-                                    xcb_drawable_t    drawable  /**< */,
-                                    uint8_t           onoff  /**< */)
+xcb_xv_select_video_notify_checked (xcb_connection_t *c,
+                                    xcb_drawable_t    drawable,
+                                    uint8_t           onoff)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_SELECT_VIDEO_NOTIFY,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_SELECT_VIDEO_NOTIFY,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1384,15 +1402,15 @@ xcb_xv_select_video_notify_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_select_video_notify (xcb_connection_t *c  /**< */,
-                            xcb_drawable_t    drawable  /**< */,
-                            uint8_t           onoff  /**< */)
+xcb_xv_select_video_notify (xcb_connection_t *c,
+                            xcb_drawable_t    drawable,
+                            uint8_t           onoff)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_SELECT_VIDEO_NOTIFY,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_SELECT_VIDEO_NOTIFY,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1413,15 +1431,15 @@ xcb_xv_select_video_notify (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_select_port_notify_checked (xcb_connection_t *c  /**< */,
-                                   xcb_xv_port_t     port  /**< */,
-                                   uint8_t           onoff  /**< */)
+xcb_xv_select_port_notify_checked (xcb_connection_t *c,
+                                   xcb_xv_port_t     port,
+                                   uint8_t           onoff)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_SELECT_PORT_NOTIFY,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_SELECT_PORT_NOTIFY,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1442,15 +1460,15 @@ xcb_xv_select_port_notify_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_select_port_notify (xcb_connection_t *c  /**< */,
-                           xcb_xv_port_t     port  /**< */,
-                           uint8_t           onoff  /**< */)
+xcb_xv_select_port_notify (xcb_connection_t *c,
+                           xcb_xv_port_t     port,
+                           uint8_t           onoff)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_SELECT_PORT_NOTIFY,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_SELECT_PORT_NOTIFY,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1471,19 +1489,19 @@ xcb_xv_select_port_notify (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_query_best_size_cookie_t
-xcb_xv_query_best_size (xcb_connection_t *c  /**< */,
-                        xcb_xv_port_t     port  /**< */,
-                        uint16_t          vid_w  /**< */,
-                        uint16_t          vid_h  /**< */,
-                        uint16_t          drw_w  /**< */,
-                        uint16_t          drw_h  /**< */,
-                        uint8_t           motion  /**< */)
+xcb_xv_query_best_size (xcb_connection_t *c,
+                        xcb_xv_port_t     port,
+                        uint16_t          vid_w,
+                        uint16_t          vid_h,
+                        uint16_t          drw_w,
+                        uint16_t          drw_h,
+                        uint8_t           motion)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_QUERY_BEST_SIZE,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_QUERY_BEST_SIZE,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1508,19 +1526,19 @@ xcb_xv_query_best_size (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_query_best_size_cookie_t
-xcb_xv_query_best_size_unchecked (xcb_connection_t *c  /**< */,
-                                  xcb_xv_port_t     port  /**< */,
-                                  uint16_t          vid_w  /**< */,
-                                  uint16_t          vid_h  /**< */,
-                                  uint16_t          drw_w  /**< */,
-                                  uint16_t          drw_h  /**< */,
-                                  uint8_t           motion  /**< */)
+xcb_xv_query_best_size_unchecked (xcb_connection_t *c,
+                                  xcb_xv_port_t     port,
+                                  uint16_t          vid_w,
+                                  uint16_t          vid_h,
+                                  uint16_t          drw_w,
+                                  uint16_t          drw_h,
+                                  uint8_t           motion)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_QUERY_BEST_SIZE,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_QUERY_BEST_SIZE,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1545,24 +1563,24 @@ xcb_xv_query_best_size_unchecked (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_query_best_size_reply_t *
-xcb_xv_query_best_size_reply (xcb_connection_t                 *c  /**< */,
+xcb_xv_query_best_size_reply (xcb_connection_t                 *c,
                               xcb_xv_query_best_size_cookie_t   cookie  /**< */,
-                              xcb_generic_error_t             **e  /**< */)
+                              xcb_generic_error_t             **e)
 {
     return (xcb_xv_query_best_size_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 xcb_void_cookie_t
-xcb_xv_set_port_attribute_checked (xcb_connection_t *c  /**< */,
-                                   xcb_xv_port_t     port  /**< */,
-                                   xcb_atom_t        attribute  /**< */,
-                                   int32_t           value  /**< */)
+xcb_xv_set_port_attribute_checked (xcb_connection_t *c,
+                                   xcb_xv_port_t     port,
+                                   xcb_atom_t        attribute,
+                                   int32_t           value)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_SET_PORT_ATTRIBUTE,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_SET_PORT_ATTRIBUTE,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1583,16 +1601,16 @@ xcb_xv_set_port_attribute_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_set_port_attribute (xcb_connection_t *c  /**< */,
-                           xcb_xv_port_t     port  /**< */,
-                           xcb_atom_t        attribute  /**< */,
-                           int32_t           value  /**< */)
+xcb_xv_set_port_attribute (xcb_connection_t *c,
+                           xcb_xv_port_t     port,
+                           xcb_atom_t        attribute,
+                           int32_t           value)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_SET_PORT_ATTRIBUTE,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_SET_PORT_ATTRIBUTE,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1613,15 +1631,15 @@ xcb_xv_set_port_attribute (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_get_port_attribute_cookie_t
-xcb_xv_get_port_attribute (xcb_connection_t *c  /**< */,
-                           xcb_xv_port_t     port  /**< */,
-                           xcb_atom_t        attribute  /**< */)
+xcb_xv_get_port_attribute (xcb_connection_t *c,
+                           xcb_xv_port_t     port,
+                           xcb_atom_t        attribute)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_GET_PORT_ATTRIBUTE,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_GET_PORT_ATTRIBUTE,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1641,15 +1659,15 @@ xcb_xv_get_port_attribute (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_get_port_attribute_cookie_t
-xcb_xv_get_port_attribute_unchecked (xcb_connection_t *c  /**< */,
-                                     xcb_xv_port_t     port  /**< */,
-                                     xcb_atom_t        attribute  /**< */)
+xcb_xv_get_port_attribute_unchecked (xcb_connection_t *c,
+                                     xcb_xv_port_t     port,
+                                     xcb_atom_t        attribute)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_GET_PORT_ATTRIBUTE,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_GET_PORT_ATTRIBUTE,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1669,15 +1687,15 @@ xcb_xv_get_port_attribute_unchecked (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_get_port_attribute_reply_t *
-xcb_xv_get_port_attribute_reply (xcb_connection_t                    *c  /**< */,
+xcb_xv_get_port_attribute_reply (xcb_connection_t                    *c,
                                  xcb_xv_get_port_attribute_cookie_t   cookie  /**< */,
-                                 xcb_generic_error_t                **e  /**< */)
+                                 xcb_generic_error_t                **e)
 {
     return (xcb_xv_get_port_attribute_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 int
-xcb_xv_query_port_attributes_sizeof (const void  *_buffer  /**< */)
+xcb_xv_query_port_attributes_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xv_query_port_attributes_reply_t *_aux = (xcb_xv_query_port_attributes_reply_t *)_buffer;
@@ -1713,14 +1731,14 @@ xcb_xv_query_port_attributes_sizeof (const void  *_buffer  /**< */)
 }
 
 xcb_xv_query_port_attributes_cookie_t
-xcb_xv_query_port_attributes (xcb_connection_t *c  /**< */,
-                              xcb_xv_port_t     port  /**< */)
+xcb_xv_query_port_attributes (xcb_connection_t *c,
+                              xcb_xv_port_t     port)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_QUERY_PORT_ATTRIBUTES,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_QUERY_PORT_ATTRIBUTES,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1739,14 +1757,14 @@ xcb_xv_query_port_attributes (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_query_port_attributes_cookie_t
-xcb_xv_query_port_attributes_unchecked (xcb_connection_t *c  /**< */,
-                                        xcb_xv_port_t     port  /**< */)
+xcb_xv_query_port_attributes_unchecked (xcb_connection_t *c,
+                                        xcb_xv_port_t     port)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_QUERY_PORT_ATTRIBUTES,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_QUERY_PORT_ATTRIBUTES,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1765,13 +1783,13 @@ xcb_xv_query_port_attributes_unchecked (xcb_connection_t *c  /**< */,
 }
 
 int
-xcb_xv_query_port_attributes_attributes_length (const xcb_xv_query_port_attributes_reply_t *R  /**< */)
+xcb_xv_query_port_attributes_attributes_length (const xcb_xv_query_port_attributes_reply_t *R)
 {
     return R->num_attributes;
 }
 
 xcb_xv_attribute_info_iterator_t
-xcb_xv_query_port_attributes_attributes_iterator (const xcb_xv_query_port_attributes_reply_t *R  /**< */)
+xcb_xv_query_port_attributes_attributes_iterator (const xcb_xv_query_port_attributes_reply_t *R)
 {
     xcb_xv_attribute_info_iterator_t i;
     i.data = (xcb_xv_attribute_info_t *) (R + 1);
@@ -1781,15 +1799,15 @@ xcb_xv_query_port_attributes_attributes_iterator (const xcb_xv_query_port_attrib
 }
 
 xcb_xv_query_port_attributes_reply_t *
-xcb_xv_query_port_attributes_reply (xcb_connection_t                       *c  /**< */,
+xcb_xv_query_port_attributes_reply (xcb_connection_t                       *c,
                                     xcb_xv_query_port_attributes_cookie_t   cookie  /**< */,
-                                    xcb_generic_error_t                   **e  /**< */)
+                                    xcb_generic_error_t                   **e)
 {
     return (xcb_xv_query_port_attributes_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 int
-xcb_xv_list_image_formats_sizeof (const void  *_buffer  /**< */)
+xcb_xv_list_image_formats_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xv_list_image_formats_reply_t *_aux = (xcb_xv_list_image_formats_reply_t *)_buffer;
@@ -1820,14 +1838,14 @@ xcb_xv_list_image_formats_sizeof (const void  *_buffer  /**< */)
 }
 
 xcb_xv_list_image_formats_cookie_t
-xcb_xv_list_image_formats (xcb_connection_t *c  /**< */,
-                           xcb_xv_port_t     port  /**< */)
+xcb_xv_list_image_formats (xcb_connection_t *c,
+                           xcb_xv_port_t     port)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_LIST_IMAGE_FORMATS,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_LIST_IMAGE_FORMATS,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1846,14 +1864,14 @@ xcb_xv_list_image_formats (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_list_image_formats_cookie_t
-xcb_xv_list_image_formats_unchecked (xcb_connection_t *c  /**< */,
-                                     xcb_xv_port_t     port  /**< */)
+xcb_xv_list_image_formats_unchecked (xcb_connection_t *c,
+                                     xcb_xv_port_t     port)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_LIST_IMAGE_FORMATS,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_LIST_IMAGE_FORMATS,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1872,19 +1890,19 @@ xcb_xv_list_image_formats_unchecked (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_image_format_info_t *
-xcb_xv_list_image_formats_format (const xcb_xv_list_image_formats_reply_t *R  /**< */)
+xcb_xv_list_image_formats_format (const xcb_xv_list_image_formats_reply_t *R)
 {
     return (xcb_xv_image_format_info_t *) (R + 1);
 }
 
 int
-xcb_xv_list_image_formats_format_length (const xcb_xv_list_image_formats_reply_t *R  /**< */)
+xcb_xv_list_image_formats_format_length (const xcb_xv_list_image_formats_reply_t *R)
 {
     return R->num_formats;
 }
 
 xcb_xv_image_format_info_iterator_t
-xcb_xv_list_image_formats_format_iterator (const xcb_xv_list_image_formats_reply_t *R  /**< */)
+xcb_xv_list_image_formats_format_iterator (const xcb_xv_list_image_formats_reply_t *R)
 {
     xcb_xv_image_format_info_iterator_t i;
     i.data = (xcb_xv_image_format_info_t *) (R + 1);
@@ -1894,15 +1912,15 @@ xcb_xv_list_image_formats_format_iterator (const xcb_xv_list_image_formats_reply
 }
 
 xcb_xv_list_image_formats_reply_t *
-xcb_xv_list_image_formats_reply (xcb_connection_t                    *c  /**< */,
+xcb_xv_list_image_formats_reply (xcb_connection_t                    *c,
                                  xcb_xv_list_image_formats_cookie_t   cookie  /**< */,
-                                 xcb_generic_error_t                **e  /**< */)
+                                 xcb_generic_error_t                **e)
 {
     return (xcb_xv_list_image_formats_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 int
-xcb_xv_query_image_attributes_sizeof (const void  *_buffer  /**< */)
+xcb_xv_query_image_attributes_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xv_query_image_attributes_reply_t *_aux = (xcb_xv_query_image_attributes_reply_t *)_buffer;
@@ -1945,17 +1963,17 @@ xcb_xv_query_image_attributes_sizeof (const void  *_buffer  /**< */)
 }
 
 xcb_xv_query_image_attributes_cookie_t
-xcb_xv_query_image_attributes (xcb_connection_t *c  /**< */,
-                               xcb_xv_port_t     port  /**< */,
-                               uint32_t          id  /**< */,
-                               uint16_t          width  /**< */,
-                               uint16_t          height  /**< */)
+xcb_xv_query_image_attributes (xcb_connection_t *c,
+                               xcb_xv_port_t     port,
+                               uint32_t          id,
+                               uint16_t          width,
+                               uint16_t          height)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_QUERY_IMAGE_ATTRIBUTES,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_QUERY_IMAGE_ATTRIBUTES,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1977,17 +1995,17 @@ xcb_xv_query_image_attributes (xcb_connection_t *c  /**< */,
 }
 
 xcb_xv_query_image_attributes_cookie_t
-xcb_xv_query_image_attributes_unchecked (xcb_connection_t *c  /**< */,
-                                         xcb_xv_port_t     port  /**< */,
-                                         uint32_t          id  /**< */,
-                                         uint16_t          width  /**< */,
-                                         uint16_t          height  /**< */)
+xcb_xv_query_image_attributes_unchecked (xcb_connection_t *c,
+                                         xcb_xv_port_t     port,
+                                         uint32_t          id,
+                                         uint16_t          width,
+                                         uint16_t          height)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_QUERY_IMAGE_ATTRIBUTES,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_QUERY_IMAGE_ATTRIBUTES,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -2009,19 +2027,19 @@ xcb_xv_query_image_attributes_unchecked (xcb_connection_t *c  /**< */,
 }
 
 uint32_t *
-xcb_xv_query_image_attributes_pitches (const xcb_xv_query_image_attributes_reply_t *R  /**< */)
+xcb_xv_query_image_attributes_pitches (const xcb_xv_query_image_attributes_reply_t *R)
 {
     return (uint32_t *) (R + 1);
 }
 
 int
-xcb_xv_query_image_attributes_pitches_length (const xcb_xv_query_image_attributes_reply_t *R  /**< */)
+xcb_xv_query_image_attributes_pitches_length (const xcb_xv_query_image_attributes_reply_t *R)
 {
     return R->num_planes;
 }
 
 xcb_generic_iterator_t
-xcb_xv_query_image_attributes_pitches_end (const xcb_xv_query_image_attributes_reply_t *R  /**< */)
+xcb_xv_query_image_attributes_pitches_end (const xcb_xv_query_image_attributes_reply_t *R)
 {
     xcb_generic_iterator_t i;
     i.data = ((uint32_t *) (R + 1)) + (R->num_planes);
@@ -2031,40 +2049,40 @@ xcb_xv_query_image_attributes_pitches_end (const xcb_xv_query_image_attributes_r
 }
 
 uint32_t *
-xcb_xv_query_image_attributes_offsets (const xcb_xv_query_image_attributes_reply_t *R  /**< */)
+xcb_xv_query_image_attributes_offsets (const xcb_xv_query_image_attributes_reply_t *R)
 {
     xcb_generic_iterator_t prev = xcb_xv_query_image_attributes_pitches_end(R);
     return (uint32_t *) ((char *) prev.data + XCB_TYPE_PAD(uint32_t, prev.index) + 0);
 }
 
 int
-xcb_xv_query_image_attributes_offsets_length (const xcb_xv_query_image_attributes_reply_t *R  /**< */)
+xcb_xv_query_image_attributes_offsets_length (const xcb_xv_query_image_attributes_reply_t *R)
 {
     return R->num_planes;
 }
 
 xcb_generic_iterator_t
-xcb_xv_query_image_attributes_offsets_end (const xcb_xv_query_image_attributes_reply_t *R  /**< */)
+xcb_xv_query_image_attributes_offsets_end (const xcb_xv_query_image_attributes_reply_t *R)
 {
     xcb_generic_iterator_t i;
-    xcb_generic_iterator_t child = xcb_xv_query_image_attributes_pitches_end(R);
-    i.data = ((uint32_t *) child.data) + (R->num_planes);
+    xcb_generic_iterator_t prev = xcb_xv_query_image_attributes_pitches_end(R);
+    i.data = ((uint32_t *) ((char*) prev.data + XCB_TYPE_PAD(uint32_t, prev.index))) + (R->num_planes);
     i.rem = 0;
     i.index = (char *) i.data - (char *) R;
     return i;
 }
 
 xcb_xv_query_image_attributes_reply_t *
-xcb_xv_query_image_attributes_reply (xcb_connection_t                        *c  /**< */,
+xcb_xv_query_image_attributes_reply (xcb_connection_t                        *c,
                                      xcb_xv_query_image_attributes_cookie_t   cookie  /**< */,
-                                     xcb_generic_error_t                    **e  /**< */)
+                                     xcb_generic_error_t                    **e)
 {
     return (xcb_xv_query_image_attributes_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 int
-xcb_xv_put_image_sizeof (const void  *_buffer  /**< */,
-                         uint32_t     data_len  /**< */)
+xcb_xv_put_image_sizeof (const void  *_buffer,
+                         uint32_t     data_len)
 {
     char *xcb_tmp = (char *)_buffer;
     unsigned int xcb_buffer_len = 0;
@@ -2094,29 +2112,29 @@ xcb_xv_put_image_sizeof (const void  *_buffer  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_put_image_checked (xcb_connection_t *c  /**< */,
-                          xcb_xv_port_t     port  /**< */,
-                          xcb_drawable_t    drawable  /**< */,
-                          xcb_gcontext_t    gc  /**< */,
-                          uint32_t          id  /**< */,
-                          int16_t           src_x  /**< */,
-                          int16_t           src_y  /**< */,
-                          uint16_t          src_w  /**< */,
-                          uint16_t          src_h  /**< */,
-                          int16_t           drw_x  /**< */,
-                          int16_t           drw_y  /**< */,
-                          uint16_t          drw_w  /**< */,
-                          uint16_t          drw_h  /**< */,
-                          uint16_t          width  /**< */,
-                          uint16_t          height  /**< */,
-                          uint32_t          data_len  /**< */,
-                          const uint8_t    *data  /**< */)
+xcb_xv_put_image_checked (xcb_connection_t *c,
+                          xcb_xv_port_t     port,
+                          xcb_drawable_t    drawable,
+                          xcb_gcontext_t    gc,
+                          uint32_t          id,
+                          int16_t           src_x,
+                          int16_t           src_y,
+                          uint16_t          src_w,
+                          uint16_t          src_h,
+                          int16_t           drw_x,
+                          int16_t           drw_y,
+                          uint16_t          drw_w,
+                          uint16_t          drw_h,
+                          uint16_t          width,
+                          uint16_t          height,
+                          uint32_t          data_len,
+                          const uint8_t    *data)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 4,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_PUT_IMAGE,
-        /* isvoid */ 1
+        .count = 4,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_PUT_IMAGE,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[6];
@@ -2153,29 +2171,29 @@ xcb_xv_put_image_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_put_image (xcb_connection_t *c  /**< */,
-                  xcb_xv_port_t     port  /**< */,
-                  xcb_drawable_t    drawable  /**< */,
-                  xcb_gcontext_t    gc  /**< */,
-                  uint32_t          id  /**< */,
-                  int16_t           src_x  /**< */,
-                  int16_t           src_y  /**< */,
-                  uint16_t          src_w  /**< */,
-                  uint16_t          src_h  /**< */,
-                  int16_t           drw_x  /**< */,
-                  int16_t           drw_y  /**< */,
-                  uint16_t          drw_w  /**< */,
-                  uint16_t          drw_h  /**< */,
-                  uint16_t          width  /**< */,
-                  uint16_t          height  /**< */,
-                  uint32_t          data_len  /**< */,
-                  const uint8_t    *data  /**< */)
+xcb_xv_put_image (xcb_connection_t *c,
+                  xcb_xv_port_t     port,
+                  xcb_drawable_t    drawable,
+                  xcb_gcontext_t    gc,
+                  uint32_t          id,
+                  int16_t           src_x,
+                  int16_t           src_y,
+                  uint16_t          src_w,
+                  uint16_t          src_h,
+                  int16_t           drw_x,
+                  int16_t           drw_y,
+                  uint16_t          drw_w,
+                  uint16_t          drw_h,
+                  uint16_t          width,
+                  uint16_t          height,
+                  uint32_t          data_len,
+                  const uint8_t    *data)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 4,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_PUT_IMAGE,
-        /* isvoid */ 1
+        .count = 4,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_PUT_IMAGE,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[6];
@@ -2211,31 +2229,53 @@ xcb_xv_put_image (xcb_connection_t *c  /**< */,
     return xcb_ret;
 }
 
+uint8_t *
+xcb_xv_put_image_data (const xcb_xv_put_image_request_t *R)
+{
+    return (uint8_t *) (R + 1);
+}
+
+int
+xcb_xv_put_image_data_length (const xcb_xv_put_image_request_t *R)
+{
+    return (((R->length * 4) - sizeof(xcb_xv_put_image_request_t))/sizeof(uint8_t));
+}
+
+xcb_generic_iterator_t
+xcb_xv_put_image_data_end (const xcb_xv_put_image_request_t *R)
+{
+    xcb_generic_iterator_t i;
+    i.data = ((uint8_t *) (R + 1)) + ((((R->length * 4) - sizeof(xcb_xv_put_image_request_t))/sizeof(uint8_t)));
+    i.rem = 0;
+    i.index = (char *) i.data - (char *) R;
+    return i;
+}
+
 xcb_void_cookie_t
-xcb_xv_shm_put_image_checked (xcb_connection_t *c  /**< */,
-                              xcb_xv_port_t     port  /**< */,
-                              xcb_drawable_t    drawable  /**< */,
-                              xcb_gcontext_t    gc  /**< */,
-                              xcb_shm_seg_t     shmseg  /**< */,
-                              uint32_t          id  /**< */,
-                              uint32_t          offset  /**< */,
-                              int16_t           src_x  /**< */,
-                              int16_t           src_y  /**< */,
-                              uint16_t          src_w  /**< */,
-                              uint16_t          src_h  /**< */,
-                              int16_t           drw_x  /**< */,
-                              int16_t           drw_y  /**< */,
-                              uint16_t          drw_w  /**< */,
-                              uint16_t          drw_h  /**< */,
-                              uint16_t          width  /**< */,
-                              uint16_t          height  /**< */,
-                              uint8_t           send_event  /**< */)
+xcb_xv_shm_put_image_checked (xcb_connection_t *c,
+                              xcb_xv_port_t     port,
+                              xcb_drawable_t    drawable,
+                              xcb_gcontext_t    gc,
+                              xcb_shm_seg_t     shmseg,
+                              uint32_t          id,
+                              uint32_t          offset,
+                              int16_t           src_x,
+                              int16_t           src_y,
+                              uint16_t          src_w,
+                              uint16_t          src_h,
+                              int16_t           drw_x,
+                              int16_t           drw_y,
+                              uint16_t          drw_w,
+                              uint16_t          drw_h,
+                              uint16_t          width,
+                              uint16_t          height,
+                              uint8_t           send_event)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_SHM_PUT_IMAGE,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_SHM_PUT_IMAGE,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -2271,30 +2311,30 @@ xcb_xv_shm_put_image_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xv_shm_put_image (xcb_connection_t *c  /**< */,
-                      xcb_xv_port_t     port  /**< */,
-                      xcb_drawable_t    drawable  /**< */,
-                      xcb_gcontext_t    gc  /**< */,
-                      xcb_shm_seg_t     shmseg  /**< */,
-                      uint32_t          id  /**< */,
-                      uint32_t          offset  /**< */,
-                      int16_t           src_x  /**< */,
-                      int16_t           src_y  /**< */,
-                      uint16_t          src_w  /**< */,
-                      uint16_t          src_h  /**< */,
-                      int16_t           drw_x  /**< */,
-                      int16_t           drw_y  /**< */,
-                      uint16_t          drw_w  /**< */,
-                      uint16_t          drw_h  /**< */,
-                      uint16_t          width  /**< */,
-                      uint16_t          height  /**< */,
-                      uint8_t           send_event  /**< */)
+xcb_xv_shm_put_image (xcb_connection_t *c,
+                      xcb_xv_port_t     port,
+                      xcb_drawable_t    drawable,
+                      xcb_gcontext_t    gc,
+                      xcb_shm_seg_t     shmseg,
+                      uint32_t          id,
+                      uint32_t          offset,
+                      int16_t           src_x,
+                      int16_t           src_y,
+                      uint16_t          src_w,
+                      uint16_t          src_h,
+                      int16_t           drw_x,
+                      int16_t           drw_y,
+                      uint16_t          drw_w,
+                      uint16_t          drw_h,
+                      uint16_t          width,
+                      uint16_t          height,
+                      uint8_t           send_event)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xv_id,
-        /* opcode */ XCB_XV_SHM_PUT_IMAGE,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xv_id,
+        .opcode = XCB_XV_SHM_PUT_IMAGE,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];