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

1 files changed, 670 insertions, 560 deletions

diff --git a/lib/libxcb/src/xfixes.c b/lib/libxcb/src/xfixes.c
index a10868c44..cc1642aa5 100644
--- a/lib/libxcb/src/xfixes.c
+++ b/lib/libxcb/src/xfixes.c
@@ -21,15 +21,15 @@
 xcb_extension_t xcb_xfixes_id = { "XFIXES", 0 };
 
 xcb_xfixes_query_version_cookie_t
-xcb_xfixes_query_version (xcb_connection_t *c  /**< */,
-                          uint32_t          client_major_version  /**< */,
-                          uint32_t          client_minor_version  /**< */)
+xcb_xfixes_query_version (xcb_connection_t *c,
+                          uint32_t          client_major_version,
+                          uint32_t          client_minor_version)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_QUERY_VERSION,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_QUERY_VERSION,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -49,15 +49,15 @@ xcb_xfixes_query_version (xcb_connection_t *c  /**< */,
 }
 
 xcb_xfixes_query_version_cookie_t
-xcb_xfixes_query_version_unchecked (xcb_connection_t *c  /**< */,
-                                    uint32_t          client_major_version  /**< */,
-                                    uint32_t          client_minor_version  /**< */)
+xcb_xfixes_query_version_unchecked (xcb_connection_t *c,
+                                    uint32_t          client_major_version,
+                                    uint32_t          client_minor_version)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_QUERY_VERSION,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_QUERY_VERSION,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -77,25 +77,25 @@ xcb_xfixes_query_version_unchecked (xcb_connection_t *c  /**< */,
 }
 
 xcb_xfixes_query_version_reply_t *
-xcb_xfixes_query_version_reply (xcb_connection_t                   *c  /**< */,
+xcb_xfixes_query_version_reply (xcb_connection_t                   *c,
                                 xcb_xfixes_query_version_cookie_t   cookie  /**< */,
-                                xcb_generic_error_t               **e  /**< */)
+                                xcb_generic_error_t               **e)
 {
     return (xcb_xfixes_query_version_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 xcb_void_cookie_t
-xcb_xfixes_change_save_set_checked (xcb_connection_t *c  /**< */,
-                                    uint8_t           mode  /**< */,
-                                    uint8_t           target  /**< */,
-                                    uint8_t           map  /**< */,
-                                    xcb_window_t      window  /**< */)
+xcb_xfixes_change_save_set_checked (xcb_connection_t *c,
+                                    uint8_t           mode,
+                                    uint8_t           target,
+                                    uint8_t           map,
+                                    xcb_window_t      window)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CHANGE_SAVE_SET,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CHANGE_SAVE_SET,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -118,17 +118,17 @@ xcb_xfixes_change_save_set_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_change_save_set (xcb_connection_t *c  /**< */,
-                            uint8_t           mode  /**< */,
-                            uint8_t           target  /**< */,
-                            uint8_t           map  /**< */,
-                            xcb_window_t      window  /**< */)
+xcb_xfixes_change_save_set (xcb_connection_t *c,
+                            uint8_t           mode,
+                            uint8_t           target,
+                            uint8_t           map,
+                            xcb_window_t      window)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CHANGE_SAVE_SET,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CHANGE_SAVE_SET,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -151,16 +151,16 @@ xcb_xfixes_change_save_set (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_select_selection_input_checked (xcb_connection_t *c  /**< */,
-                                           xcb_window_t      window  /**< */,
-                                           xcb_atom_t        selection  /**< */,
-                                           uint32_t          event_mask  /**< */)
+xcb_xfixes_select_selection_input_checked (xcb_connection_t *c,
+                                           xcb_window_t      window,
+                                           xcb_atom_t        selection,
+                                           uint32_t          event_mask)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SELECT_SELECTION_INPUT,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SELECT_SELECTION_INPUT,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -181,16 +181,16 @@ xcb_xfixes_select_selection_input_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_select_selection_input (xcb_connection_t *c  /**< */,
-                                   xcb_window_t      window  /**< */,
-                                   xcb_atom_t        selection  /**< */,
-                                   uint32_t          event_mask  /**< */)
+xcb_xfixes_select_selection_input (xcb_connection_t *c,
+                                   xcb_window_t      window,
+                                   xcb_atom_t        selection,
+                                   uint32_t          event_mask)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SELECT_SELECTION_INPUT,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SELECT_SELECTION_INPUT,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -211,15 +211,15 @@ xcb_xfixes_select_selection_input (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_select_cursor_input_checked (xcb_connection_t *c  /**< */,
-                                        xcb_window_t      window  /**< */,
-                                        uint32_t          event_mask  /**< */)
+xcb_xfixes_select_cursor_input_checked (xcb_connection_t *c,
+                                        xcb_window_t      window,
+                                        uint32_t          event_mask)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SELECT_CURSOR_INPUT,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SELECT_CURSOR_INPUT,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -239,15 +239,15 @@ xcb_xfixes_select_cursor_input_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_select_cursor_input (xcb_connection_t *c  /**< */,
-                                xcb_window_t      window  /**< */,
-                                uint32_t          event_mask  /**< */)
+xcb_xfixes_select_cursor_input (xcb_connection_t *c,
+                                xcb_window_t      window,
+                                uint32_t          event_mask)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SELECT_CURSOR_INPUT,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SELECT_CURSOR_INPUT,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -267,7 +267,7 @@ xcb_xfixes_select_cursor_input (xcb_connection_t *c  /**< */,
 }
 
 int
-xcb_xfixes_get_cursor_image_sizeof (const void  *_buffer  /**< */)
+xcb_xfixes_get_cursor_image_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xfixes_get_cursor_image_reply_t *_aux = (xcb_xfixes_get_cursor_image_reply_t *)_buffer;
@@ -298,13 +298,13 @@ xcb_xfixes_get_cursor_image_sizeof (const void  *_buffer  /**< */)
 }
 
 xcb_xfixes_get_cursor_image_cookie_t
-xcb_xfixes_get_cursor_image (xcb_connection_t *c  /**< */)
+xcb_xfixes_get_cursor_image (xcb_connection_t *c)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_GET_CURSOR_IMAGE,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_GET_CURSOR_IMAGE,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -322,13 +322,13 @@ xcb_xfixes_get_cursor_image (xcb_connection_t *c  /**< */)
 }
 
 xcb_xfixes_get_cursor_image_cookie_t
-xcb_xfixes_get_cursor_image_unchecked (xcb_connection_t *c  /**< */)
+xcb_xfixes_get_cursor_image_unchecked (xcb_connection_t *c)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_GET_CURSOR_IMAGE,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_GET_CURSOR_IMAGE,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -346,19 +346,19 @@ xcb_xfixes_get_cursor_image_unchecked (xcb_connection_t *c  /**< */)
 }
 
 uint32_t *
-xcb_xfixes_get_cursor_image_cursor_image (const xcb_xfixes_get_cursor_image_reply_t *R  /**< */)
+xcb_xfixes_get_cursor_image_cursor_image (const xcb_xfixes_get_cursor_image_reply_t *R)
 {
     return (uint32_t *) (R + 1);
 }
 
 int
-xcb_xfixes_get_cursor_image_cursor_image_length (const xcb_xfixes_get_cursor_image_reply_t *R  /**< */)
+xcb_xfixes_get_cursor_image_cursor_image_length (const xcb_xfixes_get_cursor_image_reply_t *R)
 {
     return (R->width * R->height);
 }
 
 xcb_generic_iterator_t
-xcb_xfixes_get_cursor_image_cursor_image_end (const xcb_xfixes_get_cursor_image_reply_t *R  /**< */)
+xcb_xfixes_get_cursor_image_cursor_image_end (const xcb_xfixes_get_cursor_image_reply_t *R)
 {
     xcb_generic_iterator_t i;
     i.data = ((uint32_t *) (R + 1)) + ((R->width * R->height));
@@ -368,15 +368,15 @@ xcb_xfixes_get_cursor_image_cursor_image_end (const xcb_xfixes_get_cursor_image_
 }
 
 xcb_xfixes_get_cursor_image_reply_t *
-xcb_xfixes_get_cursor_image_reply (xcb_connection_t                      *c  /**< */,
+xcb_xfixes_get_cursor_image_reply (xcb_connection_t                      *c,
                                    xcb_xfixes_get_cursor_image_cookie_t   cookie  /**< */,
-                                   xcb_generic_error_t                  **e  /**< */)
+                                   xcb_generic_error_t                  **e)
 {
     return (xcb_xfixes_get_cursor_image_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 void
-xcb_xfixes_region_next (xcb_xfixes_region_iterator_t *i  /**< */)
+xcb_xfixes_region_next (xcb_xfixes_region_iterator_t *i)
 {
     --i->rem;
     ++i->data;
@@ -384,7 +384,7 @@ xcb_xfixes_region_next (xcb_xfixes_region_iterator_t *i  /**< */)
 }
 
 xcb_generic_iterator_t
-xcb_xfixes_region_end (xcb_xfixes_region_iterator_t i  /**< */)
+xcb_xfixes_region_end (xcb_xfixes_region_iterator_t i)
 {
     xcb_generic_iterator_t ret;
     ret.data = i.data + i.rem;
@@ -394,8 +394,8 @@ xcb_xfixes_region_end (xcb_xfixes_region_iterator_t i  /**< */)
 }
 
 int
-xcb_xfixes_create_region_sizeof (const void  *_buffer  /**< */,
-                                 uint32_t     rectangles_len  /**< */)
+xcb_xfixes_create_region_sizeof (const void  *_buffer,
+                                 uint32_t     rectangles_len)
 {
     char *xcb_tmp = (char *)_buffer;
     unsigned int xcb_buffer_len = 0;
@@ -425,16 +425,16 @@ xcb_xfixes_create_region_sizeof (const void  *_buffer  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_create_region_checked (xcb_connection_t      *c  /**< */,
-                                  xcb_xfixes_region_t    region  /**< */,
-                                  uint32_t               rectangles_len  /**< */,
-                                  const xcb_rectangle_t *rectangles  /**< */)
+xcb_xfixes_create_region_checked (xcb_connection_t      *c,
+                                  xcb_xfixes_region_t    region,
+                                  uint32_t               rectangles_len,
+                                  const xcb_rectangle_t *rectangles)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 4,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CREATE_REGION,
-        /* isvoid */ 1
+        .count = 4,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CREATE_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[6];
@@ -458,16 +458,16 @@ xcb_xfixes_create_region_checked (xcb_connection_t      *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_create_region (xcb_connection_t      *c  /**< */,
-                          xcb_xfixes_region_t    region  /**< */,
-                          uint32_t               rectangles_len  /**< */,
-                          const xcb_rectangle_t *rectangles  /**< */)
+xcb_xfixes_create_region (xcb_connection_t      *c,
+                          xcb_xfixes_region_t    region,
+                          uint32_t               rectangles_len,
+                          const xcb_rectangle_t *rectangles)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 4,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CREATE_REGION,
-        /* isvoid */ 1
+        .count = 4,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CREATE_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[6];
@@ -490,16 +490,38 @@ xcb_xfixes_create_region (xcb_connection_t      *c  /**< */,
     return xcb_ret;
 }
 
+xcb_rectangle_t *
+xcb_xfixes_create_region_rectangles (const xcb_xfixes_create_region_request_t *R)
+{
+    return (xcb_rectangle_t *) (R + 1);
+}
+
+int
+xcb_xfixes_create_region_rectangles_length (const xcb_xfixes_create_region_request_t *R)
+{
+    return (((R->length * 4) - sizeof(xcb_xfixes_create_region_request_t))/sizeof(xcb_rectangle_t));
+}
+
+xcb_rectangle_iterator_t
+xcb_xfixes_create_region_rectangles_iterator (const xcb_xfixes_create_region_request_t *R)
+{
+    xcb_rectangle_iterator_t i;
+    i.data = (xcb_rectangle_t *) (R + 1);
+    i.rem = (((R->length * 4) - sizeof(xcb_xfixes_create_region_request_t))/sizeof(xcb_rectangle_t));
+    i.index = (char *) i.data - (char *) R;
+    return i;
+}
+
 xcb_void_cookie_t
-xcb_xfixes_create_region_from_bitmap_checked (xcb_connection_t    *c  /**< */,
-                                              xcb_xfixes_region_t  region  /**< */,
-                                              xcb_pixmap_t         bitmap  /**< */)
+xcb_xfixes_create_region_from_bitmap_checked (xcb_connection_t    *c,
+                                              xcb_xfixes_region_t  region,
+                                              xcb_pixmap_t         bitmap)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CREATE_REGION_FROM_BITMAP,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CREATE_REGION_FROM_BITMAP,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -519,15 +541,15 @@ xcb_xfixes_create_region_from_bitmap_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_create_region_from_bitmap (xcb_connection_t    *c  /**< */,
-                                      xcb_xfixes_region_t  region  /**< */,
-                                      xcb_pixmap_t         bitmap  /**< */)
+xcb_xfixes_create_region_from_bitmap (xcb_connection_t    *c,
+                                      xcb_xfixes_region_t  region,
+                                      xcb_pixmap_t         bitmap)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CREATE_REGION_FROM_BITMAP,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CREATE_REGION_FROM_BITMAP,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -547,16 +569,16 @@ xcb_xfixes_create_region_from_bitmap (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_create_region_from_window_checked (xcb_connection_t    *c  /**< */,
-                                              xcb_xfixes_region_t  region  /**< */,
-                                              xcb_window_t         window  /**< */,
-                                              xcb_shape_kind_t     kind  /**< */)
+xcb_xfixes_create_region_from_window_checked (xcb_connection_t    *c,
+                                              xcb_xfixes_region_t  region,
+                                              xcb_window_t         window,
+                                              xcb_shape_kind_t     kind)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CREATE_REGION_FROM_WINDOW,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CREATE_REGION_FROM_WINDOW,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -578,16 +600,16 @@ xcb_xfixes_create_region_from_window_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_create_region_from_window (xcb_connection_t    *c  /**< */,
-                                      xcb_xfixes_region_t  region  /**< */,
-                                      xcb_window_t         window  /**< */,
-                                      xcb_shape_kind_t     kind  /**< */)
+xcb_xfixes_create_region_from_window (xcb_connection_t    *c,
+                                      xcb_xfixes_region_t  region,
+                                      xcb_window_t         window,
+                                      xcb_shape_kind_t     kind)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CREATE_REGION_FROM_WINDOW,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CREATE_REGION_FROM_WINDOW,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -609,15 +631,15 @@ xcb_xfixes_create_region_from_window (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_create_region_from_gc_checked (xcb_connection_t    *c  /**< */,
-                                          xcb_xfixes_region_t  region  /**< */,
-                                          xcb_gcontext_t       gc  /**< */)
+xcb_xfixes_create_region_from_gc_checked (xcb_connection_t    *c,
+                                          xcb_xfixes_region_t  region,
+                                          xcb_gcontext_t       gc)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CREATE_REGION_FROM_GC,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CREATE_REGION_FROM_GC,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -637,15 +659,15 @@ xcb_xfixes_create_region_from_gc_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_create_region_from_gc (xcb_connection_t    *c  /**< */,
-                                  xcb_xfixes_region_t  region  /**< */,
-                                  xcb_gcontext_t       gc  /**< */)
+xcb_xfixes_create_region_from_gc (xcb_connection_t    *c,
+                                  xcb_xfixes_region_t  region,
+                                  xcb_gcontext_t       gc)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CREATE_REGION_FROM_GC,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CREATE_REGION_FROM_GC,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -665,15 +687,15 @@ xcb_xfixes_create_region_from_gc (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_create_region_from_picture_checked (xcb_connection_t     *c  /**< */,
-                                               xcb_xfixes_region_t   region  /**< */,
-                                               xcb_render_picture_t  picture  /**< */)
+xcb_xfixes_create_region_from_picture_checked (xcb_connection_t     *c,
+                                               xcb_xfixes_region_t   region,
+                                               xcb_render_picture_t  picture)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CREATE_REGION_FROM_PICTURE,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CREATE_REGION_FROM_PICTURE,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -693,15 +715,15 @@ xcb_xfixes_create_region_from_picture_checked (xcb_connection_t     *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_create_region_from_picture (xcb_connection_t     *c  /**< */,
-                                       xcb_xfixes_region_t   region  /**< */,
-                                       xcb_render_picture_t  picture  /**< */)
+xcb_xfixes_create_region_from_picture (xcb_connection_t     *c,
+                                       xcb_xfixes_region_t   region,
+                                       xcb_render_picture_t  picture)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CREATE_REGION_FROM_PICTURE,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CREATE_REGION_FROM_PICTURE,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -721,14 +743,14 @@ xcb_xfixes_create_region_from_picture (xcb_connection_t     *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_destroy_region_checked (xcb_connection_t    *c  /**< */,
-                                   xcb_xfixes_region_t  region  /**< */)
+xcb_xfixes_destroy_region_checked (xcb_connection_t    *c,
+                                   xcb_xfixes_region_t  region)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_DESTROY_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_DESTROY_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -747,14 +769,14 @@ xcb_xfixes_destroy_region_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_destroy_region (xcb_connection_t    *c  /**< */,
-                           xcb_xfixes_region_t  region  /**< */)
+xcb_xfixes_destroy_region (xcb_connection_t    *c,
+                           xcb_xfixes_region_t  region)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_DESTROY_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_DESTROY_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -773,8 +795,8 @@ xcb_xfixes_destroy_region (xcb_connection_t    *c  /**< */,
 }
 
 int
-xcb_xfixes_set_region_sizeof (const void  *_buffer  /**< */,
-                              uint32_t     rectangles_len  /**< */)
+xcb_xfixes_set_region_sizeof (const void  *_buffer,
+                              uint32_t     rectangles_len)
 {
     char *xcb_tmp = (char *)_buffer;
     unsigned int xcb_buffer_len = 0;
@@ -804,16 +826,16 @@ xcb_xfixes_set_region_sizeof (const void  *_buffer  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_set_region_checked (xcb_connection_t      *c  /**< */,
-                               xcb_xfixes_region_t    region  /**< */,
-                               uint32_t               rectangles_len  /**< */,
-                               const xcb_rectangle_t *rectangles  /**< */)
+xcb_xfixes_set_region_checked (xcb_connection_t      *c,
+                               xcb_xfixes_region_t    region,
+                               uint32_t               rectangles_len,
+                               const xcb_rectangle_t *rectangles)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 4,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SET_REGION,
-        /* isvoid */ 1
+        .count = 4,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SET_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[6];
@@ -837,16 +859,16 @@ xcb_xfixes_set_region_checked (xcb_connection_t      *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_set_region (xcb_connection_t      *c  /**< */,
-                       xcb_xfixes_region_t    region  /**< */,
-                       uint32_t               rectangles_len  /**< */,
-                       const xcb_rectangle_t *rectangles  /**< */)
+xcb_xfixes_set_region (xcb_connection_t      *c,
+                       xcb_xfixes_region_t    region,
+                       uint32_t               rectangles_len,
+                       const xcb_rectangle_t *rectangles)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 4,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SET_REGION,
-        /* isvoid */ 1
+        .count = 4,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SET_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[6];
@@ -869,16 +891,38 @@ xcb_xfixes_set_region (xcb_connection_t      *c  /**< */,
     return xcb_ret;
 }
 
+xcb_rectangle_t *
+xcb_xfixes_set_region_rectangles (const xcb_xfixes_set_region_request_t *R)
+{
+    return (xcb_rectangle_t *) (R + 1);
+}
+
+int
+xcb_xfixes_set_region_rectangles_length (const xcb_xfixes_set_region_request_t *R)
+{
+    return (((R->length * 4) - sizeof(xcb_xfixes_set_region_request_t))/sizeof(xcb_rectangle_t));
+}
+
+xcb_rectangle_iterator_t
+xcb_xfixes_set_region_rectangles_iterator (const xcb_xfixes_set_region_request_t *R)
+{
+    xcb_rectangle_iterator_t i;
+    i.data = (xcb_rectangle_t *) (R + 1);
+    i.rem = (((R->length * 4) - sizeof(xcb_xfixes_set_region_request_t))/sizeof(xcb_rectangle_t));
+    i.index = (char *) i.data - (char *) R;
+    return i;
+}
+
 xcb_void_cookie_t
-xcb_xfixes_copy_region_checked (xcb_connection_t    *c  /**< */,
-                                xcb_xfixes_region_t  source  /**< */,
-                                xcb_xfixes_region_t  destination  /**< */)
+xcb_xfixes_copy_region_checked (xcb_connection_t    *c,
+                                xcb_xfixes_region_t  source,
+                                xcb_xfixes_region_t  destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_COPY_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_COPY_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -898,15 +942,15 @@ xcb_xfixes_copy_region_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_copy_region (xcb_connection_t    *c  /**< */,
-                        xcb_xfixes_region_t  source  /**< */,
-                        xcb_xfixes_region_t  destination  /**< */)
+xcb_xfixes_copy_region (xcb_connection_t    *c,
+                        xcb_xfixes_region_t  source,
+                        xcb_xfixes_region_t  destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_COPY_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_COPY_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -926,16 +970,16 @@ xcb_xfixes_copy_region (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_union_region_checked (xcb_connection_t    *c  /**< */,
-                                 xcb_xfixes_region_t  source1  /**< */,
-                                 xcb_xfixes_region_t  source2  /**< */,
-                                 xcb_xfixes_region_t  destination  /**< */)
+xcb_xfixes_union_region_checked (xcb_connection_t    *c,
+                                 xcb_xfixes_region_t  source1,
+                                 xcb_xfixes_region_t  source2,
+                                 xcb_xfixes_region_t  destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_UNION_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_UNION_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -956,16 +1000,16 @@ xcb_xfixes_union_region_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_union_region (xcb_connection_t    *c  /**< */,
-                         xcb_xfixes_region_t  source1  /**< */,
-                         xcb_xfixes_region_t  source2  /**< */,
-                         xcb_xfixes_region_t  destination  /**< */)
+xcb_xfixes_union_region (xcb_connection_t    *c,
+                         xcb_xfixes_region_t  source1,
+                         xcb_xfixes_region_t  source2,
+                         xcb_xfixes_region_t  destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_UNION_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_UNION_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -986,16 +1030,16 @@ xcb_xfixes_union_region (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_intersect_region_checked (xcb_connection_t    *c  /**< */,
-                                     xcb_xfixes_region_t  source1  /**< */,
-                                     xcb_xfixes_region_t  source2  /**< */,
-                                     xcb_xfixes_region_t  destination  /**< */)
+xcb_xfixes_intersect_region_checked (xcb_connection_t    *c,
+                                     xcb_xfixes_region_t  source1,
+                                     xcb_xfixes_region_t  source2,
+                                     xcb_xfixes_region_t  destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_INTERSECT_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_INTERSECT_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1016,16 +1060,16 @@ xcb_xfixes_intersect_region_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_intersect_region (xcb_connection_t    *c  /**< */,
-                             xcb_xfixes_region_t  source1  /**< */,
-                             xcb_xfixes_region_t  source2  /**< */,
-                             xcb_xfixes_region_t  destination  /**< */)
+xcb_xfixes_intersect_region (xcb_connection_t    *c,
+                             xcb_xfixes_region_t  source1,
+                             xcb_xfixes_region_t  source2,
+                             xcb_xfixes_region_t  destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_INTERSECT_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_INTERSECT_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1046,16 +1090,16 @@ xcb_xfixes_intersect_region (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_subtract_region_checked (xcb_connection_t    *c  /**< */,
-                                    xcb_xfixes_region_t  source1  /**< */,
-                                    xcb_xfixes_region_t  source2  /**< */,
-                                    xcb_xfixes_region_t  destination  /**< */)
+xcb_xfixes_subtract_region_checked (xcb_connection_t    *c,
+                                    xcb_xfixes_region_t  source1,
+                                    xcb_xfixes_region_t  source2,
+                                    xcb_xfixes_region_t  destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SUBTRACT_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SUBTRACT_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1076,16 +1120,16 @@ xcb_xfixes_subtract_region_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_subtract_region (xcb_connection_t    *c  /**< */,
-                            xcb_xfixes_region_t  source1  /**< */,
-                            xcb_xfixes_region_t  source2  /**< */,
-                            xcb_xfixes_region_t  destination  /**< */)
+xcb_xfixes_subtract_region (xcb_connection_t    *c,
+                            xcb_xfixes_region_t  source1,
+                            xcb_xfixes_region_t  source2,
+                            xcb_xfixes_region_t  destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SUBTRACT_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SUBTRACT_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1106,16 +1150,16 @@ xcb_xfixes_subtract_region (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_invert_region_checked (xcb_connection_t    *c  /**< */,
-                                  xcb_xfixes_region_t  source  /**< */,
-                                  xcb_rectangle_t      bounds  /**< */,
-                                  xcb_xfixes_region_t  destination  /**< */)
+xcb_xfixes_invert_region_checked (xcb_connection_t    *c,
+                                  xcb_xfixes_region_t  source,
+                                  xcb_rectangle_t      bounds,
+                                  xcb_xfixes_region_t  destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_INVERT_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_INVERT_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1136,16 +1180,16 @@ xcb_xfixes_invert_region_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_invert_region (xcb_connection_t    *c  /**< */,
-                          xcb_xfixes_region_t  source  /**< */,
-                          xcb_rectangle_t      bounds  /**< */,
-                          xcb_xfixes_region_t  destination  /**< */)
+xcb_xfixes_invert_region (xcb_connection_t    *c,
+                          xcb_xfixes_region_t  source,
+                          xcb_rectangle_t      bounds,
+                          xcb_xfixes_region_t  destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_INVERT_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_INVERT_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1166,16 +1210,16 @@ xcb_xfixes_invert_region (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_translate_region_checked (xcb_connection_t    *c  /**< */,
-                                     xcb_xfixes_region_t  region  /**< */,
-                                     int16_t              dx  /**< */,
-                                     int16_t              dy  /**< */)
+xcb_xfixes_translate_region_checked (xcb_connection_t    *c,
+                                     xcb_xfixes_region_t  region,
+                                     int16_t              dx,
+                                     int16_t              dy)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_TRANSLATE_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_TRANSLATE_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1196,16 +1240,16 @@ xcb_xfixes_translate_region_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_translate_region (xcb_connection_t    *c  /**< */,
-                             xcb_xfixes_region_t  region  /**< */,
-                             int16_t              dx  /**< */,
-                             int16_t              dy  /**< */)
+xcb_xfixes_translate_region (xcb_connection_t    *c,
+                             xcb_xfixes_region_t  region,
+                             int16_t              dx,
+                             int16_t              dy)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_TRANSLATE_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_TRANSLATE_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1226,15 +1270,15 @@ xcb_xfixes_translate_region (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_region_extents_checked (xcb_connection_t    *c  /**< */,
-                                   xcb_xfixes_region_t  source  /**< */,
-                                   xcb_xfixes_region_t  destination  /**< */)
+xcb_xfixes_region_extents_checked (xcb_connection_t    *c,
+                                   xcb_xfixes_region_t  source,
+                                   xcb_xfixes_region_t  destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_REGION_EXTENTS,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_REGION_EXTENTS,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1254,15 +1298,15 @@ xcb_xfixes_region_extents_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_region_extents (xcb_connection_t    *c  /**< */,
-                           xcb_xfixes_region_t  source  /**< */,
-                           xcb_xfixes_region_t  destination  /**< */)
+xcb_xfixes_region_extents (xcb_connection_t    *c,
+                           xcb_xfixes_region_t  source,
+                           xcb_xfixes_region_t  destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_REGION_EXTENTS,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_REGION_EXTENTS,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1282,7 +1326,7 @@ xcb_xfixes_region_extents (xcb_connection_t    *c  /**< */,
 }
 
 int
-xcb_xfixes_fetch_region_sizeof (const void  *_buffer  /**< */)
+xcb_xfixes_fetch_region_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xfixes_fetch_region_reply_t *_aux = (xcb_xfixes_fetch_region_reply_t *)_buffer;
@@ -1313,14 +1357,14 @@ xcb_xfixes_fetch_region_sizeof (const void  *_buffer  /**< */)
 }
 
 xcb_xfixes_fetch_region_cookie_t
-xcb_xfixes_fetch_region (xcb_connection_t    *c  /**< */,
-                         xcb_xfixes_region_t  region  /**< */)
+xcb_xfixes_fetch_region (xcb_connection_t    *c,
+                         xcb_xfixes_region_t  region)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_FETCH_REGION,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_FETCH_REGION,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1339,14 +1383,14 @@ xcb_xfixes_fetch_region (xcb_connection_t    *c  /**< */,
 }
 
 xcb_xfixes_fetch_region_cookie_t
-xcb_xfixes_fetch_region_unchecked (xcb_connection_t    *c  /**< */,
-                                   xcb_xfixes_region_t  region  /**< */)
+xcb_xfixes_fetch_region_unchecked (xcb_connection_t    *c,
+                                   xcb_xfixes_region_t  region)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_FETCH_REGION,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_FETCH_REGION,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1365,19 +1409,19 @@ xcb_xfixes_fetch_region_unchecked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_rectangle_t *
-xcb_xfixes_fetch_region_rectangles (const xcb_xfixes_fetch_region_reply_t *R  /**< */)
+xcb_xfixes_fetch_region_rectangles (const xcb_xfixes_fetch_region_reply_t *R)
 {
     return (xcb_rectangle_t *) (R + 1);
 }
 
 int
-xcb_xfixes_fetch_region_rectangles_length (const xcb_xfixes_fetch_region_reply_t *R  /**< */)
+xcb_xfixes_fetch_region_rectangles_length (const xcb_xfixes_fetch_region_reply_t *R)
 {
     return (R->length / 2);
 }
 
 xcb_rectangle_iterator_t
-xcb_xfixes_fetch_region_rectangles_iterator (const xcb_xfixes_fetch_region_reply_t *R  /**< */)
+xcb_xfixes_fetch_region_rectangles_iterator (const xcb_xfixes_fetch_region_reply_t *R)
 {
     xcb_rectangle_iterator_t i;
     i.data = (xcb_rectangle_t *) (R + 1);
@@ -1387,25 +1431,25 @@ xcb_xfixes_fetch_region_rectangles_iterator (const xcb_xfixes_fetch_region_reply
 }
 
 xcb_xfixes_fetch_region_reply_t *
-xcb_xfixes_fetch_region_reply (xcb_connection_t                  *c  /**< */,
+xcb_xfixes_fetch_region_reply (xcb_connection_t                  *c,
                                xcb_xfixes_fetch_region_cookie_t   cookie  /**< */,
-                               xcb_generic_error_t              **e  /**< */)
+                               xcb_generic_error_t              **e)
 {
     return (xcb_xfixes_fetch_region_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 xcb_void_cookie_t
-xcb_xfixes_set_gc_clip_region_checked (xcb_connection_t    *c  /**< */,
-                                       xcb_gcontext_t       gc  /**< */,
-                                       xcb_xfixes_region_t  region  /**< */,
-                                       int16_t              x_origin  /**< */,
-                                       int16_t              y_origin  /**< */)
+xcb_xfixes_set_gc_clip_region_checked (xcb_connection_t    *c,
+                                       xcb_gcontext_t       gc,
+                                       xcb_xfixes_region_t  region,
+                                       int16_t              x_origin,
+                                       int16_t              y_origin)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SET_GC_CLIP_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SET_GC_CLIP_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1427,17 +1471,17 @@ xcb_xfixes_set_gc_clip_region_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_set_gc_clip_region (xcb_connection_t    *c  /**< */,
-                               xcb_gcontext_t       gc  /**< */,
-                               xcb_xfixes_region_t  region  /**< */,
-                               int16_t              x_origin  /**< */,
-                               int16_t              y_origin  /**< */)
+xcb_xfixes_set_gc_clip_region (xcb_connection_t    *c,
+                               xcb_gcontext_t       gc,
+                               xcb_xfixes_region_t  region,
+                               int16_t              x_origin,
+                               int16_t              y_origin)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SET_GC_CLIP_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SET_GC_CLIP_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1459,18 +1503,18 @@ xcb_xfixes_set_gc_clip_region (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_set_window_shape_region_checked (xcb_connection_t    *c  /**< */,
-                                            xcb_window_t         dest  /**< */,
-                                            xcb_shape_kind_t     dest_kind  /**< */,
-                                            int16_t              x_offset  /**< */,
-                                            int16_t              y_offset  /**< */,
-                                            xcb_xfixes_region_t  region  /**< */)
+xcb_xfixes_set_window_shape_region_checked (xcb_connection_t    *c,
+                                            xcb_window_t         dest,
+                                            xcb_shape_kind_t     dest_kind,
+                                            int16_t              x_offset,
+                                            int16_t              y_offset,
+                                            xcb_xfixes_region_t  region)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SET_WINDOW_SHAPE_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SET_WINDOW_SHAPE_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1494,18 +1538,18 @@ xcb_xfixes_set_window_shape_region_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_set_window_shape_region (xcb_connection_t    *c  /**< */,
-                                    xcb_window_t         dest  /**< */,
-                                    xcb_shape_kind_t     dest_kind  /**< */,
-                                    int16_t              x_offset  /**< */,
-                                    int16_t              y_offset  /**< */,
-                                    xcb_xfixes_region_t  region  /**< */)
+xcb_xfixes_set_window_shape_region (xcb_connection_t    *c,
+                                    xcb_window_t         dest,
+                                    xcb_shape_kind_t     dest_kind,
+                                    int16_t              x_offset,
+                                    int16_t              y_offset,
+                                    xcb_xfixes_region_t  region)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SET_WINDOW_SHAPE_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SET_WINDOW_SHAPE_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1529,17 +1573,17 @@ xcb_xfixes_set_window_shape_region (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_set_picture_clip_region_checked (xcb_connection_t     *c  /**< */,
-                                            xcb_render_picture_t  picture  /**< */,
-                                            xcb_xfixes_region_t   region  /**< */,
-                                            int16_t               x_origin  /**< */,
-                                            int16_t               y_origin  /**< */)
+xcb_xfixes_set_picture_clip_region_checked (xcb_connection_t     *c,
+                                            xcb_render_picture_t  picture,
+                                            xcb_xfixes_region_t   region,
+                                            int16_t               x_origin,
+                                            int16_t               y_origin)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SET_PICTURE_CLIP_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SET_PICTURE_CLIP_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1561,17 +1605,17 @@ xcb_xfixes_set_picture_clip_region_checked (xcb_connection_t     *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_set_picture_clip_region (xcb_connection_t     *c  /**< */,
-                                    xcb_render_picture_t  picture  /**< */,
-                                    xcb_xfixes_region_t   region  /**< */,
-                                    int16_t               x_origin  /**< */,
-                                    int16_t               y_origin  /**< */)
+xcb_xfixes_set_picture_clip_region (xcb_connection_t     *c,
+                                    xcb_render_picture_t  picture,
+                                    xcb_xfixes_region_t   region,
+                                    int16_t               x_origin,
+                                    int16_t               y_origin)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SET_PICTURE_CLIP_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SET_PICTURE_CLIP_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1593,7 +1637,7 @@ xcb_xfixes_set_picture_clip_region (xcb_connection_t     *c  /**< */,
 }
 
 int
-xcb_xfixes_set_cursor_name_sizeof (const void  *_buffer  /**< */)
+xcb_xfixes_set_cursor_name_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xfixes_set_cursor_name_request_t *_aux = (xcb_xfixes_set_cursor_name_request_t *)_buffer;
@@ -1624,16 +1668,16 @@ xcb_xfixes_set_cursor_name_sizeof (const void  *_buffer  /**< */)
 }
 
 xcb_void_cookie_t
-xcb_xfixes_set_cursor_name_checked (xcb_connection_t *c  /**< */,
-                                    xcb_cursor_t      cursor  /**< */,
-                                    uint16_t          nbytes  /**< */,
-                                    const char       *name  /**< */)
+xcb_xfixes_set_cursor_name_checked (xcb_connection_t *c,
+                                    xcb_cursor_t      cursor,
+                                    uint16_t          nbytes,
+                                    const char       *name)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 4,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SET_CURSOR_NAME,
-        /* isvoid */ 1
+        .count = 4,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SET_CURSOR_NAME,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[6];
@@ -1659,16 +1703,16 @@ xcb_xfixes_set_cursor_name_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_set_cursor_name (xcb_connection_t *c  /**< */,
-                            xcb_cursor_t      cursor  /**< */,
-                            uint16_t          nbytes  /**< */,
-                            const char       *name  /**< */)
+xcb_xfixes_set_cursor_name (xcb_connection_t *c,
+                            xcb_cursor_t      cursor,
+                            uint16_t          nbytes,
+                            const char       *name)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 4,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SET_CURSOR_NAME,
-        /* isvoid */ 1
+        .count = 4,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SET_CURSOR_NAME,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[6];
@@ -1693,8 +1737,30 @@ xcb_xfixes_set_cursor_name (xcb_connection_t *c  /**< */,
     return xcb_ret;
 }
 
+char *
+xcb_xfixes_set_cursor_name_name (const xcb_xfixes_set_cursor_name_request_t *R)
+{
+    return (char *) (R + 1);
+}
+
+int
+xcb_xfixes_set_cursor_name_name_length (const xcb_xfixes_set_cursor_name_request_t *R)
+{
+    return R->nbytes;
+}
+
+xcb_generic_iterator_t
+xcb_xfixes_set_cursor_name_name_end (const xcb_xfixes_set_cursor_name_request_t *R)
+{
+    xcb_generic_iterator_t i;
+    i.data = ((char *) (R + 1)) + (R->nbytes);
+    i.rem = 0;
+    i.index = (char *) i.data - (char *) R;
+    return i;
+}
+
 int
-xcb_xfixes_get_cursor_name_sizeof (const void  *_buffer  /**< */)
+xcb_xfixes_get_cursor_name_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xfixes_get_cursor_name_reply_t *_aux = (xcb_xfixes_get_cursor_name_reply_t *)_buffer;
@@ -1725,14 +1791,14 @@ xcb_xfixes_get_cursor_name_sizeof (const void  *_buffer  /**< */)
 }
 
 xcb_xfixes_get_cursor_name_cookie_t
-xcb_xfixes_get_cursor_name (xcb_connection_t *c  /**< */,
-                            xcb_cursor_t      cursor  /**< */)
+xcb_xfixes_get_cursor_name (xcb_connection_t *c,
+                            xcb_cursor_t      cursor)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_GET_CURSOR_NAME,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_GET_CURSOR_NAME,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1751,14 +1817,14 @@ xcb_xfixes_get_cursor_name (xcb_connection_t *c  /**< */,
 }
 
 xcb_xfixes_get_cursor_name_cookie_t
-xcb_xfixes_get_cursor_name_unchecked (xcb_connection_t *c  /**< */,
-                                      xcb_cursor_t      cursor  /**< */)
+xcb_xfixes_get_cursor_name_unchecked (xcb_connection_t *c,
+                                      xcb_cursor_t      cursor)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_GET_CURSOR_NAME,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_GET_CURSOR_NAME,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1777,19 +1843,19 @@ xcb_xfixes_get_cursor_name_unchecked (xcb_connection_t *c  /**< */,
 }
 
 char *
-xcb_xfixes_get_cursor_name_name (const xcb_xfixes_get_cursor_name_reply_t *R  /**< */)
+xcb_xfixes_get_cursor_name_name (const xcb_xfixes_get_cursor_name_reply_t *R)
 {
     return (char *) (R + 1);
 }
 
 int
-xcb_xfixes_get_cursor_name_name_length (const xcb_xfixes_get_cursor_name_reply_t *R  /**< */)
+xcb_xfixes_get_cursor_name_name_length (const xcb_xfixes_get_cursor_name_reply_t *R)
 {
     return R->nbytes;
 }
 
 xcb_generic_iterator_t
-xcb_xfixes_get_cursor_name_name_end (const xcb_xfixes_get_cursor_name_reply_t *R  /**< */)
+xcb_xfixes_get_cursor_name_name_end (const xcb_xfixes_get_cursor_name_reply_t *R)
 {
     xcb_generic_iterator_t i;
     i.data = ((char *) (R + 1)) + (R->nbytes);
@@ -1799,15 +1865,15 @@ xcb_xfixes_get_cursor_name_name_end (const xcb_xfixes_get_cursor_name_reply_t *R
 }
 
 xcb_xfixes_get_cursor_name_reply_t *
-xcb_xfixes_get_cursor_name_reply (xcb_connection_t                     *c  /**< */,
+xcb_xfixes_get_cursor_name_reply (xcb_connection_t                     *c,
                                   xcb_xfixes_get_cursor_name_cookie_t   cookie  /**< */,
-                                  xcb_generic_error_t                 **e  /**< */)
+                                  xcb_generic_error_t                 **e)
 {
     return (xcb_xfixes_get_cursor_name_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 int
-xcb_xfixes_get_cursor_image_and_name_sizeof (const void  *_buffer  /**< */)
+xcb_xfixes_get_cursor_image_and_name_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xfixes_get_cursor_image_and_name_reply_t *_aux = (xcb_xfixes_get_cursor_image_and_name_reply_t *)_buffer;
@@ -1821,10 +1887,10 @@ xcb_xfixes_get_cursor_image_and_name_sizeof (const void  *_buffer  /**< */)
     xcb_tmp += xcb_block_len;
     xcb_buffer_len += xcb_block_len;
     xcb_block_len = 0;
-    /* name */
-    xcb_block_len += _aux->nbytes * sizeof(char);
+    /* cursor_image */
+    xcb_block_len += (_aux->width * _aux->height) * sizeof(uint32_t);
     xcb_tmp += xcb_block_len;
-    xcb_align_to = ALIGNOF(char);
+    xcb_align_to = ALIGNOF(uint32_t);
     /* insert padding */
     xcb_pad = -xcb_block_len & (xcb_align_to - 1);
     xcb_buffer_len += xcb_block_len + xcb_pad;
@@ -1833,10 +1899,10 @@ xcb_xfixes_get_cursor_image_and_name_sizeof (const void  *_buffer  /**< */)
         xcb_pad = 0;
     }
     xcb_block_len = 0;
-    /* cursor_image */
-    xcb_block_len += (_aux->width * _aux->height) * sizeof(uint32_t);
+    /* name */
+    xcb_block_len += _aux->nbytes * sizeof(char);
     xcb_tmp += xcb_block_len;
-    xcb_align_to = ALIGNOF(uint32_t);
+    xcb_align_to = ALIGNOF(char);
     /* insert padding */
     xcb_pad = -xcb_block_len & (xcb_align_to - 1);
     xcb_buffer_len += xcb_block_len + xcb_pad;
@@ -1850,13 +1916,13 @@ xcb_xfixes_get_cursor_image_and_name_sizeof (const void  *_buffer  /**< */)
 }
 
 xcb_xfixes_get_cursor_image_and_name_cookie_t
-xcb_xfixes_get_cursor_image_and_name (xcb_connection_t *c  /**< */)
+xcb_xfixes_get_cursor_image_and_name (xcb_connection_t *c)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_GET_CURSOR_IMAGE_AND_NAME,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_GET_CURSOR_IMAGE_AND_NAME,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1874,13 +1940,13 @@ xcb_xfixes_get_cursor_image_and_name (xcb_connection_t *c  /**< */)
 }
 
 xcb_xfixes_get_cursor_image_and_name_cookie_t
-xcb_xfixes_get_cursor_image_and_name_unchecked (xcb_connection_t *c  /**< */)
+xcb_xfixes_get_cursor_image_and_name_unchecked (xcb_connection_t *c)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_GET_CURSOR_IMAGE_AND_NAME,
-        /* isvoid */ 0
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_GET_CURSOR_IMAGE_AND_NAME,
+        .isvoid = 0
     };
 
     struct iovec xcb_parts[4];
@@ -1897,70 +1963,70 @@ xcb_xfixes_get_cursor_image_and_name_unchecked (xcb_connection_t *c  /**< */)
     return xcb_ret;
 }
 
-char *
-xcb_xfixes_get_cursor_image_and_name_name (const xcb_xfixes_get_cursor_image_and_name_reply_t *R  /**< */)
+uint32_t *
+xcb_xfixes_get_cursor_image_and_name_cursor_image (const xcb_xfixes_get_cursor_image_and_name_reply_t *R)
 {
-    return (char *) (R + 1);
+    return (uint32_t *) (R + 1);
 }
 
 int
-xcb_xfixes_get_cursor_image_and_name_name_length (const xcb_xfixes_get_cursor_image_and_name_reply_t *R  /**< */)
+xcb_xfixes_get_cursor_image_and_name_cursor_image_length (const xcb_xfixes_get_cursor_image_and_name_reply_t *R)
 {
-    return R->nbytes;
+    return (R->width * R->height);
 }
 
 xcb_generic_iterator_t
-xcb_xfixes_get_cursor_image_and_name_name_end (const xcb_xfixes_get_cursor_image_and_name_reply_t *R  /**< */)
+xcb_xfixes_get_cursor_image_and_name_cursor_image_end (const xcb_xfixes_get_cursor_image_and_name_reply_t *R)
 {
     xcb_generic_iterator_t i;
-    i.data = ((char *) (R + 1)) + (R->nbytes);
+    i.data = ((uint32_t *) (R + 1)) + ((R->width * R->height));
     i.rem = 0;
     i.index = (char *) i.data - (char *) R;
     return i;
 }
 
-uint32_t *
-xcb_xfixes_get_cursor_image_and_name_cursor_image (const xcb_xfixes_get_cursor_image_and_name_reply_t *R  /**< */)
+char *
+xcb_xfixes_get_cursor_image_and_name_name (const xcb_xfixes_get_cursor_image_and_name_reply_t *R)
 {
-    xcb_generic_iterator_t prev = xcb_xfixes_get_cursor_image_and_name_name_end(R);
-    return (uint32_t *) ((char *) prev.data + XCB_TYPE_PAD(uint32_t, prev.index) + 0);
+    xcb_generic_iterator_t prev = xcb_xfixes_get_cursor_image_and_name_cursor_image_end(R);
+    return (char *) ((char *) prev.data + XCB_TYPE_PAD(char, prev.index) + 0);
 }
 
 int
-xcb_xfixes_get_cursor_image_and_name_cursor_image_length (const xcb_xfixes_get_cursor_image_and_name_reply_t *R  /**< */)
+xcb_xfixes_get_cursor_image_and_name_name_length (const xcb_xfixes_get_cursor_image_and_name_reply_t *R)
 {
-    return (R->width * R->height);
+    return R->nbytes;
 }
 
 xcb_generic_iterator_t
-xcb_xfixes_get_cursor_image_and_name_cursor_image_end (const xcb_xfixes_get_cursor_image_and_name_reply_t *R  /**< */)
+xcb_xfixes_get_cursor_image_and_name_name_end (const xcb_xfixes_get_cursor_image_and_name_reply_t *R)
 {
     xcb_generic_iterator_t i;
-    xcb_generic_iterator_t child = xcb_xfixes_get_cursor_image_and_name_name_end(R);
-    i.data = ((uint32_t *) child.data) + ((R->width * R->height));
+    xcb_generic_iterator_t prev = xcb_xfixes_get_cursor_image_and_name_cursor_image_end(R);
+    i.data = ((char *) ((char*) prev.data + XCB_TYPE_PAD(char, prev.index))) + (R->nbytes);
     i.rem = 0;
     i.index = (char *) i.data - (char *) R;
     return i;
 }
 
 xcb_xfixes_get_cursor_image_and_name_reply_t *
-xcb_xfixes_get_cursor_image_and_name_reply (xcb_connection_t                               *c  /**< */,
+xcb_xfixes_get_cursor_image_and_name_reply (xcb_connection_t                               *c,
                                             xcb_xfixes_get_cursor_image_and_name_cookie_t   cookie  /**< */,
-                                            xcb_generic_error_t                           **e  /**< */)
+                                            xcb_generic_error_t                           **e)
 {
     return (xcb_xfixes_get_cursor_image_and_name_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
 }
 
 xcb_void_cookie_t
-xcb_xfixes_change_cursor_checked (xcb_connection_t *c  /**< */,
-                                  xcb_cursor_t      source  /**< */,
-                                  xcb_cursor_t      destination  /**< */)
+xcb_xfixes_change_cursor_checked (xcb_connection_t *c,
+                                  xcb_cursor_t      source,
+                                  xcb_cursor_t      destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CHANGE_CURSOR,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CHANGE_CURSOR,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -1980,15 +2046,15 @@ xcb_xfixes_change_cursor_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_change_cursor (xcb_connection_t *c  /**< */,
-                          xcb_cursor_t      source  /**< */,
-                          xcb_cursor_t      destination  /**< */)
+xcb_xfixes_change_cursor (xcb_connection_t *c,
+                          xcb_cursor_t      source,
+                          xcb_cursor_t      destination)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CHANGE_CURSOR,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CHANGE_CURSOR,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -2008,7 +2074,7 @@ xcb_xfixes_change_cursor (xcb_connection_t *c  /**< */,
 }
 
 int
-xcb_xfixes_change_cursor_by_name_sizeof (const void  *_buffer  /**< */)
+xcb_xfixes_change_cursor_by_name_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xfixes_change_cursor_by_name_request_t *_aux = (xcb_xfixes_change_cursor_by_name_request_t *)_buffer;
@@ -2039,16 +2105,16 @@ xcb_xfixes_change_cursor_by_name_sizeof (const void  *_buffer  /**< */)
 }
 
 xcb_void_cookie_t
-xcb_xfixes_change_cursor_by_name_checked (xcb_connection_t *c  /**< */,
-                                          xcb_cursor_t      src  /**< */,
-                                          uint16_t          nbytes  /**< */,
-                                          const char       *name  /**< */)
+xcb_xfixes_change_cursor_by_name_checked (xcb_connection_t *c,
+                                          xcb_cursor_t      src,
+                                          uint16_t          nbytes,
+                                          const char       *name)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 4,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CHANGE_CURSOR_BY_NAME,
-        /* isvoid */ 1
+        .count = 4,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CHANGE_CURSOR_BY_NAME,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[6];
@@ -2074,16 +2140,16 @@ xcb_xfixes_change_cursor_by_name_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_change_cursor_by_name (xcb_connection_t *c  /**< */,
-                                  xcb_cursor_t      src  /**< */,
-                                  uint16_t          nbytes  /**< */,
-                                  const char       *name  /**< */)
+xcb_xfixes_change_cursor_by_name (xcb_connection_t *c,
+                                  xcb_cursor_t      src,
+                                  uint16_t          nbytes,
+                                  const char       *name)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 4,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CHANGE_CURSOR_BY_NAME,
-        /* isvoid */ 1
+        .count = 4,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CHANGE_CURSOR_BY_NAME,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[6];
@@ -2108,20 +2174,42 @@ xcb_xfixes_change_cursor_by_name (xcb_connection_t *c  /**< */,
     return xcb_ret;
 }
 
+char *
+xcb_xfixes_change_cursor_by_name_name (const xcb_xfixes_change_cursor_by_name_request_t *R)
+{
+    return (char *) (R + 1);
+}
+
+int
+xcb_xfixes_change_cursor_by_name_name_length (const xcb_xfixes_change_cursor_by_name_request_t *R)
+{
+    return R->nbytes;
+}
+
+xcb_generic_iterator_t
+xcb_xfixes_change_cursor_by_name_name_end (const xcb_xfixes_change_cursor_by_name_request_t *R)
+{
+    xcb_generic_iterator_t i;
+    i.data = ((char *) (R + 1)) + (R->nbytes);
+    i.rem = 0;
+    i.index = (char *) i.data - (char *) R;
+    return i;
+}
+
 xcb_void_cookie_t
-xcb_xfixes_expand_region_checked (xcb_connection_t    *c  /**< */,
-                                  xcb_xfixes_region_t  source  /**< */,
-                                  xcb_xfixes_region_t  destination  /**< */,
-                                  uint16_t             left  /**< */,
-                                  uint16_t             right  /**< */,
-                                  uint16_t             top  /**< */,
-                                  uint16_t             bottom  /**< */)
+xcb_xfixes_expand_region_checked (xcb_connection_t    *c,
+                                  xcb_xfixes_region_t  source,
+                                  xcb_xfixes_region_t  destination,
+                                  uint16_t             left,
+                                  uint16_t             right,
+                                  uint16_t             top,
+                                  uint16_t             bottom)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_EXPAND_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_EXPAND_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -2145,19 +2233,19 @@ xcb_xfixes_expand_region_checked (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_expand_region (xcb_connection_t    *c  /**< */,
-                          xcb_xfixes_region_t  source  /**< */,
-                          xcb_xfixes_region_t  destination  /**< */,
-                          uint16_t             left  /**< */,
-                          uint16_t             right  /**< */,
-                          uint16_t             top  /**< */,
-                          uint16_t             bottom  /**< */)
+xcb_xfixes_expand_region (xcb_connection_t    *c,
+                          xcb_xfixes_region_t  source,
+                          xcb_xfixes_region_t  destination,
+                          uint16_t             left,
+                          uint16_t             right,
+                          uint16_t             top,
+                          uint16_t             bottom)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_EXPAND_REGION,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_EXPAND_REGION,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -2181,14 +2269,14 @@ xcb_xfixes_expand_region (xcb_connection_t    *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_hide_cursor_checked (xcb_connection_t *c  /**< */,
-                                xcb_window_t      window  /**< */)
+xcb_xfixes_hide_cursor_checked (xcb_connection_t *c,
+                                xcb_window_t      window)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_HIDE_CURSOR,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_HIDE_CURSOR,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -2207,14 +2295,14 @@ xcb_xfixes_hide_cursor_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_hide_cursor (xcb_connection_t *c  /**< */,
-                        xcb_window_t      window  /**< */)
+xcb_xfixes_hide_cursor (xcb_connection_t *c,
+                        xcb_window_t      window)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_HIDE_CURSOR,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_HIDE_CURSOR,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -2233,14 +2321,14 @@ xcb_xfixes_hide_cursor (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_show_cursor_checked (xcb_connection_t *c  /**< */,
-                                xcb_window_t      window  /**< */)
+xcb_xfixes_show_cursor_checked (xcb_connection_t *c,
+                                xcb_window_t      window)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SHOW_CURSOR,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SHOW_CURSOR,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -2259,14 +2347,14 @@ xcb_xfixes_show_cursor_checked (xcb_connection_t *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_show_cursor (xcb_connection_t *c  /**< */,
-                        xcb_window_t      window  /**< */)
+xcb_xfixes_show_cursor (xcb_connection_t *c,
+                        xcb_window_t      window)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_SHOW_CURSOR,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_SHOW_CURSOR,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -2285,7 +2373,7 @@ xcb_xfixes_show_cursor (xcb_connection_t *c  /**< */,
 }
 
 void
-xcb_xfixes_barrier_next (xcb_xfixes_barrier_iterator_t *i  /**< */)
+xcb_xfixes_barrier_next (xcb_xfixes_barrier_iterator_t *i)
 {
     --i->rem;
     ++i->data;
@@ -2293,7 +2381,7 @@ xcb_xfixes_barrier_next (xcb_xfixes_barrier_iterator_t *i  /**< */)
 }
 
 xcb_generic_iterator_t
-xcb_xfixes_barrier_end (xcb_xfixes_barrier_iterator_t i  /**< */)
+xcb_xfixes_barrier_end (xcb_xfixes_barrier_iterator_t i)
 {
     xcb_generic_iterator_t ret;
     ret.data = i.data + i.rem;
@@ -2303,7 +2391,7 @@ xcb_xfixes_barrier_end (xcb_xfixes_barrier_iterator_t i  /**< */)
 }
 
 int
-xcb_xfixes_create_pointer_barrier_sizeof (const void  *_buffer  /**< */)
+xcb_xfixes_create_pointer_barrier_sizeof (const void  *_buffer)
 {
     char *xcb_tmp = (char *)_buffer;
     const xcb_xfixes_create_pointer_barrier_request_t *_aux = (xcb_xfixes_create_pointer_barrier_request_t *)_buffer;
@@ -2334,22 +2422,22 @@ xcb_xfixes_create_pointer_barrier_sizeof (const void  *_buffer  /**< */)
 }
 
 xcb_void_cookie_t
-xcb_xfixes_create_pointer_barrier_checked (xcb_connection_t     *c  /**< */,
-                                           xcb_xfixes_barrier_t  barrier  /**< */,
-                                           xcb_window_t          window  /**< */,
-                                           uint16_t              x1  /**< */,
-                                           uint16_t              y1  /**< */,
-                                           uint16_t              x2  /**< */,
-                                           uint16_t              y2  /**< */,
-                                           uint32_t              directions  /**< */,
-                                           uint16_t              num_devices  /**< */,
-                                           const uint16_t       *devices  /**< */)
+xcb_xfixes_create_pointer_barrier_checked (xcb_connection_t     *c,
+                                           xcb_xfixes_barrier_t  barrier,
+                                           xcb_window_t          window,
+                                           uint16_t              x1,
+                                           uint16_t              y1,
+                                           uint16_t              x2,
+                                           uint16_t              y2,
+                                           uint32_t              directions,
+                                           uint16_t              num_devices,
+                                           const uint16_t       *devices)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 4,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CREATE_POINTER_BARRIER,
-        /* isvoid */ 1
+        .count = 4,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CREATE_POINTER_BARRIER,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[6];
@@ -2381,22 +2469,22 @@ xcb_xfixes_create_pointer_barrier_checked (xcb_connection_t     *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_create_pointer_barrier (xcb_connection_t     *c  /**< */,
-                                   xcb_xfixes_barrier_t  barrier  /**< */,
-                                   xcb_window_t          window  /**< */,
-                                   uint16_t              x1  /**< */,
-                                   uint16_t              y1  /**< */,
-                                   uint16_t              x2  /**< */,
-                                   uint16_t              y2  /**< */,
-                                   uint32_t              directions  /**< */,
-                                   uint16_t              num_devices  /**< */,
-                                   const uint16_t       *devices  /**< */)
+xcb_xfixes_create_pointer_barrier (xcb_connection_t     *c,
+                                   xcb_xfixes_barrier_t  barrier,
+                                   xcb_window_t          window,
+                                   uint16_t              x1,
+                                   uint16_t              y1,
+                                   uint16_t              x2,
+                                   uint16_t              y2,
+                                   uint32_t              directions,
+                                   uint16_t              num_devices,
+                                   const uint16_t       *devices)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 4,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_CREATE_POINTER_BARRIER,
-        /* isvoid */ 1
+        .count = 4,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_CREATE_POINTER_BARRIER,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[6];
@@ -2427,15 +2515,37 @@ xcb_xfixes_create_pointer_barrier (xcb_connection_t     *c  /**< */,
     return xcb_ret;
 }
 
+uint16_t *
+xcb_xfixes_create_pointer_barrier_devices (const xcb_xfixes_create_pointer_barrier_request_t *R)
+{
+    return (uint16_t *) (R + 1);
+}
+
+int
+xcb_xfixes_create_pointer_barrier_devices_length (const xcb_xfixes_create_pointer_barrier_request_t *R)
+{
+    return R->num_devices;
+}
+
+xcb_generic_iterator_t
+xcb_xfixes_create_pointer_barrier_devices_end (const xcb_xfixes_create_pointer_barrier_request_t *R)
+{
+    xcb_generic_iterator_t i;
+    i.data = ((uint16_t *) (R + 1)) + (R->num_devices);
+    i.rem = 0;
+    i.index = (char *) i.data - (char *) R;
+    return i;
+}
+
 xcb_void_cookie_t
-xcb_xfixes_delete_pointer_barrier_checked (xcb_connection_t     *c  /**< */,
-                                           xcb_xfixes_barrier_t  barrier  /**< */)
+xcb_xfixes_delete_pointer_barrier_checked (xcb_connection_t     *c,
+                                           xcb_xfixes_barrier_t  barrier)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_DELETE_POINTER_BARRIER,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_DELETE_POINTER_BARRIER,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];
@@ -2454,14 +2564,14 @@ xcb_xfixes_delete_pointer_barrier_checked (xcb_connection_t     *c  /**< */,
 }
 
 xcb_void_cookie_t
-xcb_xfixes_delete_pointer_barrier (xcb_connection_t     *c  /**< */,
-                                   xcb_xfixes_barrier_t  barrier  /**< */)
+xcb_xfixes_delete_pointer_barrier (xcb_connection_t     *c,
+                                   xcb_xfixes_barrier_t  barrier)
 {
     static const xcb_protocol_request_t xcb_req = {
-        /* count */ 2,
-        /* ext */ &xcb_xfixes_id,
-        /* opcode */ XCB_XFIXES_DELETE_POINTER_BARRIER,
-        /* isvoid */ 1
+        .count = 2,
+        .ext = &xcb_xfixes_id,
+        .opcode = XCB_XFIXES_DELETE_POINTER_BARRIER,
+        .isvoid = 1
     };
 
     struct iovec xcb_parts[4];