Some patches from Peter Harris to make it possible to build the X11 dissector

again (and some various other improvements):

Rebuild the dissector with the latest xcbproto and mesa.


Subject: [PATCH 01/11] X11 dissector: Support CARD64 and INT64 types
These types are used by the new Present extension.

Subject: [PATCH 02/11] X11 dissector: Un-blacklist a few structures
The xinput structs are used by the latest xcb/proto, and the xkb
struct has been removed.

Subject: [PATCH 03/11] X11 dissector: Add hack for xinput:ChangeProperty
xinput:ChangeProperty should use switch/case, but only switch/bitcase
is supported at the moment. Add (hopefully temporary) hack.

Subject: [PATCH 04/11] X11 dissector: Use namespace for types
In particular, the name of the xsync struct 'INT64' collides with a
basic type of the same name.

Subject: [PATCH 05/11] X11 dissector: Add support for "Generic" events
All new extensions are using the new "Generic" events instead of
traditional events, because there aren't enough traditional event
numbers.

Denoted by <event xge="true"> in xcb/proto.

Subject: [PATCH 06/11] X11 dissector: Blacklist unused structures

Subject: [PATCH 07/11] X11 dissector: Support multiple enumref in a bitcase
XKB is weird.

Subject: [PATCH 08/11] X11 dissector: Support sumof

Subject: [PATCH 09/11] X11 dissector: Stop generating unused-but-set variables
(This patch also reverts r53298/r53299.)

svn path=/trunk/; revision=53531

1 files changed, 5013 insertions, 8384 deletions

diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h
index a443b7ec1a..bfa7b1ada3 100644
--- a/epan/dissectors/x11-extension-implementation.h
+++ b/epan/dissectors/x11-extension-implementation.h
@@ -1,6 +1,6 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using xcbproto version 1.8-2-gc0d65da */
+   using xcbproto version xcb-proto-1.9-11-g2817903 */
 /* $Id$ */
 
 /*
@@ -25,10 +25,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-
 #include "x11-glx-render-enum.h"
 
 static void mesa_CallList(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
@@ -45,6 +41,7 @@ static void mesa_CallLists(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
     *offsetp += 4;
     proto_tree_add_item(t, hf_x11_glx_render_CallLists_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
+    n = n; /* Avoid unreferenced warning */
     listOfByte(tvb, offsetp, t, hf_x11_glx_render_CallLists_lists, (length - 8) / 1, byte_order);
 }
 
@@ -4832,8 +4829,7 @@ static void bigreqEnable(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp
 }
 static void bigreqEnable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_maximum_request_length;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-Enable");
 
@@ -4843,11 +4839,8 @@ static void bigreqEnable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (bigreq-Enable)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_maximum_request_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_bigreq_Enable_reply_maximum_request_length, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
@@ -4883,58 +4876,30 @@ static void dispatch_bigreq(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
 
 static void register_bigreq(void)
 {
-    set_handler("BIG-REQUESTS", dispatch_bigreq, bigreq_errors, bigreq_events, bigreq_replies);
+    set_handler("BIG-REQUESTS", dispatch_bigreq, bigreq_errors, bigreq_events, NULL, bigreq_replies);
 }
 
-static void struct_POINT(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xproto_RECTANGLE(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_x;
-	int f_y;
 
-	item = proto_tree_add_item(root, hf_x11_struct_POINT, tvb, *offsetp, 4, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xproto_RECTANGLE, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_x = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_POINT_x, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xproto_RECTANGLE_x, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_y = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_POINT_y, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-    }
-}
-
-static void struct_RECTANGLE(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_x;
-	int f_y;
-	int f_width;
-	int f_height;
-
-	item = proto_tree_add_item(root, hf_x11_struct_RECTANGLE, tvb, *offsetp, 8, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_x = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_RECTANGLE_x, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xproto_RECTANGLE_y, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_y = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_RECTANGLE_y, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xproto_RECTANGLE_width, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_width = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_RECTANGLE_width, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_height = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_RECTANGLE_height, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xproto_RECTANGLE_height, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
     }
 }
 
-static int struct_size_STR(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_xproto_STR(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_name_len;
@@ -4943,7 +4908,7 @@ static int struct_size_STR(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
     return size + 1;
 }
 
-static void struct_STR(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xproto_STR(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
@@ -4951,108 +4916,81 @@ static void struct_STR(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte
 	proto_tree *t;
 	int f_name_len;
 
-	item = proto_tree_add_item(root, hf_x11_struct_STR, tvb, *offsetp, struct_size_STR(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xproto_STR, tvb, *offsetp, struct_size_xproto_STR(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
 	f_name_len = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_STR_name_len, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xproto_STR_name_len, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	listOfByte(tvb, offsetp, t, hf_x11_struct_STR_name, f_name_len, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xproto_STR_name, f_name_len, byte_order);
     }
 }
 
-static void struct_DIRECTFORMAT(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_DIRECTFORMAT(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_red_shift;
-	int f_red_mask;
-	int f_green_shift;
-	int f_green_mask;
-	int f_blue_shift;
-	int f_blue_mask;
-	int f_alpha_shift;
-	int f_alpha_mask;
-
-	item = proto_tree_add_item(root, hf_x11_struct_DIRECTFORMAT, tvb, *offsetp, 16, ENC_NA);
+
+	item = proto_tree_add_item(root, hf_x11_struct_render_DIRECTFORMAT, tvb, *offsetp, 16, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_red_shift = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DIRECTFORMAT_red_shift, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_DIRECTFORMAT_red_shift, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_red_mask = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DIRECTFORMAT_red_mask, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_DIRECTFORMAT_red_mask, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_green_shift = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DIRECTFORMAT_green_shift, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_DIRECTFORMAT_green_shift, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_green_mask = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DIRECTFORMAT_green_mask, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_DIRECTFORMAT_green_mask, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_blue_shift = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DIRECTFORMAT_blue_shift, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_DIRECTFORMAT_blue_shift, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_blue_mask = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DIRECTFORMAT_blue_mask, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_DIRECTFORMAT_blue_mask, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_alpha_shift = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DIRECTFORMAT_alpha_shift, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_DIRECTFORMAT_alpha_shift, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_alpha_mask = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DIRECTFORMAT_alpha_mask, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_DIRECTFORMAT_alpha_mask, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
     }
 }
 
-static void struct_PICTFORMINFO(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_PICTFORMINFO(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_id;
-	int f_type;
-	int f_depth;
-	int f_colormap;
 
-	item = proto_tree_add_item(root, hf_x11_struct_PICTFORMINFO, tvb, *offsetp, 28, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_PICTFORMINFO, tvb, *offsetp, 28, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_id = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_PICTFORMINFO_id, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_PICTFORMINFO_id, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_PICTFORMINFO_type, byte_order);
-	f_depth = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_PICTFORMINFO_depth, tvb, *offsetp, 1, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_render_PICTFORMINFO_type, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_PICTFORMINFO_depth, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(2);
-	struct_DIRECTFORMAT(tvb, offsetp, t, byte_order, 1);
-	f_colormap = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_PICTFORMINFO_colormap, tvb, *offsetp, 4, byte_order);
+	struct_render_DIRECTFORMAT(tvb, offsetp, t, byte_order, 1);
+	proto_tree_add_item(t, hf_x11_struct_render_PICTFORMINFO_colormap, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
     }
 }
 
-static void struct_PICTVISUAL(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_PICTVISUAL(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_visual;
-	int f_format;
 
-	item = proto_tree_add_item(root, hf_x11_struct_PICTVISUAL, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_PICTVISUAL, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_visual = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_PICTVISUAL_visual, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_PICTVISUAL_visual, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_format = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_PICTVISUAL_format, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_PICTVISUAL_format, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
     }
 }
 
-static int struct_size_PICTDEPTH(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_render_PICTDEPTH(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_num_visuals;
@@ -5061,30 +4999,28 @@ static int struct_size_PICTDEPTH(tvbuff_t *tvb, int *offsetp, guint byte_order _
     return size + 8;
 }
 
-static void struct_PICTDEPTH(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_PICTDEPTH(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_depth;
 	int f_num_visuals;
 
-	item = proto_tree_add_item(root, hf_x11_struct_PICTDEPTH, tvb, *offsetp, struct_size_PICTDEPTH(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_PICTDEPTH, tvb, *offsetp, struct_size_render_PICTDEPTH(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_depth = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_PICTDEPTH_depth, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_PICTDEPTH_depth, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(1);
 	f_num_visuals = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_PICTDEPTH_num_visuals, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_PICTDEPTH_num_visuals, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
 	UNUSED(4);
-	struct_PICTVISUAL(tvb, offsetp, t, byte_order, f_num_visuals);
+	struct_render_PICTVISUAL(tvb, offsetp, t, byte_order, f_num_visuals);
     }
 }
 
-static int struct_size_PICTSCREEN(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_render_PICTSCREEN(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int i, off;
@@ -5092,321 +5028,247 @@ static int struct_size_PICTSCREEN(tvbuff_t *tvb, int *offsetp, guint byte_order
     f_num_depths = VALUE32(tvb, *offsetp + size + 0);
     for (i = 0; i < f_num_depths; i++) {
         off = (*offsetp) + size + 8;
-        size += struct_size_PICTDEPTH(tvb, &off, byte_order);
+        size += struct_size_render_PICTDEPTH(tvb, &off, byte_order);
     }
     return size + 8;
 }
 
-static void struct_PICTSCREEN(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_PICTSCREEN(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
 	int f_num_depths;
-	int f_fallback;
 
-	item = proto_tree_add_item(root, hf_x11_struct_PICTSCREEN, tvb, *offsetp, struct_size_PICTSCREEN(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_PICTSCREEN, tvb, *offsetp, struct_size_render_PICTSCREEN(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
 	f_num_depths = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_PICTSCREEN_num_depths, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_PICTSCREEN_num_depths, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_fallback = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_PICTSCREEN_fallback, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_PICTSCREEN_fallback, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	struct_PICTDEPTH(tvb, offsetp, t, byte_order, f_num_depths);
+	struct_render_PICTDEPTH(tvb, offsetp, t, byte_order, f_num_depths);
     }
 }
 
-static void struct_INDEXVALUE(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_INDEXVALUE(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_pixel;
-	int f_red;
-	int f_green;
-	int f_blue;
-	int f_alpha;
 
-	item = proto_tree_add_item(root, hf_x11_struct_INDEXVALUE, tvb, *offsetp, 12, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_INDEXVALUE, tvb, *offsetp, 12, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_pixel = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_INDEXVALUE_pixel, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_INDEXVALUE_pixel, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_red = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_INDEXVALUE_red, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_INDEXVALUE_red, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_green = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_INDEXVALUE_green, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_INDEXVALUE_green, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_blue = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_INDEXVALUE_blue, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_INDEXVALUE_blue, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_alpha = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_INDEXVALUE_alpha, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_INDEXVALUE_alpha, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
     }
 }
 
-static void struct_COLOR(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_COLOR(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_red;
-	int f_green;
-	int f_blue;
-	int f_alpha;
 
-	item = proto_tree_add_item(root, hf_x11_struct_COLOR, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_COLOR, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_red = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_COLOR_red, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_COLOR_red, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_green = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_COLOR_green, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_COLOR_green, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_blue = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_COLOR_blue, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_COLOR_blue, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_alpha = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_COLOR_alpha, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_COLOR_alpha, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
     }
 }
 
-static void struct_POINTFIX(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_POINTFIX(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_x;
-	int f_y;
 
-	item = proto_tree_add_item(root, hf_x11_struct_POINTFIX, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_POINTFIX, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_x = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_POINTFIX_x, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_POINTFIX_x, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_y = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_POINTFIX_y, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_POINTFIX_y, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
     }
 }
 
-static void struct_LINEFIX(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_LINEFIX(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
 
-	item = proto_tree_add_item(root, hf_x11_struct_LINEFIX, tvb, *offsetp, 16, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_LINEFIX, tvb, *offsetp, 16, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	struct_POINTFIX(tvb, offsetp, t, byte_order, 1);
-	struct_POINTFIX(tvb, offsetp, t, byte_order, 1);
+	struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
+	struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
     }
 }
 
-static void struct_TRIANGLE(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_TRIANGLE(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
 
-	item = proto_tree_add_item(root, hf_x11_struct_TRIANGLE, tvb, *offsetp, 24, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_TRIANGLE, tvb, *offsetp, 24, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	struct_POINTFIX(tvb, offsetp, t, byte_order, 1);
-	struct_POINTFIX(tvb, offsetp, t, byte_order, 1);
-	struct_POINTFIX(tvb, offsetp, t, byte_order, 1);
+	struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
+	struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
+	struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
     }
 }
 
-static void struct_TRAPEZOID(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_TRAPEZOID(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_top;
-	int f_bottom;
 
-	item = proto_tree_add_item(root, hf_x11_struct_TRAPEZOID, tvb, *offsetp, 40, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_TRAPEZOID, tvb, *offsetp, 40, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_top = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TRAPEZOID_top, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_TRAPEZOID_top, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_bottom = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TRAPEZOID_bottom, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_TRAPEZOID_bottom, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	struct_LINEFIX(tvb, offsetp, t, byte_order, 1);
-	struct_LINEFIX(tvb, offsetp, t, byte_order, 1);
+	struct_render_LINEFIX(tvb, offsetp, t, byte_order, 1);
+	struct_render_LINEFIX(tvb, offsetp, t, byte_order, 1);
     }
 }
 
-static void struct_GLYPHINFO(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_GLYPHINFO(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_width;
-	int f_height;
-	int f_x;
-	int f_y;
-	int f_x_off;
-	int f_y_off;
-
-	item = proto_tree_add_item(root, hf_x11_struct_GLYPHINFO, tvb, *offsetp, 12, ENC_NA);
+
+	item = proto_tree_add_item(root, hf_x11_struct_render_GLYPHINFO, tvb, *offsetp, 12, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_width = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_GLYPHINFO_width, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_GLYPHINFO_width, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_height = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_GLYPHINFO_height, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_GLYPHINFO_height, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_x = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_GLYPHINFO_x, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_GLYPHINFO_x, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_y = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_GLYPHINFO_y, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_GLYPHINFO_y, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_x_off = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_GLYPHINFO_x_off, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_GLYPHINFO_x_off, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_y_off = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_GLYPHINFO_y_off, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_GLYPHINFO_y_off, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
     }
 }
 
-static void struct_TRANSFORM(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_TRANSFORM(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_matrix11;
-	int f_matrix12;
-	int f_matrix13;
-	int f_matrix21;
-	int f_matrix22;
-	int f_matrix23;
-	int f_matrix31;
-	int f_matrix32;
-	int f_matrix33;
-
-	item = proto_tree_add_item(root, hf_x11_struct_TRANSFORM, tvb, *offsetp, 36, ENC_NA);
+
+	item = proto_tree_add_item(root, hf_x11_struct_render_TRANSFORM, tvb, *offsetp, 36, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_matrix11 = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TRANSFORM_matrix11, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_TRANSFORM_matrix11, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_matrix12 = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TRANSFORM_matrix12, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_TRANSFORM_matrix12, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_matrix13 = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TRANSFORM_matrix13, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_TRANSFORM_matrix13, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_matrix21 = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TRANSFORM_matrix21, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_TRANSFORM_matrix21, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_matrix22 = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TRANSFORM_matrix22, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_TRANSFORM_matrix22, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_matrix23 = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TRANSFORM_matrix23, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_TRANSFORM_matrix23, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_matrix31 = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TRANSFORM_matrix31, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_TRANSFORM_matrix31, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_matrix32 = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TRANSFORM_matrix32, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_TRANSFORM_matrix32, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_matrix33 = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TRANSFORM_matrix33, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_TRANSFORM_matrix33, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
     }
 }
 
-static void struct_ANIMCURSORELT(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_ANIMCURSORELT(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_cursor;
-	int f_delay;
 
-	item = proto_tree_add_item(root, hf_x11_struct_ANIMCURSORELT, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_ANIMCURSORELT, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_cursor = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ANIMCURSORELT_cursor, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_ANIMCURSORELT_cursor, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_delay = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ANIMCURSORELT_delay, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_ANIMCURSORELT_delay, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
     }
 }
 
-static void struct_SPANFIX(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_SPANFIX(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_l;
-	int f_r;
-	int f_y;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SPANFIX, tvb, *offsetp, 12, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_SPANFIX, tvb, *offsetp, 12, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_l = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SPANFIX_l, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_SPANFIX_l, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_r = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SPANFIX_r, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_SPANFIX_r, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_y = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SPANFIX_y, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_render_SPANFIX_y, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
     }
 }
 
-static void struct_TRAP(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_render_TRAP(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
 
-	item = proto_tree_add_item(root, hf_x11_struct_TRAP, tvb, *offsetp, 24, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_render_TRAP, tvb, *offsetp, 24, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	struct_SPANFIX(tvb, offsetp, t, byte_order, 1);
-	struct_SPANFIX(tvb, offsetp, t, byte_order, 1);
+	struct_render_SPANFIX(tvb, offsetp, t, byte_order, 1);
+	struct_render_SPANFIX(tvb, offsetp, t, byte_order, 1);
     }
 }
 
 static void compositeQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_client_major_version;
-    int f_client_minor_version;
-    f_client_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_QueryVersion_client_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_client_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_QueryVersion_client_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void compositeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -5416,14 +5278,10 @@ static void compositeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (composite-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_QueryVersion_reply_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_QueryVersion_reply_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(16);
@@ -5431,83 +5289,60 @@ static void compositeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
 
 static void compositeRedirectWindow(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_update;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_RedirectWindow_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_update = field8(tvb, offsetp, t, hf_x11_composite_RedirectWindow_update, byte_order);
+    field8(tvb, offsetp, t, hf_x11_composite_RedirectWindow_update, byte_order);
     UNUSED(3);
 }
 
 static void compositeRedirectSubwindows(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_update;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_RedirectSubwindows_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_update = field8(tvb, offsetp, t, hf_x11_composite_RedirectSubwindows_update, byte_order);
+    field8(tvb, offsetp, t, hf_x11_composite_RedirectSubwindows_update, byte_order);
     UNUSED(3);
 }
 
 static void compositeUnredirectWindow(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_update;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_UnredirectWindow_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_update = field8(tvb, offsetp, t, hf_x11_composite_UnredirectWindow_update, byte_order);
+    field8(tvb, offsetp, t, hf_x11_composite_UnredirectWindow_update, byte_order);
     UNUSED(3);
 }
 
 static void compositeUnredirectSubwindows(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_update;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_UnredirectSubwindows_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_update = field8(tvb, offsetp, t, hf_x11_composite_UnredirectSubwindows_update, byte_order);
+    field8(tvb, offsetp, t, hf_x11_composite_UnredirectSubwindows_update, byte_order);
     UNUSED(3);
 }
 
 static void compositeCreateRegionFromBorderClip(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_region;
-    int f_window;
-    f_region = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_CreateRegionFromBorderClip_region, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_CreateRegionFromBorderClip_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void compositeNameWindowPixmap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_pixmap;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_NameWindowPixmap_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pixmap = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_NameWindowPixmap_pixmap, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void compositeGetOverlayWindow(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_GetOverlayWindow_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void compositeGetOverlayWindow_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_overlay_win;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetOverlayWindow");
 
@@ -5517,11 +5352,8 @@ static void compositeGetOverlayWindow_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (composite-GetOverlayWindow)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_overlay_win = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_GetOverlayWindow_reply_overlay_win, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
@@ -5529,8 +5361,6 @@ static void compositeGetOverlayWindow_Reply(tvbuff_t *tvb, packet_info *pinfo, i
 
 static void compositeReleaseOverlayWindow(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_composite_ReleaseOverlayWindow_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
@@ -5599,25 +5429,19 @@ static void dispatch_composite(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
 
 static void register_composite(void)
 {
-    set_handler("Composite", dispatch_composite, composite_errors, composite_events, composite_replies);
+    set_handler("Composite", dispatch_composite, composite_errors, composite_events, NULL, composite_replies);
 }
 
 static void damageQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_client_major_version;
-    int f_client_minor_version;
-    f_client_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_damage_QueryVersion_client_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_client_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_damage_QueryVersion_client_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void damageQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -5627,14 +5451,10 @@ static void damageQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (damage-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_damage_QueryVersion_reply_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_damage_QueryVersion_reply_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(16);
@@ -5642,71 +5462,35 @@ static void damageQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
 
 static void damageCreate(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_damage;
-    int f_drawable;
-    int f_level;
-    f_damage = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_damage_Create_damage, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_damage_Create_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_level = field8(tvb, offsetp, t, hf_x11_damage_Create_level, byte_order);
+    field8(tvb, offsetp, t, hf_x11_damage_Create_level, byte_order);
     UNUSED(3);
 }
 
 static void damageDestroy(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_damage;
-    f_damage = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_damage_Destroy_damage, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void damageSubtract(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_damage;
-    int f_repair;
-    int f_parts;
-    f_damage = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_damage_Subtract_damage, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_repair = field32(tvb, offsetp, t, hf_x11_damage_Subtract_repair, byte_order);
-    f_parts = field32(tvb, offsetp, t, hf_x11_damage_Subtract_parts, byte_order);
+    field32(tvb, offsetp, t, hf_x11_damage_Subtract_repair, byte_order);
+    field32(tvb, offsetp, t, hf_x11_damage_Subtract_parts, byte_order);
 }
 
 static void damageAdd(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_region;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_damage_Add_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_region = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_damage_Add_region, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
-
-static void damageNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
-{
-    int f_level;
-    int f_drawable;
-    int f_damage;
-    int f_timestamp;
-    f_level = field8(tvb, offsetp, t, hf_x11_damage_Notify_level, byte_order);
-    CARD16(event_sequencenumber);
-    f_drawable = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_damage_Notify_drawable, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_damage = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_damage_Notify_damage, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_damage_Notify_timestamp, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    struct_RECTANGLE(tvb, offsetp, t, byte_order, 1);
-    struct_RECTANGLE(tvb, offsetp, t, byte_order, 1);
-}
 static const value_string damage_extension_minor[] = {
     { 0, "QueryVersion" },
     { 1, "Create" },
@@ -5716,7 +5500,6 @@ static const value_string damage_extension_minor[] = {
     { 0, NULL }
 };
 const x11_event_info damage_events[] = {
-    { "damage-Notify", damageNotify },
     { NULL, NULL }
 };
 static x11_reply_info damage_replies[] = {
@@ -5756,25 +5539,19 @@ static void dispatch_damage(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
 
 static void register_damage(void)
 {
-    set_handler("DAMAGE", dispatch_damage, damage_errors, damage_events, damage_replies);
+    set_handler("DAMAGE", dispatch_damage, damage_errors, damage_events, NULL, damage_replies);
 }
 
 static void dpmsGetVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_client_major_version;
-    int f_client_minor_version;
-    f_client_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dpms_GetVersion_client_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_client_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dpms_GetVersion_client_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void dpmsGetVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_server_major_version;
-    int f_server_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetVersion");
 
@@ -5784,14 +5561,10 @@ static void dpmsGetVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dpms-GetVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_server_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dpms_GetVersion_reply_server_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_server_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dpms_GetVersion_reply_server_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
@@ -5801,8 +5574,7 @@ static void dpmsCapable(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp
 }
 static void dpmsCapable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_capable;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-Capable");
 
@@ -5812,11 +5584,8 @@ static void dpmsCapable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dpms-Capable)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_capable = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dpms_Capable_reply_capable, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(23);
@@ -5827,10 +5596,7 @@ static void dpmsGetTimeouts(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offs
 }
 static void dpmsGetTimeouts_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_standby_timeout;
-    int f_suspend_timeout;
-    int f_off_timeout;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetTimeouts");
 
@@ -5840,17 +5606,12 @@ static void dpmsGetTimeouts_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dpms-GetTimeouts)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_standby_timeout = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dpms_GetTimeouts_reply_standby_timeout, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_suspend_timeout = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dpms_GetTimeouts_reply_suspend_timeout, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_off_timeout = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dpms_GetTimeouts_reply_off_timeout, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(18);
@@ -5858,16 +5619,10 @@ static void dpmsGetTimeouts_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
 
 static void dpmsSetTimeouts(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_standby_timeout;
-    int f_suspend_timeout;
-    int f_off_timeout;
-    f_standby_timeout = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dpms_SetTimeouts_standby_timeout, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_suspend_timeout = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dpms_SetTimeouts_suspend_timeout, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_off_timeout = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dpms_SetTimeouts_off_timeout, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
@@ -5882,8 +5637,7 @@ static void dpmsDisable(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp
 
 static void dpmsForceLevel(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_power_level;
-    f_power_level = field16(tvb, offsetp, t, hf_x11_dpms_ForceLevel_power_level, byte_order);
+    field16(tvb, offsetp, t, hf_x11_dpms_ForceLevel_power_level, byte_order);
 }
 
 static void dpmsInfo(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp _U_, proto_tree *t _U_, guint byte_order _U_, int length _U_)
@@ -5891,9 +5645,7 @@ static void dpmsInfo(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp _U_
 }
 static void dpmsInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_power_level;
-    int f_state;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-Info");
 
@@ -5903,12 +5655,9 @@ static void dpmsInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dpms-Info)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_power_level = field16(tvb, offsetp, t, hf_x11_dpms_Info_reply_power_level, byte_order);
-    f_state = VALUE8(tvb, *offsetp);
+    field16(tvb, offsetp, t, hf_x11_dpms_Info_reply_power_level, byte_order);
     proto_tree_add_item(t, hf_x11_dpms_Info_reply_state, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(21);
@@ -5976,73 +5725,55 @@ static void dispatch_dpms(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto
 
 static void register_dpms(void)
 {
-    set_handler("DPMS", dispatch_dpms, dpms_errors, dpms_events, dpms_replies);
+    set_handler("DPMS", dispatch_dpms, dpms_errors, dpms_events, NULL, dpms_replies);
 }
 
-static void struct_DRI2Buffer(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_dri2_DRI2Buffer(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_attachment;
-	int f_name;
-	int f_pitch;
-	int f_cpp;
-	int f_flags;
 
-	item = proto_tree_add_item(root, hf_x11_struct_DRI2Buffer, tvb, *offsetp, 20, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_dri2_DRI2Buffer, tvb, *offsetp, 20, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_attachment = field32(tvb, offsetp, t, hf_x11_struct_DRI2Buffer_attachment, byte_order);
-	f_name = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DRI2Buffer_name, tvb, *offsetp, 4, byte_order);
+	field32(tvb, offsetp, t, hf_x11_struct_dri2_DRI2Buffer_attachment, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_dri2_DRI2Buffer_name, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_pitch = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DRI2Buffer_pitch, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_dri2_DRI2Buffer_pitch, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_cpp = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DRI2Buffer_cpp, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_dri2_DRI2Buffer_cpp, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_flags = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DRI2Buffer_flags, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_dri2_DRI2Buffer_flags, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
     }
 }
 
-static void struct_AttachFormat(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_dri2_AttachFormat(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_attachment;
-	int f_format;
 
-	item = proto_tree_add_item(root, hf_x11_struct_AttachFormat, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_dri2_AttachFormat, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_attachment = field32(tvb, offsetp, t, hf_x11_struct_AttachFormat_attachment, byte_order);
-	f_format = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_AttachFormat_format, tvb, *offsetp, 4, byte_order);
+	field32(tvb, offsetp, t, hf_x11_struct_dri2_AttachFormat_attachment, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_dri2_AttachFormat_format, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
     }
 }
 
 static void dri2QueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_major_version;
-    int f_minor_version;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_QueryVersion_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_QueryVersion_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void dri2QueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -6052,30 +5783,23 @@ static void dri2QueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dri2-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_QueryVersion_reply_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_QueryVersion_reply_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void dri2Connect(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_driver_type;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_Connect_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_driver_type = field32(tvb, offsetp, t, hf_x11_dri2_Connect_driver_type, byte_order);
+    field32(tvb, offsetp, t, hf_x11_dri2_Connect_driver_type, byte_order);
 }
 static void dri2Connect_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_driver_name_length;
     int f_device_name_length;
 
@@ -6087,8 +5811,6 @@ static void dri2Connect_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dri2-Connect)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_driver_name_length = VALUE32(tvb, *offsetp);
@@ -6105,19 +5827,14 @@ static void dri2Connect_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
 
 static void dri2Authenticate(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_magic;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_Authenticate_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_magic = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_Authenticate_magic, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void dri2Authenticate_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_authenticated;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-Authenticate");
 
@@ -6127,48 +5844,35 @@ static void dri2Authenticate_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dri2-Authenticate)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_authenticated = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_Authenticate_reply_authenticated, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void dri2CreateDrawable(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_CreateDrawable_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void dri2DestroyDrawable(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_DestroyDrawable_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void dri2GetBuffers(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_count;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetBuffers_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_count = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetBuffers_count, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_dri2_GetBuffers_attachments, hf_x11_dri2_GetBuffers_attachments_item, (length - 12) / 4, byte_order);
 }
 static void dri2GetBuffers_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_width;
-    int f_height;
+    int sequence_number;
     int f_count;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetBuffers");
@@ -6179,45 +5883,33 @@ static void dri2GetBuffers_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dri2-GetBuffers)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetBuffers_reply_width, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_height = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetBuffers_reply_height, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_count = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetBuffers_reply_count, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
-    struct_DRI2Buffer(tvb, offsetp, t, byte_order, f_count);
+    struct_dri2_DRI2Buffer(tvb, offsetp, t, byte_order, f_count);
 }
 
 static void dri2CopyRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_region;
-    int f_dest;
-    int f_src;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_CopyRegion_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_region = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_CopyRegion_region, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dest = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_CopyRegion_dest, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_src = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_CopyRegion_src, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void dri2CopyRegion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-CopyRegion");
 
@@ -6227,29 +5919,21 @@ static void dri2CopyRegion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dri2-CopyRegion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void dri2GetBuffersWithFormat(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_count;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetBuffersWithFormat_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_count = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetBuffersWithFormat_count, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_AttachFormat(tvb, offsetp, t, byte_order, (length - 12) / 8);
+    struct_dri2_AttachFormat(tvb, offsetp, t, byte_order, (length - 12) / 8);
 }
 static void dri2GetBuffersWithFormat_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_width;
-    int f_height;
+    int sequence_number;
     int f_count;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetBuffersWithFormat");
@@ -6260,59 +5944,39 @@ static void dri2GetBuffersWithFormat_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dri2-GetBuffersWithFormat)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetBuffersWithFormat_reply_width, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_height = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetBuffersWithFormat_reply_height, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_count = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetBuffersWithFormat_reply_count, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
-    struct_DRI2Buffer(tvb, offsetp, t, byte_order, f_count);
+    struct_dri2_DRI2Buffer(tvb, offsetp, t, byte_order, f_count);
 }
 
 static void dri2SwapBuffers(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_target_msc_hi;
-    int f_target_msc_lo;
-    int f_divisor_hi;
-    int f_divisor_lo;
-    int f_remainder_hi;
-    int f_remainder_lo;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target_msc_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_target_msc_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target_msc_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_target_msc_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_divisor_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_divisor_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_divisor_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_divisor_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_remainder_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_remainder_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_remainder_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_remainder_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void dri2SwapBuffers_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_swap_hi;
-    int f_swap_lo;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-SwapBuffers");
 
@@ -6322,34 +5986,22 @@ static void dri2SwapBuffers_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dri2-SwapBuffers)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_swap_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_reply_swap_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_swap_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_reply_swap_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void dri2GetMSC(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetMSC_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void dri2GetMSC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_ust_hi;
-    int f_ust_lo;
-    int f_msc_hi;
-    int f_msc_lo;
-    int f_sbc_hi;
-    int f_sbc_lo;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetMSC");
 
@@ -6359,70 +6011,42 @@ static void dri2GetMSC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pr
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dri2-GetMSC)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ust_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetMSC_reply_ust_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ust_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetMSC_reply_ust_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_msc_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetMSC_reply_msc_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_msc_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetMSC_reply_msc_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_sbc_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetMSC_reply_sbc_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_sbc_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetMSC_reply_sbc_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void dri2WaitMSC(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_target_msc_hi;
-    int f_target_msc_lo;
-    int f_divisor_hi;
-    int f_divisor_lo;
-    int f_remainder_hi;
-    int f_remainder_lo;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target_msc_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_target_msc_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target_msc_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_target_msc_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_divisor_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_divisor_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_divisor_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_divisor_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_remainder_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_remainder_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_remainder_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_remainder_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void dri2WaitMSC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_ust_hi;
-    int f_ust_lo;
-    int f_msc_hi;
-    int f_msc_lo;
-    int f_sbc_hi;
-    int f_sbc_lo;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-WaitMSC");
 
@@ -6432,54 +6056,34 @@ static void dri2WaitMSC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dri2-WaitMSC)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ust_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_reply_ust_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ust_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_reply_ust_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_msc_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_reply_msc_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_msc_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_reply_msc_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_sbc_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_reply_sbc_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_sbc_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitMSC_reply_sbc_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void dri2WaitSBC(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_target_sbc_hi;
-    int f_target_sbc_lo;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitSBC_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target_sbc_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitSBC_target_sbc_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target_sbc_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitSBC_target_sbc_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void dri2WaitSBC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_ust_hi;
-    int f_ust_lo;
-    int f_msc_hi;
-    int f_msc_lo;
-    int f_sbc_hi;
-    int f_sbc_lo;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-WaitSBC");
 
@@ -6489,124 +6093,66 @@ static void dri2WaitSBC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dri2-WaitSBC)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ust_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitSBC_reply_ust_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ust_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitSBC_reply_ust_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_msc_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitSBC_reply_msc_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_msc_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitSBC_reply_msc_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_sbc_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitSBC_reply_sbc_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_sbc_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_WaitSBC_reply_sbc_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void dri2SwapInterval(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_interval;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_SwapInterval_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_interval = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_SwapInterval_interval, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void dri2GetParam(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_param;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetParam_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_param = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetParam_param, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void dri2GetParam_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_is_param_recognized;
-    int f_value_hi;
-    int f_value_lo;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetParam");
 
     REPLY(reply);
-    f_is_param_recognized = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetParam_reply_is_param_recognized, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (dri2-GetParam)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_value_hi = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetParam_reply_value_hi, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_value_lo = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_GetParam_reply_value_lo, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
-static void dri2BufferSwapComplete(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
-{
-    int f_event_type;
-    int f_drawable;
-    int f_ust_hi;
-    int f_ust_lo;
-    int f_msc_hi;
-    int f_msc_lo;
-    int f_sbc;
-    UNUSED(1);
-    CARD16(event_sequencenumber);
-    f_event_type = field16(tvb, offsetp, t, hf_x11_dri2_BufferSwapComplete_event_type, byte_order);
-    UNUSED(2);
-    f_drawable = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_dri2_BufferSwapComplete_drawable, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_ust_hi = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_dri2_BufferSwapComplete_ust_hi, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_ust_lo = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_dri2_BufferSwapComplete_ust_lo, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_msc_hi = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_dri2_BufferSwapComplete_msc_hi, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_msc_lo = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_dri2_BufferSwapComplete_msc_lo, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_sbc = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_dri2_BufferSwapComplete_sbc, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-}
-
 static void dri2InvalidateBuffers(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_drawable;
     UNUSED(1);
     CARD16(event_sequencenumber);
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_dri2_InvalidateBuffers_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
+
 static const value_string dri2_extension_minor[] = {
     { 0, "QueryVersion" },
     { 1, "Connect" },
@@ -6625,7 +6171,6 @@ static const value_string dri2_extension_minor[] = {
     { 0, NULL }
 };
 const x11_event_info dri2_events[] = {
-    { "dri2-BufferSwapComplete", dri2BufferSwapComplete },
     { "dri2-InvalidateBuffers", dri2InvalidateBuffers },
     { NULL, NULL }
 };
@@ -6703,25 +6248,219 @@ static void dispatch_dri2(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto
 
 static void register_dri2(void)
 {
-    set_handler("DRI2", dispatch_dri2, dri2_errors, dri2_events, dri2_replies);
+    set_handler("DRI2", dispatch_dri2, dri2_errors, dri2_events, NULL, dri2_replies);
+}
+
+static void dri3QueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_dri3_QueryVersion_major_version, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_dri3_QueryVersion_minor_version, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void dri3QueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (dri3-QueryVersion)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_dri3_QueryVersion_reply_major_version, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_dri3_QueryVersion_reply_minor_version, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+
+static void dri3Open(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_dri3_Open_drawable, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_dri3_Open_provider, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void dri3Open_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-Open");
+
+    REPLY(reply);
+    proto_tree_add_item(t, hf_x11_dri3_Open_reply_nfd, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (dri3-Open)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    UNUSED(24);
+}
+
+static void dri3PixmapFromBuffer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffer_pixmap, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffer_drawable, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffer_size, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffer_width, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffer_height, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffer_stride, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffer_depth, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    proto_tree_add_item(t, hf_x11_dri3_PixmapFromBuffer_bpp, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+}
+
+static void dri3BufferFromPixmap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_dri3_BufferFromPixmap_pixmap, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void dri3BufferFromPixmap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-BufferFromPixmap");
+
+    REPLY(reply);
+    proto_tree_add_item(t, hf_x11_dri3_BufferFromPixmap_reply_nfd, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (dri3-BufferFromPixmap)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_dri3_BufferFromPixmap_reply_size, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_dri3_BufferFromPixmap_reply_width, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_dri3_BufferFromPixmap_reply_height, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_dri3_BufferFromPixmap_reply_stride, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_dri3_BufferFromPixmap_reply_depth, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    proto_tree_add_item(t, hf_x11_dri3_BufferFromPixmap_reply_bpp, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(12);
+}
+
+static void dri3FenceFromFD(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_dri3_FenceFromFD_drawable, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_dri3_FenceFromFD_fence, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_dri3_FenceFromFD_initially_triggered, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(3);
+}
+
+static void dri3FDFromFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_dri3_FDFromFence_drawable, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_dri3_FDFromFence_fence, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void dri3FDFromFence_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-FDFromFence");
+
+    REPLY(reply);
+    proto_tree_add_item(t, hf_x11_dri3_FDFromFence_reply_nfd, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (dri3-FDFromFence)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    UNUSED(24);
+}
+static const value_string dri3_extension_minor[] = {
+    { 0, "QueryVersion" },
+    { 1, "Open" },
+    { 2, "PixmapFromBuffer" },
+    { 3, "BufferFromPixmap" },
+    { 4, "FenceFromFD" },
+    { 5, "FDFromFence" },
+    { 0, NULL }
+};
+const x11_event_info dri3_events[] = {
+    { NULL, NULL }
+};
+static x11_reply_info dri3_replies[] = {
+    { 0, dri3QueryVersion_Reply },
+    { 1, dri3Open_Reply },
+    { 3, dri3BufferFromPixmap_Reply },
+    { 5, dri3FDFromFence_Reply },
+    { 0, NULL }
+};
+
+static void dispatch_dri3(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int minor, length;
+    minor = CARD8(dri3_extension_minor);
+    length = REQUEST_LENGTH();
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-%s",
+			  val_to_str(minor, dri3_extension_minor,
+				     "<Unknown opcode %d>"));
+    switch (minor) {
+    case 0:
+	dri3QueryVersion(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 1:
+	dri3Open(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 2:
+	dri3PixmapFromBuffer(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 3:
+	dri3BufferFromPixmap(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 4:
+	dri3FenceFromFD(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 5:
+	dri3FDFromFence(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    /* No need for a default case here, since Unknown is printed above,
+       and UNDECODED() is taken care of by dissect_x11_request */
+    }
+}
+
+static void register_dri3(void)
+{
+    set_handler("DRI3", dispatch_dri3, dri3_errors, dri3_events, NULL, dri3_replies);
 }
 
 static void geQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_client_major_version;
-    int f_client_minor_version;
-    f_client_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_ge_QueryVersion_client_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_client_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_ge_QueryVersion_client_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void geQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -6731,14 +6470,10 @@ static void geQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (ge-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_ge_QueryVersion_reply_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_ge_QueryVersion_reply_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(20);
@@ -6775,60 +6510,33 @@ static void dispatch_ge(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_t
 
 static void register_ge(void)
 {
-    set_handler("Generic Event Extension", dispatch_ge, ge_errors, ge_events, ge_replies);
+    set_handler("Generic Event Extension", dispatch_ge, ge_errors, ge_events, NULL, ge_replies);
 }
 
-static void glxPbufferClobber(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
+static void glxBufferSwapComplete(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_event_type;
-    int f_draw_type;
-    int f_drawable;
-    int f_b_mask;
-    int f_aux_buffer;
-    int f_x;
-    int f_y;
-    int f_width;
-    int f_height;
-    int f_count;
     UNUSED(1);
     CARD16(event_sequencenumber);
-    f_event_type = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_PbufferClobber_event_type, tvb, *offsetp, 2, byte_order);
+    proto_tree_add_item(t, hf_x11_glx_BufferSwapComplete_event_type, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_draw_type = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_PbufferClobber_draw_type, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_drawable = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_PbufferClobber_drawable, tvb, *offsetp, 4, byte_order);
+    UNUSED(2);
+    proto_tree_add_item(t, hf_x11_glx_BufferSwapComplete_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_b_mask = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_PbufferClobber_b_mask, tvb, *offsetp, 4, byte_order);
+    proto_tree_add_item(t, hf_x11_glx_BufferSwapComplete_ust_hi, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_glx_BufferSwapComplete_ust_lo, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_glx_BufferSwapComplete_msc_hi, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_glx_BufferSwapComplete_msc_lo, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_glx_BufferSwapComplete_sbc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_aux_buffer = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_PbufferClobber_aux_buffer, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_x = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_PbufferClobber_x, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_y = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_PbufferClobber_y, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_width = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_PbufferClobber_width, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_PbufferClobber_height, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_count = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_PbufferClobber_count, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    UNUSED(4);
 }
 
+
 static void glxRender(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_Render_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     dispatch_glx_render(tvb, pinfo, offsetp, t, byte_order, (length - 8));
@@ -6836,17 +6544,11 @@ static void glxRender(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto
 
 static void glxRenderLarge(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_request_num;
-    int f_request_total;
     int f_data_len;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_RenderLarge_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_request_num = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_RenderLarge_request_num, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_request_total = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_RenderLarge_request_total, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_data_len = VALUE32(tvb, *offsetp);
@@ -6858,24 +6560,14 @@ static void glxRenderLarge(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
 
 static void glxCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    int f_visual;
-    int f_screen;
-    int f_share_list;
-    int f_is_direct;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_visual = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateContext_visual, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateContext_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_share_list = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateContext_share_list, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_is_direct = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateContext_is_direct, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -6883,31 +6575,22 @@ static void glxCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
 
 static void glxDestroyContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_DestroyContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxMakeCurrent(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_context;
-    int f_old_context_tag;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_MakeCurrent_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_MakeCurrent_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_old_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_MakeCurrent_old_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxMakeCurrent_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_context_tag;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-MakeCurrent");
 
@@ -6917,11 +6600,8 @@ static void glxMakeCurrent_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-MakeCurrent)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_MakeCurrent_reply_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
@@ -6929,15 +6609,12 @@ static void glxMakeCurrent_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
 
 static void glxIsDirect(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_IsDirect_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxIsDirect_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_is_direct;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-IsDirect");
 
@@ -6947,11 +6624,8 @@ static void glxIsDirect_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-IsDirect)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_is_direct = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_IsDirect_reply_is_direct, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(23);
@@ -6959,20 +6633,14 @@ static void glxIsDirect_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
 
 static void glxQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_major_version;
-    int f_minor_version;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_QueryVersion_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_QueryVersion_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -6982,14 +6650,10 @@ static void glxQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_QueryVersion_reply_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_QueryVersion_reply_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(16);
@@ -6997,108 +6661,71 @@ static void glxQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
 
 static void glxWaitGL(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_WaitGL_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxWaitX(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_WaitX_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxCopyContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_src;
-    int f_dest;
-    int f_mask;
-    int f_src_context_tag;
-    f_src = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CopyContext_src, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dest = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CopyContext_dest, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mask = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CopyContext_mask, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_src_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CopyContext_src_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxSwapBuffers(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_drawable;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_SwapBuffers_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_SwapBuffers_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxUseXFont(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_font;
-    int f_first;
-    int f_count;
-    int f_list_base;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_UseXFont_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_font = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_UseXFont_font, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_first = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_UseXFont_first, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_count = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_UseXFont_count, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_list_base = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_UseXFont_list_base, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxCreateGLXPixmap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_visual;
-    int f_pixmap;
-    int f_glx_pixmap;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateGLXPixmap_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_visual = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateGLXPixmap_visual, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pixmap = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateGLXPixmap_pixmap, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_glx_pixmap = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateGLXPixmap_glx_pixmap, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxGetVisualConfigs(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetVisualConfigs_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetVisualConfigs_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_num_visuals;
-    int f_num_properties;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetVisualConfigs");
 
@@ -7109,13 +6736,10 @@ static void glxGetVisualConfigs_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
             "sequencenumber: %d (glx-GetVisualConfigs)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_visuals = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetVisualConfigs_reply_num_visuals, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_properties = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetVisualConfigs_reply_num_properties, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(16);
@@ -7124,20 +6748,14 @@ static void glxGetVisualConfigs_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
 
 static void glxDestroyGLXPixmap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_glx_pixmap;
-    f_glx_pixmap = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_DestroyGLXPixmap_glx_pixmap, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxVendorPrivate(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_vendor_code;
-    int f_context_tag;
-    f_vendor_code = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_VendorPrivate_vendor_code, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_VendorPrivate_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_VendorPrivate_data, (length - 12) / 1, byte_order);
@@ -7145,20 +6763,16 @@ static void glxVendorPrivate(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
 
 static void glxVendorPrivateWithReply(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_vendor_code;
-    int f_context_tag;
-    f_vendor_code = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_VendorPrivateWithReply_vendor_code, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_VendorPrivateWithReply_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_VendorPrivateWithReply_data, (length - 12) / 1, byte_order);
 }
 static void glxVendorPrivateWithReply_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_retval;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-VendorPrivateWithReply");
 
@@ -7169,10 +6783,8 @@ static void glxVendorPrivateWithReply_Reply(tvbuff_t *tvb, packet_info *pinfo, i
             "sequencenumber: %d (glx-VendorPrivateWithReply)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_retval = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_VendorPrivateWithReply_reply_retval, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_glx_VendorPrivateWithReply_reply_data1, 24, byte_order);
@@ -7181,15 +6793,12 @@ static void glxVendorPrivateWithReply_Reply(tvbuff_t *tvb, packet_info *pinfo, i
 
 static void glxQueryExtensionsString(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_QueryExtensionsString_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxQueryExtensionsString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_n;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryExtensionsString");
 
@@ -7199,12 +6808,9 @@ static void glxQueryExtensionsString_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-QueryExtensionsString)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
-    f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_QueryExtensionsString_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(16);
@@ -7212,18 +6818,14 @@ static void glxQueryExtensionsString_Reply(tvbuff_t *tvb, packet_info *pinfo, in
 
 static void glxQueryServerString(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_name;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_QueryServerString_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_name = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_QueryServerString_name, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxQueryServerString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_str_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryServerString");
@@ -7234,8 +6836,6 @@ static void glxQueryServerString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-QueryServerString)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
@@ -7248,13 +6848,9 @@ static void glxQueryServerString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
 
 static void glxClientInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_major_version;
-    int f_minor_version;
     int f_str_len;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_ClientInfo_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_ClientInfo_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_str_len = VALUE32(tvb, *offsetp);
@@ -7266,16 +6862,13 @@ static void glxClientInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, p
 
 static void glxGetFBConfigs(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetFBConfigs_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetFBConfigs_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_num_FB_configs;
-    int f_num_properties;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetFBConfigs");
 
@@ -7286,13 +6879,10 @@ static void glxGetFBConfigs_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
             "sequencenumber: %d (glx-GetFBConfigs)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_FB_configs = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetFBConfigs_reply_num_FB_configs, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_properties = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetFBConfigs_reply_num_properties, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(16);
@@ -7301,21 +6891,13 @@ static void glxGetFBConfigs_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
 
 static void glxCreatePixmap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_fbconfig;
-    int f_pixmap;
-    int f_glx_pixmap;
     int f_num_attribs;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreatePixmap_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_fbconfig = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreatePixmap_fbconfig, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pixmap = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreatePixmap_pixmap, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_glx_pixmap = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreatePixmap_glx_pixmap, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_attribs = VALUE32(tvb, *offsetp);
@@ -7327,36 +6909,22 @@ static void glxCreatePixmap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
 
 static void glxDestroyPixmap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_glx_pixmap;
-    f_glx_pixmap = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_DestroyPixmap_glx_pixmap, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxCreateNewContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    int f_fbconfig;
-    int f_screen;
-    int f_render_type;
-    int f_share_list;
-    int f_is_direct;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateNewContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_fbconfig = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateNewContext_fbconfig, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateNewContext_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_render_type = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateNewContext_render_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_share_list = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateNewContext_share_list, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_is_direct = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateNewContext_is_direct, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -7364,14 +6932,12 @@ static void glxCreateNewContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
 
 static void glxQueryContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_QueryContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxQueryContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_attribs;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryContext");
@@ -7382,8 +6948,6 @@ static void glxQueryContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-QueryContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_attribs = VALUE32(tvb, *offsetp);
@@ -7395,27 +6959,18 @@ static void glxQueryContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
 
 static void glxMakeContextCurrent(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_old_context_tag;
-    int f_drawable;
-    int f_read_drawable;
-    int f_context;
-    f_old_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_MakeContextCurrent_old_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_MakeContextCurrent_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_read_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_MakeContextCurrent_read_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_MakeContextCurrent_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxMakeContextCurrent_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_context_tag;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-MakeContextCurrent");
 
@@ -7425,11 +6980,8 @@ static void glxMakeContextCurrent_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-MakeContextCurrent)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_MakeContextCurrent_reply_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
@@ -7437,17 +6989,11 @@ static void glxMakeContextCurrent_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
 
 static void glxCreatePbuffer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_fbconfig;
-    int f_pbuffer;
     int f_num_attribs;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreatePbuffer_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_fbconfig = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreatePbuffer_fbconfig, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pbuffer = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreatePbuffer_pbuffer, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_attribs = VALUE32(tvb, *offsetp);
@@ -7459,22 +7005,18 @@ static void glxCreatePbuffer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
 
 static void glxDestroyPbuffer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_pbuffer;
-    f_pbuffer = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_DestroyPbuffer_pbuffer, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxGetDrawableAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetDrawableAttributes_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetDrawableAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_attribs;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDrawableAttributes");
@@ -7485,8 +7027,6 @@ static void glxGetDrawableAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetDrawableAttributes)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_attribs = VALUE32(tvb, *offsetp);
@@ -7498,9 +7038,7 @@ static void glxGetDrawableAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, in
 
 static void glxChangeDrawableAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
     int f_num_attribs;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_ChangeDrawableAttributes_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_attribs = VALUE32(tvb, *offsetp);
@@ -7512,21 +7050,13 @@ static void glxChangeDrawableAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, i
 
 static void glxCreateWindow(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_fbconfig;
-    int f_window;
-    int f_glx_window;
     int f_num_attribs;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateWindow_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_fbconfig = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateWindow_fbconfig, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateWindow_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_glx_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateWindow_glx_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_attribs = VALUE32(tvb, *offsetp);
@@ -7538,23 +7068,17 @@ static void glxCreateWindow(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
 
 static void glxDeleteWindow(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_glxwindow;
-    f_glxwindow = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_DeleteWindow_glxwindow, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxSetClientInfoARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_major_version;
-    int f_minor_version;
     int f_num_versions;
     int f_gl_str_len;
     int f_glx_str_len;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_SetClientInfoARB_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_SetClientInfoARB_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_versions = VALUE32(tvb, *offsetp);
@@ -7576,25 +7100,15 @@ static void glxSetClientInfoARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
 
 static void glxCreateContextAttribsARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    int f_fbconfig;
-    int f_screen;
-    int f_share_list;
-    int f_is_direct;
     int f_num_attribs;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateContextAttribsARB_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_fbconfig = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateContextAttribsARB_fbconfig, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateContextAttribsARB_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_share_list = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateContextAttribsARB_share_list, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_is_direct = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateContextAttribsARB_is_direct, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -7607,15 +7121,11 @@ static void glxCreateContextAttribsARB(tvbuff_t *tvb, packet_info *pinfo _U_, in
 
 static void glxSetClientInfo2ARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_major_version;
-    int f_minor_version;
     int f_num_versions;
     int f_gl_str_len;
     int f_glx_str_len;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_SetClientInfo2ARB_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_SetClientInfo2ARB_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_versions = VALUE32(tvb, *offsetp);
@@ -7637,59 +7147,40 @@ static void glxSetClientInfo2ARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *off
 
 static void glxNewList(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_list;
-    int f_mode;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_NewList_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_list = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_NewList_list, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mode = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_NewList_mode, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxEndList(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_EndList_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxDeleteLists(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_list;
-    int f_range;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_DeleteLists_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_list = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_DeleteLists_list, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_range = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_DeleteLists_range, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxGenLists(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_range;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GenLists_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_range = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GenLists_range, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGenLists_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_ret_val;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GenLists");
 
@@ -7699,60 +7190,41 @@ static void glxGenLists_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GenLists)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ret_val = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GenLists_reply_ret_val, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxFeedbackBuffer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_size;
-    int f_type;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_FeedbackBuffer_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_size = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_FeedbackBuffer_size, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_type = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_FeedbackBuffer_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxSelectBuffer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_size;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_SelectBuffer_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_size = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_SelectBuffer_size, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxRenderMode(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_mode;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_RenderMode_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mode = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_RenderMode_mode, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxRenderMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_ret_val;
+    int sequence_number;
     int f_n;
-    int f_new_mode;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-RenderMode");
 
@@ -7762,17 +7234,13 @@ static void glxRenderMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-RenderMode)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ret_val = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_RenderMode_reply_ret_val, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_RenderMode_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_new_mode = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_RenderMode_reply_new_mode, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -7781,14 +7249,12 @@ static void glxRenderMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
 
 static void glxFinish(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_Finish_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxFinish_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-Finish");
 
@@ -7798,86 +7264,55 @@ static void glxFinish_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-Finish)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxPixelStoref(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_pname;
-    gfloat f_datum;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_PixelStoref_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_PixelStoref_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_PixelStoref_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxPixelStorei(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_pname;
-    int f_datum;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_PixelStorei_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_PixelStorei_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_PixelStorei_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxReadPixels(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_x;
-    int f_y;
-    int f_width;
-    int f_height;
-    int f_format;
-    int f_type;
-    int f_swap_bytes;
-    int f_lsb_first;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_ReadPixels_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_ReadPixels_x, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_y = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_ReadPixels_y, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_ReadPixels_width, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_height = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_ReadPixels_height, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_ReadPixels_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_type = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_ReadPixels_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_swap_bytes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_ReadPixels_swap_bytes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_lsb_first = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_ReadPixels_lsb_first, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void glxReadPixels_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ReadPixels");
 
@@ -7888,7 +7323,6 @@ static void glxReadPixels_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
             "sequencenumber: %d (glx-ReadPixels)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(24);
@@ -7897,20 +7331,15 @@ static void glxReadPixels_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
 
 static void glxGetBooleanv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetBooleanv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetBooleanv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetBooleanv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetBooleanv");
 
@@ -7920,15 +7349,12 @@ static void glxGetBooleanv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetBooleanv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetBooleanv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetBooleanv_reply_datum, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(15);
@@ -7937,18 +7363,15 @@ static void glxGetBooleanv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
 
 static void glxGetClipPlane(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_plane;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetClipPlane_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_plane = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetClipPlane_plane, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetClipPlane_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetClipPlane");
 
@@ -7959,7 +7382,6 @@ static void glxGetClipPlane_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
             "sequencenumber: %d (glx-GetClipPlane)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(24);
@@ -7968,20 +7390,15 @@ static void glxGetClipPlane_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
 
 static void glxGetDoublev(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetDoublev_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetDoublev_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetDoublev_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gdouble f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDoublev");
 
@@ -7991,15 +7408,12 @@ static void glxGetDoublev_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetDoublev)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetDoublev_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = DOUBLE(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetDoublev_reply_datum, tvb, *offsetp, 8, byte_order);
     *offsetp += 8;
     UNUSED(8);
@@ -8008,15 +7422,12 @@ static void glxGetDoublev_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
 
 static void glxGetError(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetError_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetError_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_error;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetError");
 
@@ -8026,31 +7437,23 @@ static void glxGetError_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetError)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_error = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetError_reply_error, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxGetFloatv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetFloatv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetFloatv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetFloatv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetFloatv");
 
@@ -8060,15 +7463,12 @@ static void glxGetFloatv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetFloatv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetFloatv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetFloatv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8077,20 +7477,15 @@ static void glxGetFloatv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
 
 static void glxGetIntegerv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetIntegerv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetIntegerv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetIntegerv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetIntegerv");
 
@@ -8100,15 +7495,12 @@ static void glxGetIntegerv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetIntegerv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetIntegerv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetIntegerv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8117,24 +7509,17 @@ static void glxGetIntegerv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
 
 static void glxGetLightfv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_light;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetLightfv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_light = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetLightfv_light, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetLightfv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetLightfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetLightfv");
 
@@ -8144,15 +7529,12 @@ static void glxGetLightfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetLightfv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetLightfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetLightfv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8161,24 +7543,17 @@ static void glxGetLightfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
 
 static void glxGetLightiv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_light;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetLightiv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_light = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetLightiv_light, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetLightiv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetLightiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetLightiv");
 
@@ -8188,15 +7563,12 @@ static void glxGetLightiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetLightiv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetLightiv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetLightiv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8205,24 +7577,17 @@ static void glxGetLightiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
 
 static void glxGetMapdv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_query;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapdv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapdv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_query = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapdv_query, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetMapdv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gdouble f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetMapdv");
 
@@ -8232,15 +7597,12 @@ static void glxGetMapdv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetMapdv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapdv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = DOUBLE(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapdv_reply_datum, tvb, *offsetp, 8, byte_order);
     *offsetp += 8;
     UNUSED(8);
@@ -8249,24 +7611,17 @@ static void glxGetMapdv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
 
 static void glxGetMapfv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_query;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapfv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapfv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_query = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapfv_query, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetMapfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetMapfv");
 
@@ -8276,15 +7631,12 @@ static void glxGetMapfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetMapfv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapfv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8293,24 +7645,17 @@ static void glxGetMapfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
 
 static void glxGetMapiv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_query;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapiv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapiv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_query = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapiv_query, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetMapiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetMapiv");
 
@@ -8320,15 +7665,12 @@ static void glxGetMapiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetMapiv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapiv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMapiv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8337,24 +7679,17 @@ static void glxGetMapiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
 
 static void glxGetMaterialfv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_face;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMaterialfv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_face = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMaterialfv_face, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMaterialfv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetMaterialfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetMaterialfv");
 
@@ -8364,15 +7699,12 @@ static void glxGetMaterialfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetMaterialfv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMaterialfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMaterialfv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8381,24 +7713,17 @@ static void glxGetMaterialfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
 
 static void glxGetMaterialiv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_face;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMaterialiv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_face = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMaterialiv_face, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMaterialiv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetMaterialiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetMaterialiv");
 
@@ -8408,15 +7733,12 @@ static void glxGetMaterialiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetMaterialiv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMaterialiv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMaterialiv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8425,20 +7747,15 @@ static void glxGetMaterialiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
 
 static void glxGetPixelMapfv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_map;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapfv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_map = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapfv_map, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetPixelMapfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPixelMapfv");
 
@@ -8448,15 +7765,12 @@ static void glxGetPixelMapfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetPixelMapfv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapfv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8465,20 +7779,15 @@ static void glxGetPixelMapfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
 
 static void glxGetPixelMapuiv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_map;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapuiv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_map = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapuiv_map, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetPixelMapuiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPixelMapuiv");
 
@@ -8488,15 +7797,12 @@ static void glxGetPixelMapuiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetPixelMapuiv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapuiv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapuiv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8505,20 +7811,15 @@ static void glxGetPixelMapuiv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
 
 static void glxGetPixelMapusv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_map;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapusv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_map = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapusv_map, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetPixelMapusv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPixelMapusv");
 
@@ -8528,15 +7829,12 @@ static void glxGetPixelMapusv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetPixelMapusv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapusv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPixelMapusv_reply_datum, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(16);
@@ -8545,18 +7843,15 @@ static void glxGetPixelMapusv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
 
 static void glxGetPolygonStipple(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_lsb_first;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPolygonStipple_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_lsb_first = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetPolygonStipple_lsb_first, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void glxGetPolygonStipple_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPolygonStipple");
 
@@ -8567,7 +7862,6 @@ static void glxGetPolygonStipple_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
             "sequencenumber: %d (glx-GetPolygonStipple)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(24);
@@ -8576,18 +7870,14 @@ static void glxGetPolygonStipple_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
 
 static void glxGetString(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_name;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetString_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_name = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetString_name, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetString");
@@ -8598,8 +7888,6 @@ static void glxGetString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetString)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
@@ -8612,24 +7900,17 @@ static void glxGetString_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
 
 static void glxGetTexEnvfv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexEnvfv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexEnvfv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexEnvfv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetTexEnvfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetTexEnvfv");
 
@@ -8639,15 +7920,12 @@ static void glxGetTexEnvfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetTexEnvfv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexEnvfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexEnvfv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8656,24 +7934,17 @@ static void glxGetTexEnvfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
 
 static void glxGetTexEnviv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexEnviv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexEnviv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexEnviv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetTexEnviv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetTexEnviv");
 
@@ -8683,15 +7954,12 @@ static void glxGetTexEnviv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetTexEnviv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexEnviv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexEnviv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8700,24 +7968,17 @@ static void glxGetTexEnviv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
 
 static void glxGetTexGendv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_coord;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGendv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_coord = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGendv_coord, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGendv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetTexGendv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gdouble f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetTexGendv");
 
@@ -8727,15 +7988,12 @@ static void glxGetTexGendv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetTexGendv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGendv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = DOUBLE(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGendv_reply_datum, tvb, *offsetp, 8, byte_order);
     *offsetp += 8;
     UNUSED(8);
@@ -8744,24 +8002,17 @@ static void glxGetTexGendv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
 
 static void glxGetTexGenfv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_coord;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGenfv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_coord = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGenfv_coord, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGenfv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetTexGenfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetTexGenfv");
 
@@ -8771,15 +8022,12 @@ static void glxGetTexGenfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetTexGenfv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGenfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGenfv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8788,24 +8036,17 @@ static void glxGetTexGenfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
 
 static void glxGetTexGeniv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_coord;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGeniv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_coord = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGeniv_coord, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGeniv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetTexGeniv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetTexGeniv");
 
@@ -8815,15 +8056,12 @@ static void glxGetTexGeniv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetTexGeniv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGeniv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexGeniv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8832,37 +8070,23 @@ static void glxGetTexGeniv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
 
 static void glxGetTexImage(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_level;
-    int f_format;
-    int f_type;
-    int f_swap_bytes;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexImage_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexImage_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_level = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexImage_level, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexImage_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_type = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexImage_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_swap_bytes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexImage_swap_bytes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void glxGetTexImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_width;
-    int f_height;
-    int f_depth;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetTexImage");
 
@@ -8873,17 +8097,13 @@ static void glxGetTexImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
             "sequencenumber: %d (glx-GetTexImage)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(8);
-    f_width = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexImage_reply_width, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_height = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexImage_reply_height, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_depth = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexImage_reply_depth, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
@@ -8892,24 +8112,17 @@ static void glxGetTexImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
 
 static void glxGetTexParameterfv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexParameterfv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexParameterfv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexParameterfv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetTexParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetTexParameterfv");
 
@@ -8919,15 +8132,12 @@ static void glxGetTexParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetTexParameterfv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexParameterfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexParameterfv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8936,24 +8146,17 @@ static void glxGetTexParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
 
 static void glxGetTexParameteriv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexParameteriv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexParameteriv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexParameteriv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetTexParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetTexParameteriv");
 
@@ -8963,15 +8166,12 @@ static void glxGetTexParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetTexParameteriv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexParameteriv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexParameteriv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -8980,28 +8180,19 @@ static void glxGetTexParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
 
 static void glxGetTexLevelParameterfv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_level;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameterfv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameterfv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_level = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameterfv_level, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameterfv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetTexLevelParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetTexLevelParameterfv");
 
@@ -9011,15 +8202,12 @@ static void glxGetTexLevelParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetTexLevelParameterfv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameterfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameterfv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9028,28 +8216,19 @@ static void glxGetTexLevelParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, i
 
 static void glxGetTexLevelParameteriv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_level;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameteriv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameteriv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_level = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameteriv_level, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameteriv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetTexLevelParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetTexLevelParameteriv");
 
@@ -9059,15 +8238,12 @@ static void glxGetTexLevelParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetTexLevelParameteriv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameteriv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetTexLevelParameteriv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9076,19 +8252,14 @@ static void glxGetTexLevelParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, i
 
 static void glxIsList(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_list;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_IsList_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_list = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_IsList_list, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxIsList_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_ret_val;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-IsList");
 
@@ -9098,28 +8269,21 @@ static void glxIsList_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-IsList)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ret_val = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_IsList_reply_ret_val, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxFlush(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_Flush_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxAreTexturesResident(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
     int f_n;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_AreTexturesResident_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_n = VALUE32(tvb, *offsetp);
@@ -9130,8 +8294,8 @@ static void glxAreTexturesResident(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
 }
 static void glxAreTexturesResident_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_ret_val;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-AreTexturesResident");
 
@@ -9142,10 +8306,8 @@ static void glxAreTexturesResident_Reply(tvbuff_t *tvb, packet_info *pinfo, int
             "sequencenumber: %d (glx-AreTexturesResident)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ret_val = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_AreTexturesResident_reply_ret_val, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
@@ -9154,9 +8316,7 @@ static void glxAreTexturesResident_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void glxDeleteTextures(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
     int f_n;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_DeleteTextures_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_n = VALUE32(tvb, *offsetp);
@@ -9168,18 +8328,15 @@ static void glxDeleteTextures(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
 
 static void glxGenTextures(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_n;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GenTextures_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GenTextures_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGenTextures_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GenTextures");
 
@@ -9190,7 +8347,6 @@ static void glxGenTextures_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
             "sequencenumber: %d (glx-GenTextures)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(24);
@@ -9199,19 +8355,14 @@ static void glxGenTextures_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
 
 static void glxIsTexture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_texture;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_IsTexture_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_texture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_IsTexture_texture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxIsTexture_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_ret_val;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-IsTexture");
 
@@ -9221,42 +8372,29 @@ static void glxIsTexture_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-IsTexture)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ret_val = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_IsTexture_reply_ret_val, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxGetColorTable(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_format;
-    int f_type;
-    int f_swap_bytes;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTable_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTable_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTable_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_type = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTable_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_swap_bytes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTable_swap_bytes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void glxGetColorTable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_width;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetColorTable");
 
@@ -9267,11 +8405,9 @@ static void glxGetColorTable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
             "sequencenumber: %d (glx-GetColorTable)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(8);
-    f_width = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTable_reply_width, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9280,24 +8416,17 @@ static void glxGetColorTable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
 
 static void glxGetColorTableParameterfv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameterfv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameterfv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameterfv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetColorTableParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetColorTableParameterfv");
 
@@ -9307,15 +8436,12 @@ static void glxGetColorTableParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetColorTableParameterfv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameterfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameterfv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9324,24 +8450,17 @@ static void glxGetColorTableParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void glxGetColorTableParameteriv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameteriv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameteriv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameteriv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetColorTableParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetColorTableParameteriv");
 
@@ -9351,15 +8470,12 @@ static void glxGetColorTableParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetColorTableParameteriv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameteriv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetColorTableParameteriv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9368,32 +8484,21 @@ static void glxGetColorTableParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void glxGetConvolutionFilter(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_format;
-    int f_type;
-    int f_swap_bytes;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionFilter_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionFilter_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionFilter_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_type = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionFilter_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_swap_bytes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionFilter_swap_bytes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void glxGetConvolutionFilter_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_width;
-    int f_height;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetConvolutionFilter");
 
@@ -9404,14 +8509,11 @@ static void glxGetConvolutionFilter_Reply(tvbuff_t *tvb, packet_info *pinfo, int
             "sequencenumber: %d (glx-GetConvolutionFilter)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(8);
-    f_width = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionFilter_reply_width, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_height = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionFilter_reply_height, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(8);
@@ -9420,24 +8522,17 @@ static void glxGetConvolutionFilter_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void glxGetConvolutionParameterfv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameterfv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameterfv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameterfv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetConvolutionParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetConvolutionParameterfv");
 
@@ -9447,15 +8542,12 @@ static void glxGetConvolutionParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetConvolutionParameterfv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameterfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameterfv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9464,24 +8556,17 @@ static void glxGetConvolutionParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo
 
 static void glxGetConvolutionParameteriv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameteriv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameteriv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameteriv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetConvolutionParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetConvolutionParameteriv");
 
@@ -9491,15 +8576,12 @@ static void glxGetConvolutionParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetConvolutionParameteriv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameteriv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetConvolutionParameteriv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9508,32 +8590,21 @@ static void glxGetConvolutionParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo
 
 static void glxGetSeparableFilter(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_format;
-    int f_type;
-    int f_swap_bytes;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetSeparableFilter_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetSeparableFilter_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetSeparableFilter_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_type = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetSeparableFilter_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_swap_bytes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetSeparableFilter_swap_bytes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void glxGetSeparableFilter_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_row_w;
-    int f_col_h;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetSeparableFilter");
 
@@ -9544,14 +8615,11 @@ static void glxGetSeparableFilter_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
             "sequencenumber: %d (glx-GetSeparableFilter)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(8);
-    f_row_w = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetSeparableFilter_reply_row_w, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_col_h = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetSeparableFilter_reply_col_h, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(8);
@@ -9560,35 +8628,23 @@ static void glxGetSeparableFilter_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
 
 static void glxGetHistogram(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_format;
-    int f_type;
-    int f_swap_bytes;
-    int f_reset;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogram_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogram_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogram_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_type = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogram_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_swap_bytes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogram_swap_bytes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_reset = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogram_reset, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void glxGetHistogram_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_width;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetHistogram");
 
@@ -9599,11 +8655,9 @@ static void glxGetHistogram_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
             "sequencenumber: %d (glx-GetHistogram)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(8);
-    f_width = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogram_reply_width, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9612,24 +8666,17 @@ static void glxGetHistogram_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
 
 static void glxGetHistogramParameterfv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameterfv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameterfv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameterfv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetHistogramParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetHistogramParameterfv");
 
@@ -9639,15 +8686,12 @@ static void glxGetHistogramParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetHistogramParameterfv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameterfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameterfv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9656,24 +8700,17 @@ static void glxGetHistogramParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void glxGetHistogramParameteriv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameteriv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameteriv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameteriv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetHistogramParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetHistogramParameteriv");
 
@@ -9683,15 +8720,12 @@ static void glxGetHistogramParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetHistogramParameteriv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameteriv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetHistogramParameteriv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9700,34 +8734,23 @@ static void glxGetHistogramParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void glxGetMinmax(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_format;
-    int f_type;
-    int f_swap_bytes;
-    int f_reset;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmax_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmax_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmax_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_type = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmax_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_swap_bytes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmax_swap_bytes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_reset = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmax_reset, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void glxGetMinmax_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetMinmax");
 
@@ -9738,7 +8761,6 @@ static void glxGetMinmax_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
             "sequencenumber: %d (glx-GetMinmax)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(24);
@@ -9747,24 +8769,17 @@ static void glxGetMinmax_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
 
 static void glxGetMinmaxParameterfv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameterfv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameterfv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameterfv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetMinmaxParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    gfloat f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetMinmaxParameterfv");
 
@@ -9774,15 +8789,12 @@ static void glxGetMinmaxParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetMinmaxParameterfv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameterfv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = FLOAT(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameterfv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9791,24 +8803,17 @@ static void glxGetMinmaxParameterfv_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void glxGetMinmaxParameteriv(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameteriv_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameteriv_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameteriv_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetMinmaxParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetMinmaxParameteriv");
 
@@ -9818,15 +8823,12 @@ static void glxGetMinmaxParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetMinmaxParameteriv)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameteriv_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetMinmaxParameteriv_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9835,23 +8837,17 @@ static void glxGetMinmaxParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void glxGetCompressedTexImageARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_level;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetCompressedTexImageARB_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetCompressedTexImageARB_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_level = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetCompressedTexImageARB_level, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetCompressedTexImageARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_size;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetCompressedTexImageARB");
 
@@ -9862,11 +8858,9 @@ static void glxGetCompressedTexImageARB_Reply(tvbuff_t *tvb, packet_info *pinfo,
             "sequencenumber: %d (glx-GetCompressedTexImageARB)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(8);
-    f_size = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetCompressedTexImageARB_reply_size, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9875,9 +8869,7 @@ static void glxGetCompressedTexImageARB_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void glxDeleteQueriesARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
     int f_n;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_DeleteQueriesARB_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_n = VALUE32(tvb, *offsetp);
@@ -9889,18 +8881,15 @@ static void glxDeleteQueriesARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
 
 static void glxGenQueriesARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_n;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GenQueriesARB_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GenQueriesARB_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGenQueriesARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GenQueriesARB");
 
@@ -9911,7 +8900,6 @@ static void glxGenQueriesARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
             "sequencenumber: %d (glx-GenQueriesARB)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(24);
@@ -9920,19 +8908,14 @@ static void glxGenQueriesARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
 
 static void glxIsQueryARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_id;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_IsQueryARB_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_IsQueryARB_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxIsQueryARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_ret_val;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-IsQueryARB");
 
@@ -9942,35 +8925,25 @@ static void glxIsQueryARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-IsQueryARB)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ret_val = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_IsQueryARB_reply_ret_val, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void glxGetQueryivARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_target;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryivARB_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_target = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryivARB_target, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryivARB_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetQueryivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetQueryivARB");
 
@@ -9980,15 +8953,12 @@ static void glxGetQueryivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetQueryivARB)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryivARB_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryivARB_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -9997,24 +8967,17 @@ static void glxGetQueryivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
 
 static void glxGetQueryObjectivARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_id;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectivARB_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectivARB_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectivARB_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetQueryObjectivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetQueryObjectivARB");
 
@@ -10024,15 +8987,12 @@ static void glxGetQueryObjectivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetQueryObjectivARB)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectivARB_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectivARB_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -10041,24 +9001,17 @@ static void glxGetQueryObjectivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void glxGetQueryObjectuivARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_tag;
-    int f_id;
-    int f_pname;
-    f_context_tag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectuivARB_context_tag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectuivARB_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pname = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectuivARB_pname, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void glxGetQueryObjectuivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_n;
-    int f_datum;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetQueryObjectuivARB");
 
@@ -10068,15 +9021,12 @@ static void glxGetQueryObjectuivARB_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (glx-GetQueryObjectuivARB)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
     f_n = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectuivARB_reply_n, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_datum = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_GetQueryObjectuivARB_reply_datum, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -10186,7 +9136,7 @@ static const value_string glx_extension_minor[] = {
     { 0, NULL }
 };
 const x11_event_info glx_events[] = {
-    { "glx-PbufferClobber", glxPbufferClobber },
+    { "glx-BufferSwapComplete", glxBufferSwapComplete },
     { NULL, NULL }
 };
 static x11_reply_info glx_replies[] = {
@@ -10576,38 +9526,30 @@ static void dispatch_glx(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_
 
 static void register_glx(void)
 {
-    set_handler("GLX", dispatch_glx, glx_errors, glx_events, glx_replies);
+    set_handler("GLX", dispatch_glx, glx_errors, glx_events, NULL, glx_replies);
 }
 
-static void struct_ScreenSize(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_randr_ScreenSize(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_width;
-	int f_height;
-	int f_mwidth;
-	int f_mheight;
 
-	item = proto_tree_add_item(root, hf_x11_struct_ScreenSize, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_randr_ScreenSize, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_width = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ScreenSize_width, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_randr_ScreenSize_width, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_height = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ScreenSize_height, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_randr_ScreenSize_height, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_mwidth = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ScreenSize_mwidth, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_randr_ScreenSize_mwidth, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_mheight = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ScreenSize_mheight, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_randr_ScreenSize_mheight, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
     }
 }
 
-static int struct_size_RefreshRates(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_randr_RefreshRates(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_nRates;
@@ -10616,7 +9558,7 @@ static int struct_size_RefreshRates(tvbuff_t *tvb, int *offsetp, guint byte_orde
     return size + 2;
 }
 
-static void struct_RefreshRates(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_randr_RefreshRates(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
@@ -10624,31 +9566,587 @@ static void struct_RefreshRates(tvbuff_t *tvb, int *offsetp, proto_tree *root, g
 	proto_tree *t;
 	int f_nRates;
 
-	item = proto_tree_add_item(root, hf_x11_struct_RefreshRates, tvb, *offsetp, struct_size_RefreshRates(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_randr_RefreshRates, tvb, *offsetp, struct_size_randr_RefreshRates(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
 	f_nRates = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_RefreshRates_nRates, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_randr_RefreshRates_nRates, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	listOfCard16(tvb, offsetp, t, hf_x11_struct_randr_RefreshRates_rates, hf_x11_struct_randr_RefreshRates_rates_item, f_nRates, byte_order);
+    }
+}
+
+static void struct_randr_ModeInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_randr_ModeInfo, tvb, *offsetp, 32, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_id, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_width, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_height, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_dot_clock, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_hsync_start, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_hsync_end, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_htotal, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_hskew, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_vsync_start, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_vsync_end, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_vtotal, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_name_len, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	{
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_randr_ModeInfo_mode_flags, tvb, *offsetp, 4, byte_order);
+	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_HsyncPositive, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_HsyncNegative, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_VsyncPositive, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_VsyncNegative, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_Interlace, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_DoubleScan, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_Csync, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_CsyncPositive, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_CsyncNegative, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_HskewPresent, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_Bcast, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_PixelMultiplex, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_DoubleClock, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_ModeInfo_mode_flags_mask_HalveClock, tvb, *offsetp, 4, byte_order);
+	}
+	*offsetp += 4;
+    }
+}
+
+static void struct_randr_CrtcChange(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_randr_CrtcChange, tvb, *offsetp, 28, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_randr_CrtcChange_timestamp, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_CrtcChange_window, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_CrtcChange_crtc, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_CrtcChange_mode, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	{
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_randr_CrtcChange_rotation, tvb, *offsetp, 2, byte_order);
+	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_CrtcChange_rotation_mask_Rotate_0, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_CrtcChange_rotation_mask_Rotate_90, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_CrtcChange_rotation_mask_Rotate_180, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_CrtcChange_rotation_mask_Rotate_270, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_CrtcChange_rotation_mask_Reflect_X, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_CrtcChange_rotation_mask_Reflect_Y, tvb, *offsetp, 2, byte_order);
+	}
+	*offsetp += 2;
+	UNUSED(2);
+	proto_tree_add_item(t, hf_x11_struct_randr_CrtcChange_x, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_randr_CrtcChange_y, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_randr_CrtcChange_width, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_randr_CrtcChange_height, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+    }
+}
+
+static void struct_randr_OutputChange(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_randr_OutputChange, tvb, *offsetp, 28, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_randr_OutputChange_timestamp, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_OutputChange_config_timestamp, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_OutputChange_window, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_OutputChange_output, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_OutputChange_crtc, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_OutputChange_mode, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	{
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_randr_OutputChange_rotation, tvb, *offsetp, 2, byte_order);
+	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_OutputChange_rotation_mask_Rotate_0, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_OutputChange_rotation_mask_Rotate_90, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_OutputChange_rotation_mask_Rotate_180, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_OutputChange_rotation_mask_Rotate_270, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_OutputChange_rotation_mask_Reflect_X, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_randr_OutputChange_rotation_mask_Reflect_Y, tvb, *offsetp, 2, byte_order);
+	}
 	*offsetp += 2;
-	listOfCard16(tvb, offsetp, t, hf_x11_struct_RefreshRates_rates, hf_x11_struct_RefreshRates_rates_item, f_nRates, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_randr_OutputChange_connection, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_randr_OutputChange_subpixel_order, byte_order);
     }
 }
 
+static void struct_randr_OutputProperty(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_randr_OutputProperty, tvb, *offsetp, 28, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_randr_OutputProperty_window, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_OutputProperty_output, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_OutputProperty_atom, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_OutputProperty_timestamp, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	field8(tvb, offsetp, t, hf_x11_struct_randr_OutputProperty_status, byte_order);
+	UNUSED(11);
+    }
+}
+
+static void struct_randr_ProviderChange(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_randr_ProviderChange, tvb, *offsetp, 28, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_randr_ProviderChange_timestamp, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_ProviderChange_window, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_ProviderChange_provider, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	UNUSED(16);
+    }
+}
+
+static void struct_randr_ProviderProperty(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_randr_ProviderProperty, tvb, *offsetp, 28, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_randr_ProviderProperty_window, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_ProviderProperty_provider, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_ProviderProperty_atom, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_ProviderProperty_timestamp, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_ProviderProperty_state, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+	UNUSED(11);
+    }
+}
+
+static void struct_randr_ResourceChange(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_randr_ResourceChange, tvb, *offsetp, 28, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_randr_ResourceChange_timestamp, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_randr_ResourceChange_window, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	UNUSED(20);
+    }
+}
+
+static void struct_sync_INT64(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_sync_INT64, tvb, *offsetp, 8, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_sync_INT64_hi, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_sync_INT64_lo, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+    }
+}
+
+static int struct_size_sync_SYSTEMCOUNTER(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+{
+    int size = 0;
+    int f_name_len;
+    f_name_len = VALUE16(tvb, *offsetp + size + 12);
+    size += f_name_len * 1;
+    return size + 14;
+}
+
+static void struct_sync_SYSTEMCOUNTER(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+	int f_name_len;
+
+	item = proto_tree_add_item(root, hf_x11_struct_sync_SYSTEMCOUNTER, tvb, *offsetp, struct_size_sync_SYSTEMCOUNTER(tvb, offsetp, byte_order), ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_sync_SYSTEMCOUNTER_counter, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
+	f_name_len = VALUE16(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_sync_SYSTEMCOUNTER_name_len, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	listOfByte(tvb, offsetp, t, hf_x11_struct_sync_SYSTEMCOUNTER_name, f_name_len, byte_order);
+    }
+}
+
+static void struct_sync_TRIGGER(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_sync_TRIGGER, tvb, *offsetp, 20, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_sync_TRIGGER_counter, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	field32(tvb, offsetp, t, hf_x11_struct_sync_TRIGGER_wait_type, byte_order);
+	struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
+	field32(tvb, offsetp, t, hf_x11_struct_sync_TRIGGER_test_type, byte_order);
+    }
+}
+
+static void struct_sync_WAITCONDITION(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_sync_WAITCONDITION, tvb, *offsetp, 28, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	struct_sync_TRIGGER(tvb, offsetp, t, byte_order, 1);
+	struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
+    }
+}
+
+static void struct_present_Notify(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_present_Notify, tvb, *offsetp, 8, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_present_Notify_window, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_present_Notify_serial, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+    }
+}
+
+static void presentQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_present_QueryVersion_major_version, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_QueryVersion_minor_version, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void presentQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (present-QueryVersion)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_QueryVersion_reply_major_version, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_QueryVersion_reply_minor_version, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+
+static void presentPixmap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_present_Pixmap_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_Pixmap_pixmap, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_Pixmap_serial, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_Pixmap_valid, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_Pixmap_update, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_Pixmap_x_off, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_present_Pixmap_y_off, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_present_Pixmap_target_crtc, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_Pixmap_wait_fence, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_Pixmap_idle_fence, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_Pixmap_options, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    UNUSED(4);
+    proto_tree_add_item(t, hf_x11_present_Pixmap_target_msc, tvb, *offsetp, 8, byte_order);
+    *offsetp += 8;
+    proto_tree_add_item(t, hf_x11_present_Pixmap_divisor, tvb, *offsetp, 8, byte_order);
+    *offsetp += 8;
+    proto_tree_add_item(t, hf_x11_present_Pixmap_remainder, tvb, *offsetp, 8, byte_order);
+    *offsetp += 8;
+    struct_present_Notify(tvb, offsetp, t, byte_order, (length - 72) / 8);
+}
+
+static void presentNotifyMSC(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_present_NotifyMSC_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_NotifyMSC_serial, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    UNUSED(4);
+    proto_tree_add_item(t, hf_x11_present_NotifyMSC_target_msc, tvb, *offsetp, 8, byte_order);
+    *offsetp += 8;
+    proto_tree_add_item(t, hf_x11_present_NotifyMSC_divisor, tvb, *offsetp, 8, byte_order);
+    *offsetp += 8;
+    proto_tree_add_item(t, hf_x11_present_NotifyMSC_remainder, tvb, *offsetp, 8, byte_order);
+    *offsetp += 8;
+}
+
+static void presentSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_present_SelectInput_eid, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_SelectInput_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_present_SelectInput_event_mask, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_present_SelectInput_event_mask_mask_ConfigureNotify, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_present_SelectInput_event_mask_mask_CompleteNotify, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_present_SelectInput_event_mask_mask_IdleNotify, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_present_SelectInput_event_mask_mask_RedirectNotify, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+}
+
+static void presentQueryCapabilities(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_present_QueryCapabilities_target, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void presentQueryCapabilities_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryCapabilities");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (present-QueryCapabilities)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_QueryCapabilities_reply_capabilities, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+
+static void presentCompleteNotify(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 1,
+                               "opcode: CompleteNotify (1)");
+    field8(tvb, offsetp, t, hf_x11_present_CompleteNotify_kind, byte_order);
+    field8(tvb, offsetp, t, hf_x11_present_CompleteNotify_mode, byte_order);
+    proto_tree_add_item(t, hf_x11_present_CompleteNotify_event, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_CompleteNotify_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_CompleteNotify_serial, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_CompleteNotify_ust, tvb, *offsetp, 8, byte_order);
+    *offsetp += 8;
+    proto_tree_add_item(t, hf_x11_present_CompleteNotify_msc, tvb, *offsetp, 8, byte_order);
+    *offsetp += 8;
+}
+
+
+static void presentIdleNotify(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 2,
+                               "opcode: IdleNotify (2)");
+    UNUSED(2);
+    proto_tree_add_item(t, hf_x11_present_IdleNotify_event, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_IdleNotify_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_IdleNotify_serial, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_IdleNotify_pixmap, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_IdleNotify_idle_fence, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+
+
+static void presentRedirectNotify(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 3,
+                               "opcode: RedirectNotify (3)");
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_update_window, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(1);
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_event, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_event_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_pixmap, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_serial, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_valid_region, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_update_region, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    struct_xproto_RECTANGLE(tvb, offsetp, t, byte_order, 1);
+    struct_xproto_RECTANGLE(tvb, offsetp, t, byte_order, 1);
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_x_off, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_y_off, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_target_crtc, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_wait_fence, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_idle_fence, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_options, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    UNUSED(4);
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_target_msc, tvb, *offsetp, 8, byte_order);
+    *offsetp += 8;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_divisor, tvb, *offsetp, 8, byte_order);
+    *offsetp += 8;
+    proto_tree_add_item(t, hf_x11_present_RedirectNotify_remainder, tvb, *offsetp, 8, byte_order);
+    *offsetp += 8;
+    struct_present_Notify(tvb, offsetp, t, byte_order, (length - 104) / 8);
+}
+
+static const value_string present_extension_minor[] = {
+    { 0, "QueryVersion" },
+    { 1, "Pixmap" },
+    { 2, "NotifyMSC" },
+    { 3, "SelectInput" },
+    { 4, "QueryCapabilities" },
+    { 0, NULL }
+};
+const x11_event_info present_events[] = {
+    { NULL, NULL }
+};
+static const x11_generic_event_info present_generic_events[] = {
+	{   1, presentCompleteNotify },
+	{   2, presentIdleNotify },
+	{   3, presentRedirectNotify },
+	{   0, NULL },
+};
+
+static x11_reply_info present_replies[] = {
+    { 0, presentQueryVersion_Reply },
+    { 4, presentQueryCapabilities_Reply },
+    { 0, NULL }
+};
+
+static void dispatch_present(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int minor, length;
+    minor = CARD8(present_extension_minor);
+    length = REQUEST_LENGTH();
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-%s",
+			  val_to_str(minor, present_extension_minor,
+				     "<Unknown opcode %d>"));
+    switch (minor) {
+    case 0:
+	presentQueryVersion(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 1:
+	presentPixmap(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 2:
+	presentNotifyMSC(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 3:
+	presentSelectInput(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 4:
+	presentQueryCapabilities(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    /* No need for a default case here, since Unknown is printed above,
+       and UNDECODED() is taken care of by dissect_x11_request */
+    }
+}
+
+static void register_present(void)
+{
+    set_handler("Present", dispatch_present, present_errors, present_events, present_generic_events, present_replies);
+}
+
 static void randrQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_major_version;
-    int f_minor_version;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_QueryVersion_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_QueryVersion_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -10658,14 +10156,10 @@ static void randrQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_QueryVersion_reply_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_QueryVersion_reply_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(16);
@@ -10673,25 +10167,14 @@ static void randrQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
 
 static void randrSetScreenConfig(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_timestamp;
-    int f_config_timestamp;
-    int f_sizeID;
-    int f_rotation;
-    int f_rate;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_config_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_config_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_sizeID = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_sizeID, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_rotation = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_rotation, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -10703,53 +10186,38 @@ static void randrSetScreenConfig(tvbuff_t *tvb, packet_info *pinfo _U_, int *off
         proto_tree_add_item(bitmask_tree, hf_x11_randr_SetScreenConfig_rotation_mask_Reflect_Y, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_rate = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_rate, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
 }
 static void randrSetScreenConfig_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
-    int f_new_timestamp;
-    int f_config_timestamp;
-    int f_root;
-    int f_subpixel_order;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-SetScreenConfig");
 
     REPLY(reply);
-    f_status = field8(tvb, offsetp, t, hf_x11_randr_SetScreenConfig_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_randr_SetScreenConfig_reply_status, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-SetScreenConfig)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_new_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_reply_new_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_config_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_reply_config_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_root = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_reply_root, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_subpixel_order = field16(tvb, offsetp, t, hf_x11_randr_SetScreenConfig_reply_subpixel_order, byte_order);
+    field16(tvb, offsetp, t, hf_x11_randr_SetScreenConfig_reply_subpixel_order, byte_order);
     UNUSED(10);
 }
 
 static void randrSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_enable;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SelectInput_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_enable = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_randr_SelectInput_enable, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -10757,6 +10225,9 @@ static void randrSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
         proto_tree_add_item(bitmask_tree, hf_x11_randr_SelectInput_enable_mask_CrtcChange, tvb, *offsetp, 2, byte_order);
         proto_tree_add_item(bitmask_tree, hf_x11_randr_SelectInput_enable_mask_OutputChange, tvb, *offsetp, 2, byte_order);
         proto_tree_add_item(bitmask_tree, hf_x11_randr_SelectInput_enable_mask_OutputProperty, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_randr_SelectInput_enable_mask_ProviderChange, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_randr_SelectInput_enable_mask_ProviderProperty, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_randr_SelectInput_enable_mask_ResourceChange, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
     UNUSED(2);
@@ -10764,28 +10235,18 @@ static void randrSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
 
 static void randrGetScreenInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrGetScreenInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_rotations;
-    int f_root;
-    int f_timestamp;
-    int f_config_timestamp;
+    int sequence_number;
     int f_nSizes;
-    int f_sizeID;
-    int f_rotation;
-    int f_rate;
     int f_nInfo;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetScreenInfo");
 
     REPLY(reply);
-    f_rotations = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_rotations, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -10801,26 +10262,19 @@ static void randrGetScreenInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-GetScreenInfo)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_root = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_root, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_config_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_config_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_nSizes = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_nSizes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_sizeID = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_sizeID, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_rotation = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_rotation, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -10832,31 +10286,24 @@ static void randrGetScreenInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
         proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotation_mask_Reflect_Y, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_rate = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_rate, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_nInfo = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_nInfo, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    struct_ScreenSize(tvb, offsetp, t, byte_order, f_nSizes);
-    struct_RefreshRates(tvb, offsetp, t, byte_order, (f_nInfo - f_nSizes));
+    struct_randr_ScreenSize(tvb, offsetp, t, byte_order, f_nSizes);
+    struct_randr_RefreshRates(tvb, offsetp, t, byte_order, (f_nInfo - f_nSizes));
 }
 
 static void randrGetScreenSizeRange(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenSizeRange_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrGetScreenSizeRange_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_min_width;
-    int f_min_height;
-    int f_max_width;
-    int f_max_height;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetScreenSizeRange");
 
@@ -10866,20 +10313,14 @@ static void randrGetScreenSizeRange_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-GetScreenSizeRange)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_min_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenSizeRange_reply_min_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_min_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenSizeRange_reply_min_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_max_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenSizeRange_reply_max_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_max_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenSizeRange_reply_max_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(16);
@@ -10887,121 +10328,26 @@ static void randrGetScreenSizeRange_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void randrSetScreenSize(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_width;
-    int f_height;
-    int f_mm_width;
-    int f_mm_height;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenSize_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenSize_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenSize_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mm_width = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenSize_mm_width, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mm_height = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetScreenSize_mm_height, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
-static void struct_ModeInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_id;
-	int f_width;
-	int f_height;
-	int f_dot_clock;
-	int f_hsync_start;
-	int f_hsync_end;
-	int f_htotal;
-	int f_hskew;
-	int f_vsync_start;
-	int f_vsync_end;
-	int f_vtotal;
-	int f_name_len;
-	int f_mode_flags;
-
-	item = proto_tree_add_item(root, hf_x11_struct_ModeInfo, tvb, *offsetp, 32, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_id = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ModeInfo_id, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_width = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ModeInfo_width, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_height = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ModeInfo_height, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_dot_clock = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ModeInfo_dot_clock, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_hsync_start = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ModeInfo_hsync_start, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_hsync_end = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ModeInfo_hsync_end, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_htotal = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ModeInfo_htotal, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_hskew = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ModeInfo_hskew, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_vsync_start = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ModeInfo_vsync_start, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_vsync_end = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ModeInfo_vsync_end, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_vtotal = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ModeInfo_vtotal, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_name_len = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ModeInfo_name_len, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_mode_flags = VALUE32(tvb, *offsetp);
-	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_ModeInfo_mode_flags, tvb, *offsetp, 4, byte_order);
-	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_HsyncPositive, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_HsyncNegative, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_VsyncPositive, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_VsyncNegative, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_Interlace, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_DoubleScan, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_Csync, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_CsyncPositive, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_CsyncNegative, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_HskewPresent, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_Bcast, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_PixelMultiplex, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_DoubleClock, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_HalveClock, tvb, *offsetp, 4, byte_order);
-	}
-	*offsetp += 4;
-    }
-}
-
 static void randrGetScreenResources(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResources_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrGetScreenResources_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_timestamp;
-    int f_config_timestamp;
+    int sequence_number;
     int f_num_crtcs;
     int f_num_outputs;
     int f_num_modes;
@@ -11015,14 +10361,10 @@ static void randrGetScreenResources_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-GetScreenResources)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResources_reply_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_config_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResources_reply_config_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_crtcs = VALUE16(tvb, *offsetp);
@@ -11040,70 +10382,51 @@ static void randrGetScreenResources_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     UNUSED(8);
     listOfCard32(tvb, offsetp, t, hf_x11_randr_GetScreenResources_reply_crtcs, hf_x11_randr_GetScreenResources_reply_crtcs_item, f_num_crtcs, byte_order);
     listOfCard32(tvb, offsetp, t, hf_x11_randr_GetScreenResources_reply_outputs, hf_x11_randr_GetScreenResources_reply_outputs_item, f_num_outputs, byte_order);
-    struct_ModeInfo(tvb, offsetp, t, byte_order, f_num_modes);
+    struct_randr_ModeInfo(tvb, offsetp, t, byte_order, f_num_modes);
     listOfByte(tvb, offsetp, t, hf_x11_randr_GetScreenResources_reply_names, f_names_len, byte_order);
 }
 
 static void randrGetOutputInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_output;
-    int f_config_timestamp;
-    f_output = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_output, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_config_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_config_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrGetOutputInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
-    int f_timestamp;
-    int f_crtc;
-    int f_mm_width;
-    int f_mm_height;
-    int f_connection;
-    int f_subpixel_order;
+    int sequence_number;
     int f_num_crtcs;
     int f_num_modes;
-    int f_num_preferred;
     int f_num_clones;
     int f_name_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetOutputInfo");
 
     REPLY(reply);
-    f_status = field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_status, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-GetOutputInfo)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_crtc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_crtc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mm_width = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_mm_width, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mm_height = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_mm_height, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_connection = field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_connection, byte_order);
-    f_subpixel_order = field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_subpixel_order, byte_order);
+    field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_connection, byte_order);
+    field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_subpixel_order, byte_order);
     f_num_crtcs = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_num_crtcs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_num_modes = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_num_modes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_preferred = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_num_preferred, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_num_clones = VALUE16(tvb, *offsetp);
@@ -11120,14 +10443,12 @@ static void randrGetOutputInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
 
 static void randrListOutputProperties(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_output;
-    f_output = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_ListOutputProperties_output, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrListOutputProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_atoms;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ListOutputProperties");
@@ -11138,8 +10459,6 @@ static void randrListOutputProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-ListOutputProperties)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_atoms = VALUE16(tvb, *offsetp);
@@ -11151,21 +10470,15 @@ static void randrListOutputProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, i
 
 static void randrQueryOutputProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_output;
-    int f_property;
-    f_output = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_QueryOutputProperty_output, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_property = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_QueryOutputProperty_property, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrQueryOutputProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_pending;
-    int f_range;
-    int f_immutable;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryOutputProperty");
 
@@ -11176,16 +10489,12 @@ static void randrQueryOutputProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, in
             "sequencenumber: %d (randr-QueryOutputProperty)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pending = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_QueryOutputProperty_reply_pending, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_range = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_QueryOutputProperty_reply_range, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_immutable = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_QueryOutputProperty_reply_immutable, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(21);
@@ -11194,20 +10503,12 @@ static void randrQueryOutputProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, in
 
 static void randrConfigureOutputProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_output;
-    int f_property;
-    int f_pending;
-    int f_range;
-    f_output = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_ConfigureOutputProperty_output, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_property = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_ConfigureOutputProperty_property, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pending = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_ConfigureOutputProperty_pending, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_range = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_ConfigureOutputProperty_range, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(2);
@@ -11216,25 +10517,18 @@ static void randrConfigureOutputProperty(tvbuff_t *tvb, packet_info *pinfo _U_,
 
 static void randrChangeOutputProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_output;
-    int f_property;
-    int f_type;
     int f_format;
-    int f_mode;
     int f_num_units;
-    f_output = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_ChangeOutputProperty_output, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_property = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_ChangeOutputProperty_property, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_type = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_ChangeOutputProperty_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_format = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_ChangeOutputProperty_format, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_mode = field8(tvb, offsetp, t, hf_x11_randr_ChangeOutputProperty_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_randr_ChangeOutputProperty_mode, byte_order);
     UNUSED(2);
     f_num_units = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_ChangeOutputProperty_num_units, tvb, *offsetp, 4, byte_order);
@@ -11245,52 +10539,33 @@ static void randrChangeOutputProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int
 
 static void randrDeleteOutputProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_output;
-    int f_property;
-    f_output = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_DeleteOutputProperty_output, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_property = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_DeleteOutputProperty_property, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void randrGetOutputProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_output;
-    int f_property;
-    int f_type;
-    int f_long_offset;
-    int f_long_length;
-    int f_delete;
-    int f_pending;
-    f_output = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_output, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_property = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_property, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_type = field32(tvb, offsetp, t, hf_x11_randr_GetOutputProperty_type, byte_order);
-    f_long_offset = VALUE32(tvb, *offsetp);
+    field32(tvb, offsetp, t, hf_x11_randr_GetOutputProperty_type, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_long_offset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_long_length = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_long_length, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_delete = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_delete, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_pending = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_pending, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(2);
 }
 static void randrGetOutputProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_format;
-    int f_type;
-    int f_bytes_after;
     int f_num_items;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetOutputProperty");
@@ -11303,12 +10578,9 @@ static void randrGetOutputProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-GetOutputProperty)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_type = field32(tvb, offsetp, t, hf_x11_randr_GetOutputProperty_reply_type, byte_order);
-    f_bytes_after = VALUE32(tvb, *offsetp);
+    field32(tvb, offsetp, t, hf_x11_randr_GetOutputProperty_reply_type, byte_order);
     proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_reply_bytes_after, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_items = VALUE32(tvb, *offsetp);
@@ -11320,17 +10592,14 @@ static void randrGetOutputProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void randrCreateMode(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_CreateMode_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_ModeInfo(tvb, offsetp, t, byte_order, 1);
+    struct_randr_ModeInfo(tvb, offsetp, t, byte_order, 1);
     listOfByte(tvb, offsetp, t, hf_x11_randr_CreateMode_name, (length - 40) / 1, byte_order);
 }
 static void randrCreateMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_mode;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-CreateMode");
 
@@ -11340,11 +10609,8 @@ static void randrCreateMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-CreateMode)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mode = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_CreateMode_reply_mode, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
@@ -11352,93 +10618,61 @@ static void randrCreateMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
 
 static void randrDestroyMode(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_mode;
-    f_mode = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_DestroyMode_mode, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void randrAddOutputMode(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_output;
-    int f_mode;
-    f_output = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_AddOutputMode_output, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mode = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_AddOutputMode_mode, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void randrDeleteOutputMode(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_output;
-    int f_mode;
-    f_output = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_DeleteOutputMode_output, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mode = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_DeleteOutputMode_mode, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void randrGetCrtcInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_crtc;
-    int f_config_timestamp;
-    f_crtc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_crtc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_config_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_config_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrGetCrtcInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
-    int f_timestamp;
-    int f_x;
-    int f_y;
-    int f_width;
-    int f_height;
-    int f_mode;
-    int f_rotation;
-    int f_rotations;
+    int sequence_number;
     int f_num_outputs;
     int f_num_possible_outputs;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetCrtcInfo");
 
     REPLY(reply);
-    f_status = field8(tvb, offsetp, t, hf_x11_randr_GetCrtcInfo_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_randr_GetCrtcInfo_reply_status, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-GetCrtcInfo)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mode = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_mode, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_rotation = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_rotation, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -11450,7 +10684,6 @@ static void randrGetCrtcInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
         proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Reflect_Y, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_rotations = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_rotations, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -11474,32 +10707,18 @@ static void randrGetCrtcInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
 
 static void randrSetCrtcConfig(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_crtc;
-    int f_timestamp;
-    int f_config_timestamp;
-    int f_x;
-    int f_y;
-    int f_mode;
-    int f_rotation;
-    f_crtc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_crtc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_config_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_config_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mode = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_mode, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_rotation = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_rotation, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -11516,23 +10735,18 @@ static void randrSetCrtcConfig(tvbuff_t *tvb, packet_info *pinfo _U_, int *offse
 }
 static void randrSetCrtcConfig_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
-    int f_timestamp;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-SetCrtcConfig");
 
     REPLY(reply);
-    f_status = field8(tvb, offsetp, t, hf_x11_randr_SetCrtcConfig_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_randr_SetCrtcConfig_reply_status, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-SetCrtcConfig)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_reply_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
@@ -11540,15 +10754,12 @@ static void randrSetCrtcConfig_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
 
 static void randrGetCrtcGammaSize(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_crtc;
-    f_crtc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcGammaSize_crtc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrGetCrtcGammaSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_size;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetCrtcGammaSize");
 
@@ -11558,11 +10769,8 @@ static void randrGetCrtcGammaSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-GetCrtcGammaSize)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_size = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcGammaSize_reply_size, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(22);
@@ -11570,14 +10778,12 @@ static void randrGetCrtcGammaSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
 
 static void randrGetCrtcGamma(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_crtc;
-    f_crtc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcGamma_crtc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrGetCrtcGamma_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_size;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetCrtcGamma");
@@ -11588,8 +10794,6 @@ static void randrGetCrtcGamma_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-GetCrtcGamma)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_size = VALUE16(tvb, *offsetp);
@@ -11603,9 +10807,7 @@ static void randrGetCrtcGamma_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
 
 static void randrSetCrtcGamma(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_crtc;
     int f_size;
-    f_crtc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetCrtcGamma_crtc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_size = VALUE16(tvb, *offsetp);
@@ -11622,16 +10824,12 @@ static void randrSetCrtcGamma(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
 
 static void randrGetScreenResourcesCurrent(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResourcesCurrent_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrGetScreenResourcesCurrent_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_timestamp;
-    int f_config_timestamp;
+    int sequence_number;
     int f_num_crtcs;
     int f_num_outputs;
     int f_num_modes;
@@ -11645,14 +10843,10 @@ static void randrGetScreenResourcesCurrent_Reply(tvbuff_t *tvb, packet_info *pin
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-GetScreenResourcesCurrent)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResourcesCurrent_reply_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_config_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetScreenResourcesCurrent_reply_config_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_crtcs = VALUE16(tvb, *offsetp);
@@ -11670,18 +10864,16 @@ static void randrGetScreenResourcesCurrent_Reply(tvbuff_t *tvb, packet_info *pin
     UNUSED(8);
     listOfCard32(tvb, offsetp, t, hf_x11_randr_GetScreenResourcesCurrent_reply_crtcs, hf_x11_randr_GetScreenResourcesCurrent_reply_crtcs_item, f_num_crtcs, byte_order);
     listOfCard32(tvb, offsetp, t, hf_x11_randr_GetScreenResourcesCurrent_reply_outputs, hf_x11_randr_GetScreenResourcesCurrent_reply_outputs_item, f_num_outputs, byte_order);
-    struct_ModeInfo(tvb, offsetp, t, byte_order, f_num_modes);
+    struct_randr_ModeInfo(tvb, offsetp, t, byte_order, f_num_modes);
     listOfByte(tvb, offsetp, t, hf_x11_randr_GetScreenResourcesCurrent_reply_names, f_names_len, byte_order);
 }
 
 static void randrSetCrtcTransform(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_crtc;
     int f_filter_len;
-    f_crtc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetCrtcTransform_crtc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_TRANSFORM(tvb, offsetp, t, byte_order, 1);
+    struct_render_TRANSFORM(tvb, offsetp, t, byte_order, 1);
     f_filter_len = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetCrtcTransform_filter_len, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
@@ -11693,15 +10885,12 @@ static void randrSetCrtcTransform(tvbuff_t *tvb, packet_info *pinfo _U_, int *of
 
 static void randrGetCrtcTransform(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_crtc;
-    f_crtc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcTransform_crtc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrGetCrtcTransform_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_has_transforms;
+    int sequence_number;
     int f_pending_len;
     int f_pending_nparams;
     int f_current_len;
@@ -11715,16 +10904,13 @@ static void randrGetCrtcTransform_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-GetCrtcTransform)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_TRANSFORM(tvb, offsetp, t, byte_order, 1);
-    f_has_transforms = VALUE8(tvb, *offsetp);
+    struct_render_TRANSFORM(tvb, offsetp, t, byte_order, 1);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcTransform_reply_has_transforms, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
-    struct_TRANSFORM(tvb, offsetp, t, byte_order, 1);
+    struct_render_TRANSFORM(tvb, offsetp, t, byte_order, 1);
     UNUSED(4);
     f_pending_len = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetCrtcTransform_reply_pending_len, tvb, *offsetp, 2, byte_order);
@@ -11746,187 +10932,116 @@ static void randrGetCrtcTransform_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
 
 static void randrGetPanning(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_crtc;
-    f_crtc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_crtc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrGetPanning_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
-    int f_timestamp;
-    int f_left;
-    int f_top;
-    int f_width;
-    int f_height;
-    int f_track_left;
-    int f_track_top;
-    int f_track_width;
-    int f_track_height;
-    int f_border_left;
-    int f_border_top;
-    int f_border_right;
-    int f_border_bottom;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPanning");
 
     REPLY(reply);
-    f_status = field8(tvb, offsetp, t, hf_x11_randr_GetPanning_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_randr_GetPanning_reply_status, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-GetPanning)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_left = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_left, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_top = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_top, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_track_left = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_track_left, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_track_top = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_track_top, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_track_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_track_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_track_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_track_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_border_left = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_border_left, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_border_top = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_border_top, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_border_right = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_border_right, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_border_bottom = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_border_bottom, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void randrSetPanning(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_crtc;
-    int f_timestamp;
-    int f_left;
-    int f_top;
-    int f_width;
-    int f_height;
-    int f_track_left;
-    int f_track_top;
-    int f_track_width;
-    int f_track_height;
-    int f_border_left;
-    int f_border_top;
-    int f_border_right;
-    int f_border_bottom;
-    f_crtc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_crtc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_left = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_left, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_top = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_top, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_track_left = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_track_left, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_track_top = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_track_top, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_track_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_track_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_track_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_track_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_border_left = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_border_left, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_border_top = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_border_top, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_border_right = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_border_right, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_border_bottom = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_border_bottom, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void randrSetPanning_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
-    int f_timestamp;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-SetPanning");
 
     REPLY(reply);
-    f_status = field8(tvb, offsetp, t, hf_x11_randr_SetPanning_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_randr_SetPanning_reply_status, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-SetPanning)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetPanning_reply_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void randrSetOutputPrimary(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_output;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetOutputPrimary_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_output = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_SetOutputPrimary_output, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void randrGetOutputPrimary(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputPrimary_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void randrGetOutputPrimary_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_output;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetOutputPrimary");
 
@@ -11936,229 +11051,292 @@ static void randrGetOutputPrimary_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (randr-GetOutputPrimary)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_output = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_randr_GetOutputPrimary_reply_output, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
-static void randrScreenChangeNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
+static void randrGetProviders(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_rotation;
-    int f_timestamp;
-    int f_config_timestamp;
-    int f_root;
-    int f_request_window;
-    int f_sizeID;
-    int f_subpixel_order;
-    int f_width;
-    int f_height;
-    int f_mwidth;
-    int f_mheight;
-    f_rotation = VALUE8(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_randr_GetProviders_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void randrGetProviders_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_num_providers;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-GetProviders");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (randr-GetProviders)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_GetProviders_reply_timestamp, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_providers = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_randr_GetProviders_reply_num_providers, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    UNUSED(18);
+    listOfCard32(tvb, offsetp, t, hf_x11_randr_GetProviders_reply_providers, hf_x11_randr_GetProviders_reply_providers_item, f_num_providers, byte_order);
+}
+
+static void randrGetProviderInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_provider, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_config_timestamp, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void randrGetProviderInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_num_crtcs;
+    int f_num_outputs;
+    int f_num_associated_providers;
+    int f_name_len;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-GetProviderInfo");
+
+    REPLY(reply);
+    proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_status, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (randr-GetProviderInfo)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_timestamp, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
     {
-        proto_item *ti = proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_rotation, tvb, *offsetp, 1, byte_order);
+        proto_item *ti = proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_capabilities, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-        proto_tree_add_item(bitmask_tree, hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_0, tvb, *offsetp, 1, byte_order);
-        proto_tree_add_item(bitmask_tree, hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_90, tvb, *offsetp, 1, byte_order);
-        proto_tree_add_item(bitmask_tree, hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_180, tvb, *offsetp, 1, byte_order);
-        proto_tree_add_item(bitmask_tree, hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_270, tvb, *offsetp, 1, byte_order);
-        proto_tree_add_item(bitmask_tree, hf_x11_randr_ScreenChangeNotify_rotation_mask_Reflect_X, tvb, *offsetp, 1, byte_order);
-        proto_tree_add_item(bitmask_tree, hf_x11_randr_ScreenChangeNotify_rotation_mask_Reflect_Y, tvb, *offsetp, 1, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_randr_GetProviderInfo_reply_capabilities_mask_SourceOutput, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_randr_GetProviderInfo_reply_capabilities_mask_SinkOutput, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_randr_GetProviderInfo_reply_capabilities_mask_SourceOffload, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_randr_GetProviderInfo_reply_capabilities_mask_SinkOffload, tvb, *offsetp, 4, byte_order);
     }
-    *offsetp += 1;
-    CARD16(event_sequencenumber);
-    f_timestamp = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_config_timestamp = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_config_timestamp, tvb, *offsetp, 4, byte_order);
+    f_num_crtcs = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_num_crtcs, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    f_num_outputs = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_num_outputs, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    f_num_associated_providers = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_num_associated_providers, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    f_name_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_randr_GetProviderInfo_reply_name_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    UNUSED(8);
+    listOfCard32(tvb, offsetp, t, hf_x11_randr_GetProviderInfo_reply_crtcs, hf_x11_randr_GetProviderInfo_reply_crtcs_item, f_num_crtcs, byte_order);
+    listOfCard32(tvb, offsetp, t, hf_x11_randr_GetProviderInfo_reply_outputs, hf_x11_randr_GetProviderInfo_reply_outputs_item, f_num_outputs, byte_order);
+    listOfCard32(tvb, offsetp, t, hf_x11_randr_GetProviderInfo_reply_associated_providers, hf_x11_randr_GetProviderInfo_reply_associated_providers_item, f_num_associated_providers, byte_order);
+    listOfCard32(tvb, offsetp, t, hf_x11_randr_GetProviderInfo_reply_associated_capability, hf_x11_randr_GetProviderInfo_reply_associated_capability_item, f_num_associated_providers, byte_order);
+    listOfByte(tvb, offsetp, t, hf_x11_randr_GetProviderInfo_reply_name, f_name_len, byte_order);
+}
+
+static void randrSetProviderOffloadSink(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_randr_SetProviderOffloadSink_provider, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_SetProviderOffloadSink_sink_provider, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_SetProviderOffloadSink_config_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_root = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_root, tvb, *offsetp, 4, byte_order);
+}
+
+static void randrSetProviderOutputSource(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_randr_SetProviderOutputSource_provider, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_request_window = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_request_window, tvb, *offsetp, 4, byte_order);
+    proto_tree_add_item(t, hf_x11_randr_SetProviderOutputSource_source_provider, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_sizeID = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_sizeID, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_subpixel_order = field16(tvb, offsetp, t, hf_x11_randr_ScreenChangeNotify_subpixel_order, byte_order);
-    f_width = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_width, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_height, tvb, *offsetp, 2, byte_order);
+    proto_tree_add_item(t, hf_x11_randr_SetProviderOutputSource_config_timestamp, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+
+static void randrListProviderProperties(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_randr_ListProviderProperties_provider, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void randrListProviderProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_num_atoms;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-ListProviderProperties");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (randr-ListProviderProperties)", sequence_number);
     *offsetp += 2;
-    f_mwidth = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_mwidth, tvb, *offsetp, 2, byte_order);
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_atoms = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_randr_ListProviderProperties_reply_num_atoms, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mheight = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_mheight, tvb, *offsetp, 2, byte_order);
+    UNUSED(22);
+    listOfCard32(tvb, offsetp, t, hf_x11_randr_ListProviderProperties_reply_atoms, hf_x11_randr_ListProviderProperties_reply_atoms_item, f_num_atoms, byte_order);
+}
+
+static void randrQueryProviderProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_randr_QueryProviderProperty_provider, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_QueryProviderProperty_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void randrQueryProviderProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_length;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryProviderProperty");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (randr-QueryProviderProperty)", sequence_number);
     *offsetp += 2;
+    f_length = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_QueryProviderProperty_reply_pending, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    proto_tree_add_item(t, hf_x11_randr_QueryProviderProperty_reply_range, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    proto_tree_add_item(t, hf_x11_randr_QueryProviderProperty_reply_immutable, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(21);
+    listOfInt32(tvb, offsetp, t, hf_x11_randr_QueryProviderProperty_reply_valid_values, hf_x11_randr_QueryProviderProperty_reply_valid_values_item, f_length, byte_order);
 }
 
-static void struct_CrtcChange(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void randrConfigureProviderProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_timestamp;
-	int f_window;
-	int f_crtc;
-	int f_mode;
-	int f_rotation;
-	int f_x;
-	int f_y;
-	int f_width;
-	int f_height;
-
-	item = proto_tree_add_item(root, hf_x11_struct_CrtcChange, tvb, *offsetp, 28, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_timestamp = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CrtcChange_timestamp, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_window = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CrtcChange_window, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_crtc = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CrtcChange_crtc, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_mode = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CrtcChange_mode, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_rotation = VALUE16(tvb, *offsetp);
-	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_CrtcChange_rotation, tvb, *offsetp, 2, byte_order);
-	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_CrtcChange_rotation_mask_Rotate_0, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_CrtcChange_rotation_mask_Rotate_90, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_CrtcChange_rotation_mask_Rotate_180, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_CrtcChange_rotation_mask_Rotate_270, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_CrtcChange_rotation_mask_Reflect_X, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_CrtcChange_rotation_mask_Reflect_Y, tvb, *offsetp, 2, byte_order);
-	}
-	*offsetp += 2;
-	UNUSED(2);
-	f_x = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CrtcChange_x, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_y = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CrtcChange_y, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_width = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CrtcChange_width, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_height = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CrtcChange_height, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-    }
+    proto_tree_add_item(t, hf_x11_randr_ConfigureProviderProperty_provider, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_ConfigureProviderProperty_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_ConfigureProviderProperty_pending, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    proto_tree_add_item(t, hf_x11_randr_ConfigureProviderProperty_range, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(2);
+    listOfInt32(tvb, offsetp, t, hf_x11_randr_ConfigureProviderProperty_values, hf_x11_randr_ConfigureProviderProperty_values_item, (length - 16) / 4, byte_order);
 }
 
-static void struct_OutputChange(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void randrChangeProviderProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_timestamp;
-	int f_config_timestamp;
-	int f_window;
-	int f_output;
-	int f_crtc;
-	int f_mode;
-	int f_rotation;
-	int f_connection;
-	int f_subpixel_order;
-
-	item = proto_tree_add_item(root, hf_x11_struct_OutputChange, tvb, *offsetp, 28, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_timestamp = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_OutputChange_timestamp, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_config_timestamp = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_OutputChange_config_timestamp, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_window = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_OutputChange_window, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_output = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_OutputChange_output, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_crtc = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_OutputChange_crtc, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_mode = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_OutputChange_mode, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_rotation = VALUE16(tvb, *offsetp);
-	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_OutputChange_rotation, tvb, *offsetp, 2, byte_order);
-	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_OutputChange_rotation_mask_Rotate_0, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_OutputChange_rotation_mask_Rotate_90, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_OutputChange_rotation_mask_Rotate_180, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_OutputChange_rotation_mask_Rotate_270, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_OutputChange_rotation_mask_Reflect_X, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_OutputChange_rotation_mask_Reflect_Y, tvb, *offsetp, 2, byte_order);
-	}
-	*offsetp += 2;
-	f_connection = field8(tvb, offsetp, t, hf_x11_struct_OutputChange_connection, byte_order);
-	f_subpixel_order = field8(tvb, offsetp, t, hf_x11_struct_OutputChange_subpixel_order, byte_order);
-    }
+    int f_format;
+    int f_num_items;
+    proto_tree_add_item(t, hf_x11_randr_ChangeProviderProperty_provider, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_ChangeProviderProperty_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_ChangeProviderProperty_type, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_format = VALUE8(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_randr_ChangeProviderProperty_format, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    proto_tree_add_item(t, hf_x11_randr_ChangeProviderProperty_mode, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(2);
+    f_num_items = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_randr_ChangeProviderProperty_num_items, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    listOfByte(tvb, offsetp, t, hf_x11_randr_ChangeProviderProperty_data, (f_num_items * (f_format / 8)), byte_order);
+    length -= (f_num_items * (f_format / 8)) * 1;
 }
 
-static void struct_OutputProperty(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void randrDeleteProviderProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_window;
-	int f_output;
-	int f_atom;
-	int f_timestamp;
-	int f_status;
+    proto_tree_add_item(t, hf_x11_randr_DeleteProviderProperty_provider, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_DeleteProviderProperty_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
 
-	item = proto_tree_add_item(root, hf_x11_struct_OutputProperty, tvb, *offsetp, 28, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_window = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_OutputProperty_window, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_output = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_OutputProperty_output, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_atom = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_OutputProperty_atom, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_timestamp = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_OutputProperty_timestamp, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_status = field8(tvb, offsetp, t, hf_x11_struct_OutputProperty_status, byte_order);
-	UNUSED(11);
-    }
+static void randrGetProviderProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_provider, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_type, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_long_offset, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_long_length, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_delete, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_pending, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(2);
+}
+static void randrGetProviderProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_format;
+    int f_num_items;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-GetProviderProperty");
+
+    REPLY(reply);
+    f_format = VALUE8(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_reply_format, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (randr-GetProviderProperty)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_reply_type, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_reply_bytes_after, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_items = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_randr_GetProviderProperty_reply_num_items, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    UNUSED(12);
+    listOfByte(tvb, offsetp, t, hf_x11_randr_GetProviderProperty_reply_data, (f_num_items * (f_format / 8)), byte_order);
 }
 
-static void struct_NotifyData(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order, int count)
+static void struct_randr_NotifyData(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order, int count)
 {
     int i;
     int base = *offsetp;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	item = proto_tree_add_item(root, hf_x11_union_NotifyData, tvb, base, 28, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_union_randr_NotifyData, tvb, base, 28, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
 
         *offsetp = base;
-	struct_CrtcChange(tvb, offsetp, t, byte_order, 1);
+	struct_randr_CrtcChange(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_OutputChange(tvb, offsetp, t, byte_order, 1);
+	struct_randr_OutputChange(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_OutputProperty(tvb, offsetp, t, byte_order, 1);
+	struct_randr_OutputProperty(tvb, offsetp, t, byte_order, 1);
+        *offsetp = base;
+	struct_randr_ProviderChange(tvb, offsetp, t, byte_order, 1);
+        *offsetp = base;
+	struct_randr_ProviderProperty(tvb, offsetp, t, byte_order, 1);
+        *offsetp = base;
+	struct_randr_ResourceChange(tvb, offsetp, t, byte_order, 1);
         base += 28;
     }
     *offsetp = base;
@@ -12166,11 +11344,11 @@ static void struct_NotifyData(tvbuff_t *tvb, int *offsetp, proto_tree *root, gui
 
 static void randrNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_subCode;
-    f_subCode = field8(tvb, offsetp, t, hf_x11_randr_Notify_subCode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_randr_Notify_subCode, byte_order);
     CARD16(event_sequencenumber);
-    struct_NotifyData(tvb, offsetp, t, byte_order, 1);
+    struct_randr_NotifyData(tvb, offsetp, t, byte_order, 1);
 }
+
 static const value_string randr_extension_minor[] = {
     { 0, "QueryVersion" },
     { 2, "SetScreenConfig" },
@@ -12202,10 +11380,19 @@ static const value_string randr_extension_minor[] = {
     { 29, "SetPanning" },
     { 30, "SetOutputPrimary" },
     { 31, "GetOutputPrimary" },
+    { 32, "GetProviders" },
+    { 33, "GetProviderInfo" },
+    { 34, "SetProviderOffloadSink" },
+    { 35, "SetProviderOutputSource" },
+    { 36, "ListProviderProperties" },
+    { 37, "QueryProviderProperty" },
+    { 38, "ConfigureProviderProperty" },
+    { 39, "ChangeProviderProperty" },
+    { 40, "DeleteProviderProperty" },
+    { 41, "GetProviderProperty" },
     { 0, NULL }
 };
 const x11_event_info randr_events[] = {
-    { "randr-ScreenChangeNotify", randrScreenChangeNotify },
     { "randr-Notify", randrNotify },
     { NULL, NULL }
 };
@@ -12229,6 +11416,11 @@ static x11_reply_info randr_replies[] = {
     { 28, randrGetPanning_Reply },
     { 29, randrSetPanning_Reply },
     { 31, randrGetOutputPrimary_Reply },
+    { 32, randrGetProviders_Reply },
+    { 33, randrGetProviderInfo_Reply },
+    { 36, randrListProviderProperties_Reply },
+    { 37, randrQueryProviderProperty_Reply },
+    { 41, randrGetProviderProperty_Reply },
     { 0, NULL }
 };
 
@@ -12332,6 +11524,36 @@ static void dispatch_randr(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
     case 31:
 	randrGetOutputPrimary(tvb, pinfo, offsetp, t, byte_order, length);
 	break;
+    case 32:
+	randrGetProviders(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 33:
+	randrGetProviderInfo(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 34:
+	randrSetProviderOffloadSink(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 35:
+	randrSetProviderOutputSource(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 36:
+	randrListProviderProperties(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 37:
+	randrQueryProviderProperty(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 38:
+	randrConfigureProviderProperty(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 39:
+	randrChangeProviderProperty(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 40:
+	randrDeleteProviderProperty(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 41:
+	randrGetProviderProperty(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
     /* No need for a default case here, since Unknown is printed above,
        and UNDECODED() is taken care of by dissect_x11_request */
     }
@@ -12339,91 +11561,79 @@ static void dispatch_randr(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
 
 static void register_randr(void)
 {
-    set_handler("RANDR", dispatch_randr, randr_errors, randr_events, randr_replies);
+    set_handler("RANDR", dispatch_randr, randr_errors, randr_events, NULL, randr_replies);
 }
 
-static void struct_Range8(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_record_Range8(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_first;
-	int f_last;
 
-	item = proto_tree_add_item(root, hf_x11_struct_Range8, tvb, *offsetp, 2, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_record_Range8, tvb, *offsetp, 2, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_first = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Range8_first, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_record_Range8_first, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_last = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Range8_last, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_record_Range8_last, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
     }
 }
 
-static void struct_Range16(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_record_Range16(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_first;
-	int f_last;
 
-	item = proto_tree_add_item(root, hf_x11_struct_Range16, tvb, *offsetp, 4, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_record_Range16, tvb, *offsetp, 4, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_first = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Range16_first, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_record_Range16_first, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_last = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Range16_last, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_record_Range16_last, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
     }
 }
 
-static void struct_ExtRange(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_record_ExtRange(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
 
-	item = proto_tree_add_item(root, hf_x11_struct_ExtRange, tvb, *offsetp, 6, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_record_ExtRange, tvb, *offsetp, 6, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	struct_Range8(tvb, offsetp, t, byte_order, 1);
-	struct_Range16(tvb, offsetp, t, byte_order, 1);
+	struct_record_Range8(tvb, offsetp, t, byte_order, 1);
+	struct_record_Range16(tvb, offsetp, t, byte_order, 1);
     }
 }
 
-static void struct_Range(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_record_Range(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_client_started;
-	int f_client_died;
 
-	item = proto_tree_add_item(root, hf_x11_struct_Range, tvb, *offsetp, 24, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_record_Range, tvb, *offsetp, 24, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	struct_Range8(tvb, offsetp, t, byte_order, 1);
-	struct_Range8(tvb, offsetp, t, byte_order, 1);
-	struct_ExtRange(tvb, offsetp, t, byte_order, 1);
-	struct_ExtRange(tvb, offsetp, t, byte_order, 1);
-	struct_Range8(tvb, offsetp, t, byte_order, 1);
-	struct_Range8(tvb, offsetp, t, byte_order, 1);
-	struct_Range8(tvb, offsetp, t, byte_order, 1);
-	f_client_started = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Range_client_started, tvb, *offsetp, 1, byte_order);
+	struct_record_Range8(tvb, offsetp, t, byte_order, 1);
+	struct_record_Range8(tvb, offsetp, t, byte_order, 1);
+	struct_record_ExtRange(tvb, offsetp, t, byte_order, 1);
+	struct_record_ExtRange(tvb, offsetp, t, byte_order, 1);
+	struct_record_Range8(tvb, offsetp, t, byte_order, 1);
+	struct_record_Range8(tvb, offsetp, t, byte_order, 1);
+	struct_record_Range8(tvb, offsetp, t, byte_order, 1);
+	proto_tree_add_item(t, hf_x11_struct_record_Range_client_started, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_client_died = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Range_client_died, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_record_Range_client_died, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
     }
 }
 
-static int struct_size_ClientInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_record_ClientInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_num_ranges;
@@ -12432,43 +11642,35 @@ static int struct_size_ClientInfo(tvbuff_t *tvb, int *offsetp, guint byte_order
     return size + 8;
 }
 
-static void struct_ClientInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_record_ClientInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_client_resource;
 	int f_num_ranges;
 
-	item = proto_tree_add_item(root, hf_x11_struct_ClientInfo, tvb, *offsetp, struct_size_ClientInfo(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_record_ClientInfo, tvb, *offsetp, struct_size_record_ClientInfo(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_client_resource = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ClientInfo_client_resource, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_record_ClientInfo_client_resource, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
 	f_num_ranges = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ClientInfo_num_ranges, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_record_ClientInfo_num_ranges, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	struct_Range(tvb, offsetp, t, byte_order, f_num_ranges);
+	struct_record_Range(tvb, offsetp, t, byte_order, f_num_ranges);
     }
 }
 
 static void recordQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_major_version;
-    int f_minor_version;
-    f_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_QueryVersion_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_QueryVersion_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void recordQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -12478,28 +11680,20 @@ static void recordQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (record-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_QueryVersion_reply_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_QueryVersion_reply_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void recordCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    int f_element_header;
     int f_num_client_specs;
     int f_num_ranges;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_CreateContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_element_header = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_CreateContext_element_header, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -12511,20 +11705,16 @@ static void recordCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_record_CreateContext_client_specs, hf_x11_record_CreateContext_client_specs_item, f_num_client_specs, byte_order);
     length -= f_num_client_specs * 4;
-    struct_Range(tvb, offsetp, t, byte_order, f_num_ranges);
+    struct_record_Range(tvb, offsetp, t, byte_order, f_num_ranges);
     length -= f_num_ranges * 24;
 }
 
 static void recordRegisterClients(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    int f_element_header;
     int f_num_client_specs;
     int f_num_ranges;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_RegisterClients_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_element_header = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_RegisterClients_element_header, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -12536,15 +11726,13 @@ static void recordRegisterClients(tvbuff_t *tvb, packet_info *pinfo _U_, int *of
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_record_RegisterClients_client_specs, hf_x11_record_RegisterClients_client_specs_item, f_num_client_specs, byte_order);
     length -= f_num_client_specs * 4;
-    struct_Range(tvb, offsetp, t, byte_order, f_num_ranges);
+    struct_record_Range(tvb, offsetp, t, byte_order, f_num_ranges);
     length -= f_num_ranges * 24;
 }
 
 static void recordUnregisterClients(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
     int f_num_client_specs;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_UnregisterClients_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_client_specs = VALUE32(tvb, *offsetp);
@@ -12556,33 +11744,25 @@ static void recordUnregisterClients(tvbuff_t *tvb, packet_info *pinfo _U_, int *
 
 static void recordGetContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_GetContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void recordGetContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_enabled;
-    int f_element_header;
+    int sequence_number;
     int f_num_intercepted_clients;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetContext");
 
     REPLY(reply);
-    f_enabled = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_GetContext_reply_enabled, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (record-GetContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_element_header = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_GetContext_reply_element_header, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -12590,30 +11770,22 @@ static void recordGetContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_item(t, hf_x11_record_GetContext_reply_num_intercepted_clients, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(16);
-    struct_ClientInfo(tvb, offsetp, t, byte_order, f_num_intercepted_clients);
+    struct_record_ClientInfo(tvb, offsetp, t, byte_order, f_num_intercepted_clients);
 }
 
 static void recordEnableContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_EnableContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void recordEnableContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_category;
-    int f_element_header;
-    int f_client_swapped;
-    int f_xid_base;
-    int f_server_time;
-    int f_rec_sequence_num;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-EnableContext");
 
     REPLY(reply);
-    f_category = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_EnableContext_reply_category, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
@@ -12621,23 +11793,17 @@ static void recordEnableContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
             "sequencenumber: %d (record-EnableContext)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_element_header = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_EnableContext_reply_element_header, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_client_swapped = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_EnableContext_reply_client_swapped, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(2);
-    f_xid_base = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_EnableContext_reply_xid_base, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_server_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_EnableContext_reply_server_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_rec_sequence_num = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_EnableContext_reply_rec_sequence_num, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(8);
@@ -12646,16 +11812,12 @@ static void recordEnableContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
 
 static void recordDisableContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_DisableContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void recordFreeContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_record_FreeContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
@@ -12721,25 +11883,19 @@ static void dispatch_record(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
 
 static void register_record(void)
 {
-    set_handler("RECORD", dispatch_record, record_errors, record_events, record_replies);
+    set_handler("RECORD", dispatch_record, record_errors, record_events, NULL, record_replies);
 }
 
 static void renderQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_client_major_version;
-    int f_client_minor_version;
-    f_client_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_QueryVersion_client_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_client_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_QueryVersion_client_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void renderQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -12749,14 +11905,10 @@ static void renderQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (render-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_QueryVersion_reply_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_QueryVersion_reply_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(16);
@@ -12767,11 +11919,9 @@ static void renderQueryPictFormats(tvbuff_t *tvb _U_, packet_info *pinfo _U_, in
 }
 static void renderQueryPictFormats_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_formats;
     int f_num_screens;
-    int f_num_depths;
-    int f_num_visuals;
     int f_num_subpixel;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryPictFormats");
@@ -12782,8 +11932,6 @@ static void renderQueryPictFormats_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (render-QueryPictFormats)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_formats = VALUE32(tvb, *offsetp);
@@ -12792,31 +11940,27 @@ static void renderQueryPictFormats_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     f_num_screens = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_QueryPictFormats_reply_num_screens, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_depths = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_QueryPictFormats_reply_num_depths, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_visuals = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_QueryPictFormats_reply_num_visuals, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_subpixel = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_QueryPictFormats_reply_num_subpixel, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
-    struct_PICTFORMINFO(tvb, offsetp, t, byte_order, f_num_formats);
-    struct_PICTSCREEN(tvb, offsetp, t, byte_order, f_num_screens);
+    struct_render_PICTFORMINFO(tvb, offsetp, t, byte_order, f_num_formats);
+    struct_render_PICTSCREEN(tvb, offsetp, t, byte_order, f_num_screens);
     listOfCard32(tvb, offsetp, t, hf_x11_render_QueryPictFormats_reply_subpixels, hf_x11_render_QueryPictFormats_reply_subpixels_item, f_num_subpixel, byte_order);
 }
 
 static void renderQueryPictIndexValues(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_format;
-    f_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_QueryPictIndexValues_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void renderQueryPictIndexValues_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_values;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryPictIndexValues");
@@ -12827,264 +11971,168 @@ static void renderQueryPictIndexValues_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (render-QueryPictIndexValues)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_values = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_QueryPictIndexValues_reply_num_values, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_INDEXVALUE(tvb, offsetp, t, byte_order, f_num_values);
+    struct_render_INDEXVALUE(tvb, offsetp, t, byte_order, f_num_values);
 }
 
 static void renderCreatePicture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_pid;
-    int f_drawable;
-    int f_format;
-    f_pid = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreatePicture_pid, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreatePicture_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreatePicture_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void renderChangePicture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_picture;
-    f_picture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_ChangePicture_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void renderSetPictureClipRectangles(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_picture;
-    int f_clip_x_origin;
-    int f_clip_y_origin;
-    f_picture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_SetPictureClipRectangles_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_clip_x_origin = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_SetPictureClipRectangles_clip_x_origin, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_clip_y_origin = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_SetPictureClipRectangles_clip_y_origin, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    struct_RECTANGLE(tvb, offsetp, t, byte_order, (length - 12) / 8);
+    struct_xproto_RECTANGLE(tvb, offsetp, t, byte_order, (length - 12) / 8);
 }
 
 static void renderFreePicture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_picture;
-    f_picture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_FreePicture_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void renderComposite(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_op;
-    int f_src;
-    int f_mask;
-    int f_dst;
-    int f_src_x;
-    int f_src_y;
-    int f_mask_x;
-    int f_mask_y;
-    int f_dst_x;
-    int f_dst_y;
-    int f_width;
-    int f_height;
-    f_op = field8(tvb, offsetp, t, hf_x11_render_Composite_op, byte_order);
+    field8(tvb, offsetp, t, hf_x11_render_Composite_op, byte_order);
     UNUSED(3);
-    f_src = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Composite_src, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mask = field32(tvb, offsetp, t, hf_x11_render_Composite_mask, byte_order);
-    f_dst = VALUE32(tvb, *offsetp);
+    field32(tvb, offsetp, t, hf_x11_render_Composite_mask, byte_order);
     proto_tree_add_item(t, hf_x11_render_Composite_dst, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_src_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Composite_src_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Composite_src_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mask_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Composite_mask_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mask_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Composite_mask_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_dst_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Composite_dst_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_dst_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Composite_dst_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Composite_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Composite_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void renderTrapezoids(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_op;
-    int f_src;
-    int f_dst;
-    int f_mask_format;
-    int f_src_x;
-    int f_src_y;
-    f_op = field8(tvb, offsetp, t, hf_x11_render_Trapezoids_op, byte_order);
+    field8(tvb, offsetp, t, hf_x11_render_Trapezoids_op, byte_order);
     UNUSED(3);
-    f_src = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Trapezoids_src, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dst = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Trapezoids_dst, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mask_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Trapezoids_mask_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_src_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Trapezoids_src_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Trapezoids_src_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    struct_TRAPEZOID(tvb, offsetp, t, byte_order, (length - 24) / 40);
+    struct_render_TRAPEZOID(tvb, offsetp, t, byte_order, (length - 24) / 40);
 }
 
 static void renderTriangles(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_op;
-    int f_src;
-    int f_dst;
-    int f_mask_format;
-    int f_src_x;
-    int f_src_y;
-    f_op = field8(tvb, offsetp, t, hf_x11_render_Triangles_op, byte_order);
+    field8(tvb, offsetp, t, hf_x11_render_Triangles_op, byte_order);
     UNUSED(3);
-    f_src = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Triangles_src, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dst = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Triangles_dst, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mask_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Triangles_mask_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_src_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Triangles_src_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_Triangles_src_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    struct_TRIANGLE(tvb, offsetp, t, byte_order, (length - 24) / 24);
+    struct_render_TRIANGLE(tvb, offsetp, t, byte_order, (length - 24) / 24);
 }
 
 static void renderTriStrip(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_op;
-    int f_src;
-    int f_dst;
-    int f_mask_format;
-    int f_src_x;
-    int f_src_y;
-    f_op = field8(tvb, offsetp, t, hf_x11_render_TriStrip_op, byte_order);
+    field8(tvb, offsetp, t, hf_x11_render_TriStrip_op, byte_order);
     UNUSED(3);
-    f_src = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_TriStrip_src, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dst = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_TriStrip_dst, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mask_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_TriStrip_mask_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_src_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_TriStrip_src_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_TriStrip_src_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    struct_POINTFIX(tvb, offsetp, t, byte_order, (length - 24) / 8);
+    struct_render_POINTFIX(tvb, offsetp, t, byte_order, (length - 24) / 8);
 }
 
 static void renderTriFan(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_op;
-    int f_src;
-    int f_dst;
-    int f_mask_format;
-    int f_src_x;
-    int f_src_y;
-    f_op = field8(tvb, offsetp, t, hf_x11_render_TriFan_op, byte_order);
+    field8(tvb, offsetp, t, hf_x11_render_TriFan_op, byte_order);
     UNUSED(3);
-    f_src = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_TriFan_src, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dst = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_TriFan_dst, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mask_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_TriFan_mask_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_src_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_TriFan_src_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_TriFan_src_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    struct_POINTFIX(tvb, offsetp, t, byte_order, (length - 24) / 8);
+    struct_render_POINTFIX(tvb, offsetp, t, byte_order, (length - 24) / 8);
 }
 
 static void renderCreateGlyphSet(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_gsid;
-    int f_format;
-    f_gsid = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateGlyphSet_gsid, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateGlyphSet_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void renderReferenceGlyphSet(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_gsid;
-    int f_existing;
-    f_gsid = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_ReferenceGlyphSet_gsid, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_existing = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_ReferenceGlyphSet_existing, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void renderFreeGlyphSet(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_glyphset;
-    f_glyphset = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_FreeGlyphSet_glyphset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void renderAddGlyphs(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_glyphset;
     int f_glyphs_len;
-    f_glyphset = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_AddGlyphs_glyphset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_glyphs_len = VALUE32(tvb, *offsetp);
@@ -13092,15 +12140,13 @@ static void renderAddGlyphs(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_render_AddGlyphs_glyphids, hf_x11_render_AddGlyphs_glyphids_item, f_glyphs_len, byte_order);
     length -= f_glyphs_len * 4;
-    struct_GLYPHINFO(tvb, offsetp, t, byte_order, f_glyphs_len);
+    struct_render_GLYPHINFO(tvb, offsetp, t, byte_order, f_glyphs_len);
     length -= f_glyphs_len * 12;
     listOfByte(tvb, offsetp, t, hf_x11_render_AddGlyphs_data, (length - 12) / 1, byte_order);
 }
 
 static void renderFreeGlyphs(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_glyphset;
-    f_glyphset = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_FreeGlyphs_glyphset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfCard32(tvb, offsetp, t, hf_x11_render_FreeGlyphs_glyphs, hf_x11_render_FreeGlyphs_glyphs_item, (length - 8) / 4, byte_order);
@@ -13108,31 +12154,18 @@ static void renderFreeGlyphs(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
 
 static void renderCompositeGlyphs8(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_op;
-    int f_src;
-    int f_dst;
-    int f_mask_format;
-    int f_glyphset;
-    int f_src_x;
-    int f_src_y;
-    f_op = field8(tvb, offsetp, t, hf_x11_render_CompositeGlyphs8_op, byte_order);
+    field8(tvb, offsetp, t, hf_x11_render_CompositeGlyphs8_op, byte_order);
     UNUSED(3);
-    f_src = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs8_src, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dst = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs8_dst, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mask_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs8_mask_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_glyphset = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs8_glyphset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_src_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs8_src_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs8_src_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfByte(tvb, offsetp, t, hf_x11_render_CompositeGlyphs8_glyphcmds, (length - 28) / 1, byte_order);
@@ -13140,31 +12173,18 @@ static void renderCompositeGlyphs8(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
 
 static void renderCompositeGlyphs16(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_op;
-    int f_src;
-    int f_dst;
-    int f_mask_format;
-    int f_glyphset;
-    int f_src_x;
-    int f_src_y;
-    f_op = field8(tvb, offsetp, t, hf_x11_render_CompositeGlyphs16_op, byte_order);
+    field8(tvb, offsetp, t, hf_x11_render_CompositeGlyphs16_op, byte_order);
     UNUSED(3);
-    f_src = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs16_src, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dst = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs16_dst, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mask_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs16_mask_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_glyphset = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs16_glyphset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_src_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs16_src_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs16_src_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfByte(tvb, offsetp, t, hf_x11_render_CompositeGlyphs16_glyphcmds, (length - 28) / 1, byte_order);
@@ -13172,31 +12192,18 @@ static void renderCompositeGlyphs16(tvbuff_t *tvb, packet_info *pinfo _U_, int *
 
 static void renderCompositeGlyphs32(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_op;
-    int f_src;
-    int f_dst;
-    int f_mask_format;
-    int f_glyphset;
-    int f_src_x;
-    int f_src_y;
-    f_op = field8(tvb, offsetp, t, hf_x11_render_CompositeGlyphs32_op, byte_order);
+    field8(tvb, offsetp, t, hf_x11_render_CompositeGlyphs32_op, byte_order);
     UNUSED(3);
-    f_src = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs32_src, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dst = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs32_dst, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mask_format = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs32_mask_format, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_glyphset = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs32_glyphset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_src_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs32_src_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CompositeGlyphs32_src_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfByte(tvb, offsetp, t, hf_x11_render_CompositeGlyphs32_glyphcmds, (length - 28) / 1, byte_order);
@@ -13204,56 +12211,41 @@ static void renderCompositeGlyphs32(tvbuff_t *tvb, packet_info *pinfo _U_, int *
 
 static void renderFillRectangles(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_op;
-    int f_dst;
-    f_op = field8(tvb, offsetp, t, hf_x11_render_FillRectangles_op, byte_order);
+    field8(tvb, offsetp, t, hf_x11_render_FillRectangles_op, byte_order);
     UNUSED(3);
-    f_dst = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_FillRectangles_dst, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_COLOR(tvb, offsetp, t, byte_order, 1);
-    struct_RECTANGLE(tvb, offsetp, t, byte_order, (length - 20) / 8);
+    struct_render_COLOR(tvb, offsetp, t, byte_order, 1);
+    struct_xproto_RECTANGLE(tvb, offsetp, t, byte_order, (length - 20) / 8);
 }
 
 static void renderCreateCursor(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_cid;
-    int f_source;
-    int f_x;
-    int f_y;
-    f_cid = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateCursor_cid, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_source = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateCursor_source, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateCursor_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateCursor_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void renderSetPictureTransform(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_picture;
-    f_picture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_SetPictureTransform_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_TRANSFORM(tvb, offsetp, t, byte_order, 1);
+    struct_render_TRANSFORM(tvb, offsetp, t, byte_order, 1);
 }
 
 static void renderQueryFilters(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_QueryFilters_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void renderQueryFilters_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_aliases;
     int f_num_filters;
 
@@ -13265,8 +12257,6 @@ static void renderQueryFilters_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (render-QueryFilters)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_aliases = VALUE32(tvb, *offsetp);
@@ -13277,14 +12267,12 @@ static void renderQueryFilters_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     *offsetp += 4;
     UNUSED(16);
     listOfCard16(tvb, offsetp, t, hf_x11_render_QueryFilters_reply_aliases, hf_x11_render_QueryFilters_reply_aliases_item, f_num_aliases, byte_order);
-    struct_STR(tvb, offsetp, t, byte_order, f_num_filters);
+    struct_xproto_STR(tvb, offsetp, t, byte_order, f_num_filters);
 }
 
 static void renderSetPictureFilter(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_picture;
     int f_filter_len;
-    f_picture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_SetPictureFilter_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_filter_len = VALUE16(tvb, *offsetp);
@@ -13298,72 +12286,54 @@ static void renderSetPictureFilter(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
 
 static void renderCreateAnimCursor(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_cid;
-    f_cid = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateAnimCursor_cid, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_ANIMCURSORELT(tvb, offsetp, t, byte_order, (length - 8) / 8);
+    struct_render_ANIMCURSORELT(tvb, offsetp, t, byte_order, (length - 8) / 8);
 }
 
 static void renderAddTraps(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_picture;
-    int f_x_off;
-    int f_y_off;
-    f_picture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_AddTraps_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x_off = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_AddTraps_x_off, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y_off = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_AddTraps_y_off, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    struct_TRAP(tvb, offsetp, t, byte_order, (length - 12) / 24);
+    struct_render_TRAP(tvb, offsetp, t, byte_order, (length - 12) / 24);
 }
 
 static void renderCreateSolidFill(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_picture;
-    f_picture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateSolidFill_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_COLOR(tvb, offsetp, t, byte_order, 1);
+    struct_render_COLOR(tvb, offsetp, t, byte_order, 1);
 }
 
 static void renderCreateLinearGradient(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_picture;
     int f_num_stops;
-    f_picture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateLinearGradient_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_POINTFIX(tvb, offsetp, t, byte_order, 1);
-    struct_POINTFIX(tvb, offsetp, t, byte_order, 1);
+    struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
+    struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
     f_num_stops = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateLinearGradient_num_stops, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfInt32(tvb, offsetp, t, hf_x11_render_CreateLinearGradient_stops, hf_x11_render_CreateLinearGradient_stops_item, f_num_stops, byte_order);
     length -= f_num_stops * 4;
-    struct_COLOR(tvb, offsetp, t, byte_order, f_num_stops);
+    struct_render_COLOR(tvb, offsetp, t, byte_order, f_num_stops);
     length -= f_num_stops * 8;
 }
 
 static void renderCreateRadialGradient(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_picture;
-    int f_inner_radius;
-    int f_outer_radius;
     int f_num_stops;
-    f_picture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateRadialGradient_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_POINTFIX(tvb, offsetp, t, byte_order, 1);
-    struct_POINTFIX(tvb, offsetp, t, byte_order, 1);
-    f_inner_radius = VALUE32(tvb, *offsetp);
+    struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
+    struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
     proto_tree_add_item(t, hf_x11_render_CreateRadialGradient_inner_radius, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_outer_radius = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateRadialGradient_outer_radius, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_stops = VALUE32(tvb, *offsetp);
@@ -13371,20 +12341,16 @@ static void renderCreateRadialGradient(tvbuff_t *tvb, packet_info *pinfo _U_, in
     *offsetp += 4;
     listOfInt32(tvb, offsetp, t, hf_x11_render_CreateRadialGradient_stops, hf_x11_render_CreateRadialGradient_stops_item, f_num_stops, byte_order);
     length -= f_num_stops * 4;
-    struct_COLOR(tvb, offsetp, t, byte_order, f_num_stops);
+    struct_render_COLOR(tvb, offsetp, t, byte_order, f_num_stops);
     length -= f_num_stops * 8;
 }
 
 static void renderCreateConicalGradient(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_picture;
-    int f_angle;
     int f_num_stops;
-    f_picture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_render_CreateConicalGradient_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_POINTFIX(tvb, offsetp, t, byte_order, 1);
-    f_angle = VALUE32(tvb, *offsetp);
+    struct_render_POINTFIX(tvb, offsetp, t, byte_order, 1);
     proto_tree_add_item(t, hf_x11_render_CreateConicalGradient_angle, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_stops = VALUE32(tvb, *offsetp);
@@ -13392,7 +12358,7 @@ static void renderCreateConicalGradient(tvbuff_t *tvb, packet_info *pinfo _U_, i
     *offsetp += 4;
     listOfInt32(tvb, offsetp, t, hf_x11_render_CreateConicalGradient_stops, hf_x11_render_CreateConicalGradient_stops_item, f_num_stops, byte_order);
     length -= f_num_stops * 4;
-    struct_COLOR(tvb, offsetp, t, byte_order, f_num_stops);
+    struct_render_COLOR(tvb, offsetp, t, byte_order, f_num_stops);
     length -= f_num_stops * 8;
 }
 static const value_string render_extension_minor[] = {
@@ -13550,65 +12516,161 @@ static void dispatch_render(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
 
 static void register_render(void)
 {
-    set_handler("RENDER", dispatch_render, render_errors, render_events, render_replies);
+    set_handler("RENDER", dispatch_render, render_errors, render_events, NULL, render_replies);
+}
+
+static void struct_res_Client(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_res_Client, tvb, *offsetp, 8, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_res_Client_resource_base, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_res_Client_resource_mask, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+    }
+}
+
+static void struct_res_Type(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_res_Type, tvb, *offsetp, 8, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_res_Type_resource_type, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_res_Type_count, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+    }
+}
+
+static void struct_res_ClientIdSpec(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_res_ClientIdSpec, tvb, *offsetp, 8, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_res_ClientIdSpec_client, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	{
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_res_ClientIdSpec_mask, tvb, *offsetp, 4, byte_order);
+	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_res_ClientIdSpec_mask_mask_ClientXID, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_res_ClientIdSpec_mask_mask_LocalClientPID, tvb, *offsetp, 4, byte_order);
+	}
+	*offsetp += 4;
+    }
+}
+
+static int struct_size_res_ClientIdValue(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+{
+    int size = 0;
+    int f_length;
+    f_length = VALUE32(tvb, *offsetp + size + 8);
+    size += f_length * 4;
+    return size + 12;
 }
 
-static void struct_Client(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_res_ClientIdValue(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_resource_base;
-	int f_resource_mask;
+	int f_length;
 
-	item = proto_tree_add_item(root, hf_x11_struct_Client, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_res_ClientIdValue, tvb, *offsetp, struct_size_res_ClientIdValue(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_resource_base = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Client_resource_base, tvb, *offsetp, 4, byte_order);
+	struct_res_ClientIdSpec(tvb, offsetp, t, byte_order, 1);
+	f_length = VALUE32(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_res_ClientIdValue_length, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_resource_mask = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Client_resource_mask, tvb, *offsetp, 4, byte_order);
+	listOfCard32(tvb, offsetp, t, hf_x11_struct_res_ClientIdValue_value, hf_x11_struct_res_ClientIdValue_value_item, f_length, byte_order);
+    }
+}
+
+static void struct_res_ResourceIdSpec(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_res_ResourceIdSpec, tvb, *offsetp, 8, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_res_ResourceIdSpec_resource, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_res_ResourceIdSpec_type, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
     }
 }
 
-static void struct_Type(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_res_ResourceSizeSpec(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_resource_type;
-	int f_count;
 
-	item = proto_tree_add_item(root, hf_x11_struct_Type, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_res_ResourceSizeSpec, tvb, *offsetp, 20, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_resource_type = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Type_resource_type, tvb, *offsetp, 4, byte_order);
+	struct_res_ResourceIdSpec(tvb, offsetp, t, byte_order, 1);
+	proto_tree_add_item(t, hf_x11_struct_res_ResourceSizeSpec_bytes, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_res_ResourceSizeSpec_ref_count, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_res_ResourceSizeSpec_use_count, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_count = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Type_count, tvb, *offsetp, 4, byte_order);
+    }
+}
+
+static int struct_size_res_ResourceSizeValue(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+{
+    int size = 0;
+    int f_num_cross_references;
+    f_num_cross_references = VALUE32(tvb, *offsetp + size + 20);
+    size += f_num_cross_references * 20;
+    return size + 24;
+}
+
+static void struct_res_ResourceSizeValue(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+	int f_num_cross_references;
+
+	item = proto_tree_add_item(root, hf_x11_struct_res_ResourceSizeValue, tvb, *offsetp, struct_size_res_ResourceSizeValue(tvb, offsetp, byte_order), ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	struct_res_ResourceSizeSpec(tvb, offsetp, t, byte_order, 1);
+	f_num_cross_references = VALUE32(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_res_ResourceSizeValue_num_cross_references, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
+	struct_res_ResourceSizeSpec(tvb, offsetp, t, byte_order, f_num_cross_references);
     }
 }
 
 static void resQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_client_major;
-    int f_client_minor;
-    f_client_major = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_res_QueryVersion_client_major, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_client_minor = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_res_QueryVersion_client_minor, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void resQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_server_major;
-    int f_server_minor;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -13618,14 +12680,10 @@ static void resQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (res-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_server_major = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_res_QueryVersion_reply_server_major, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_server_minor = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_res_QueryVersion_reply_server_minor, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
@@ -13635,7 +12693,7 @@ static void resQueryClients(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offs
 }
 static void resQueryClients_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_clients;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryClients");
@@ -13646,27 +12704,23 @@ static void resQueryClients_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (res-QueryClients)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_clients = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_res_QueryClients_reply_num_clients, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_Client(tvb, offsetp, t, byte_order, f_num_clients);
+    struct_res_Client(tvb, offsetp, t, byte_order, f_num_clients);
 }
 
 static void resQueryClientResources(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_xid;
-    f_xid = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_res_QueryClientResources_xid, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void resQueryClientResources_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_types;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryClientResources");
@@ -13677,29 +12731,23 @@ static void resQueryClientResources_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (res-QueryClientResources)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_types = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_res_QueryClientResources_reply_num_types, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_Type(tvb, offsetp, t, byte_order, f_num_types);
+    struct_res_Type(tvb, offsetp, t, byte_order, f_num_types);
 }
 
 static void resQueryClientPixmapBytes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_xid;
-    f_xid = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_res_QueryClientPixmapBytes_xid, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void resQueryClientPixmapBytes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_bytes;
-    int f_bytes_overflow;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryClientPixmapBytes");
 
@@ -13709,22 +12757,84 @@ static void resQueryClientPixmapBytes_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (res-QueryClientPixmapBytes)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_bytes = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_res_QueryClientPixmapBytes_reply_bytes, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_bytes_overflow = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_res_QueryClientPixmapBytes_reply_bytes_overflow, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
+
+static void resQueryClientIds(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    int f_num_specs;
+    f_num_specs = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_res_QueryClientIds_num_specs, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    struct_res_ClientIdSpec(tvb, offsetp, t, byte_order, f_num_specs);
+    length -= f_num_specs * 8;
+}
+static void resQueryClientIds_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_num_ids;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryClientIds");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (res-QueryClientIds)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_ids = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_res_QueryClientIds_reply_num_ids, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    UNUSED(20);
+    struct_res_ClientIdValue(tvb, offsetp, t, byte_order, f_num_ids);
+}
+
+static void resQueryResourceBytes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    int f_num_specs;
+    proto_tree_add_item(t, hf_x11_res_QueryResourceBytes_client, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_specs = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_res_QueryResourceBytes_num_specs, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    struct_res_ResourceIdSpec(tvb, offsetp, t, byte_order, f_num_specs);
+    length -= f_num_specs * 8;
+}
+static void resQueryResourceBytes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_num_sizes;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryResourceBytes");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (res-QueryResourceBytes)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_sizes = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_res_QueryResourceBytes_reply_num_sizes, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    UNUSED(20);
+    struct_res_ResourceSizeValue(tvb, offsetp, t, byte_order, f_num_sizes);
+}
 static const value_string res_extension_minor[] = {
     { 0, "QueryVersion" },
     { 1, "QueryClients" },
     { 2, "QueryClientResources" },
     { 3, "QueryClientPixmapBytes" },
+    { 4, "QueryClientIds" },
+    { 5, "QueryResourceBytes" },
     { 0, NULL }
 };
 const x11_event_info res_events[] = {
@@ -13735,6 +12845,8 @@ static x11_reply_info res_replies[] = {
     { 1, resQueryClients_Reply },
     { 2, resQueryClientResources_Reply },
     { 3, resQueryClientPixmapBytes_Reply },
+    { 4, resQueryClientIds_Reply },
+    { 5, resQueryResourceBytes_Reply },
     { 0, NULL }
 };
 
@@ -13760,6 +12872,12 @@ static void dispatch_res(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_
     case 3:
 	resQueryClientPixmapBytes(tvb, pinfo, offsetp, t, byte_order, length);
 	break;
+    case 4:
+	resQueryClientIds(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 5:
+	resQueryResourceBytes(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
     /* No need for a default case here, since Unknown is printed above,
        and UNDECODED() is taken care of by dissect_x11_request */
     }
@@ -13767,26 +12885,20 @@ static void dispatch_res(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_
 
 static void register_res(void)
 {
-    set_handler("X-Resource", dispatch_res, res_errors, res_events, res_replies);
+    set_handler("X-Resource", dispatch_res, res_errors, res_events, NULL, res_replies);
 }
 
 static void screensaverQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_client_major_version;
-    int f_client_minor_version;
-    f_client_major_version = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_QueryVersion_client_major_version, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_client_minor_version = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_QueryVersion_client_minor_version, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(2);
 }
 static void screensaverQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_server_major_version;
-    int f_server_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -13796,14 +12908,10 @@ static void screensaverQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (screensaver-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_server_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_QueryVersion_reply_server_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_server_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_QueryVersion_reply_server_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(20);
@@ -13811,160 +12919,82 @@ static void screensaverQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void screensaverQueryInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_QueryInfo_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void screensaverQueryInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_state;
-    int f_saver_window;
-    int f_ms_until_server;
-    int f_ms_since_user_input;
-    int f_event_mask;
-    int f_kind;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryInfo");
 
     REPLY(reply);
-    f_state = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_QueryInfo_reply_state, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (screensaver-QueryInfo)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_saver_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_QueryInfo_reply_saver_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ms_until_server = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_QueryInfo_reply_ms_until_server, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ms_since_user_input = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_QueryInfo_reply_ms_since_user_input, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_event_mask = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_QueryInfo_reply_event_mask, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_kind = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_screensaver_QueryInfo_reply_kind, tvb, *offsetp, 1, ENC_NA);
-    *offsetp += 1;
+    field8(tvb, offsetp, t, hf_x11_screensaver_QueryInfo_reply_kind, byte_order);
     UNUSED(7);
 }
 
 static void screensaverSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_event_mask;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_SelectInput_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_event_mask = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_screensaver_SelectInput_event_mask, tvb, *offsetp, 4, byte_order);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_screensaver_SelectInput_event_mask, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SelectInput_event_mask_mask_NotifyMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SelectInput_event_mask_mask_CycleMask, tvb, *offsetp, 4, byte_order);
+    }
     *offsetp += 4;
 }
 
 static void screensaverSetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_x;
-    int f_y;
-    int f_width;
-    int f_height;
-    int f_border_width;
-    int f_class;
-    int f_depth;
-    int f_visual;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_border_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_border_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_class = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_class, tvb, *offsetp, 1, ENC_NA);
-    *offsetp += 1;
-    f_depth = VALUE8(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_screensaver_SetAttributes_class, byte_order);
     proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_depth, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_visual = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_visual, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void screensaverUnsetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_UnsetAttributes_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void screensaverSuspend(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_suspend;
-    f_suspend = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_screensaver_Suspend_suspend, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
 }
-
-static void screensaverNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
-{
-    int f_code;
-    int f_state;
-    int f_sequence_number;
-    int f_time;
-    int f_root;
-    int f_window;
-    int f_kind;
-    int f_forced;
-    f_code = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_screensaver_Notify_code, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    CARD16(event_sequencenumber);
-    f_state = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_screensaver_Notify_state, tvb, *offsetp, 1, ENC_NA);
-    *offsetp += 1;
-    UNUSED(1);
-    f_sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_screensaver_Notify_sequence_number, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_screensaver_Notify_time, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_root = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_screensaver_Notify_root, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_window = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_screensaver_Notify_window, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_kind = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_screensaver_Notify_kind, tvb, *offsetp, 1, ENC_NA);
-    *offsetp += 1;
-    f_forced = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_screensaver_Notify_forced, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    UNUSED(14);
-}
 static const value_string screensaver_extension_minor[] = {
     { 0, "QueryVersion" },
     { 1, "QueryInfo" },
@@ -13975,7 +13005,6 @@ static const value_string screensaver_extension_minor[] = {
     { 0, NULL }
 };
 const x11_event_info screensaver_events[] = {
-    { "screensaver-Notify", screensaverNotify },
     { NULL, NULL }
 };
 static x11_reply_info screensaver_replies[] = {
@@ -14019,43 +13048,7 @@ static void dispatch_screensaver(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
 
 static void register_screensaver(void)
 {
-    set_handler("MIT-SCREEN-SAVER", dispatch_screensaver, screensaver_errors, screensaver_events, screensaver_replies);
-}
-
-static void shapeNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
-{
-    int f_shape_kind;
-    int f_affected_window;
-    int f_extents_x;
-    int f_extents_y;
-    int f_extents_width;
-    int f_extents_height;
-    int f_server_time;
-    int f_shaped;
-    f_shape_kind = field8(tvb, offsetp, t, hf_x11_shape_Notify_shape_kind, byte_order);
-    CARD16(event_sequencenumber);
-    f_affected_window = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_shape_Notify_affected_window, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_extents_x = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_shape_Notify_extents_x, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_extents_y = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_shape_Notify_extents_y, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_extents_width = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_shape_Notify_extents_width, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_extents_height = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_shape_Notify_extents_height, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_server_time = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_shape_Notify_server_time, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_shaped = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_shape_Notify_shaped, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    UNUSED(11);
+    set_handler("MIT-SCREEN-SAVER", dispatch_screensaver, screensaver_errors, screensaver_events, NULL, screensaver_replies);
 }
 
 static void shapeQueryVersion(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp _U_, proto_tree *t _U_, guint byte_order _U_, int length _U_)
@@ -14063,9 +13056,7 @@ static void shapeQueryVersion(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *of
 }
 static void shapeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -14075,131 +13066,79 @@ static void shapeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (shape-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryVersion_reply_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryVersion_reply_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void shapeRectangles(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_operation;
-    int f_destination_kind;
-    int f_ordering;
-    int f_destination_window;
-    int f_x_offset;
-    int f_y_offset;
-    f_operation = field8(tvb, offsetp, t, hf_x11_shape_Rectangles_operation, byte_order);
-    f_destination_kind = field8(tvb, offsetp, t, hf_x11_shape_Rectangles_destination_kind, byte_order);
-    f_ordering = field8(tvb, offsetp, t, hf_x11_shape_Rectangles_ordering, byte_order);
-    UNUSED(1);
-    f_destination_window = VALUE32(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_shape_Rectangles_operation, byte_order);
+    field8(tvb, offsetp, t, hf_x11_shape_Rectangles_destination_kind, byte_order);
+    field8(tvb, offsetp, t, hf_x11_shape_Rectangles_ordering, byte_order);
+    UNUSED(1);
     proto_tree_add_item(t, hf_x11_shape_Rectangles_destination_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x_offset = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_Rectangles_x_offset, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y_offset = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_Rectangles_y_offset, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    struct_RECTANGLE(tvb, offsetp, t, byte_order, (length - 16) / 8);
+    struct_xproto_RECTANGLE(tvb, offsetp, t, byte_order, (length - 16) / 8);
 }
 
 static void shapeMask(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_operation;
-    int f_destination_kind;
-    int f_destination_window;
-    int f_x_offset;
-    int f_y_offset;
-    int f_source_bitmap;
-    f_operation = field8(tvb, offsetp, t, hf_x11_shape_Mask_operation, byte_order);
-    f_destination_kind = field8(tvb, offsetp, t, hf_x11_shape_Mask_destination_kind, byte_order);
+    field8(tvb, offsetp, t, hf_x11_shape_Mask_operation, byte_order);
+    field8(tvb, offsetp, t, hf_x11_shape_Mask_destination_kind, byte_order);
     UNUSED(2);
-    f_destination_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_Mask_destination_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x_offset = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_Mask_x_offset, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y_offset = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_Mask_y_offset, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_source_bitmap = field32(tvb, offsetp, t, hf_x11_shape_Mask_source_bitmap, byte_order);
+    field32(tvb, offsetp, t, hf_x11_shape_Mask_source_bitmap, byte_order);
 }
 
 static void shapeCombine(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_operation;
-    int f_destination_kind;
-    int f_source_kind;
-    int f_destination_window;
-    int f_x_offset;
-    int f_y_offset;
-    int f_source_window;
-    f_operation = field8(tvb, offsetp, t, hf_x11_shape_Combine_operation, byte_order);
-    f_destination_kind = field8(tvb, offsetp, t, hf_x11_shape_Combine_destination_kind, byte_order);
-    f_source_kind = field8(tvb, offsetp, t, hf_x11_shape_Combine_source_kind, byte_order);
-    UNUSED(1);
-    f_destination_window = VALUE32(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_shape_Combine_operation, byte_order);
+    field8(tvb, offsetp, t, hf_x11_shape_Combine_destination_kind, byte_order);
+    field8(tvb, offsetp, t, hf_x11_shape_Combine_source_kind, byte_order);
+    UNUSED(1);
     proto_tree_add_item(t, hf_x11_shape_Combine_destination_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x_offset = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_Combine_x_offset, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y_offset = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_Combine_y_offset, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_source_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_Combine_source_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void shapeOffset(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_destination_kind;
-    int f_destination_window;
-    int f_x_offset;
-    int f_y_offset;
-    f_destination_kind = field8(tvb, offsetp, t, hf_x11_shape_Offset_destination_kind, byte_order);
+    field8(tvb, offsetp, t, hf_x11_shape_Offset_destination_kind, byte_order);
     UNUSED(3);
-    f_destination_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_Offset_destination_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x_offset = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_Offset_x_offset, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y_offset = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_Offset_y_offset, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void shapeQueryExtents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_destination_window;
-    f_destination_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryExtents_destination_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void shapeQueryExtents_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_bounding_shaped;
-    int f_clip_shaped;
-    int f_bounding_shape_extents_x;
-    int f_bounding_shape_extents_y;
-    int f_bounding_shape_extents_width;
-    int f_bounding_shape_extents_height;
-    int f_clip_shape_extents_x;
-    int f_clip_shape_extents_y;
-    int f_clip_shape_extents_width;
-    int f_clip_shape_extents_height;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryExtents");
 
@@ -14209,51 +13148,35 @@ static void shapeQueryExtents_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (shape-QueryExtents)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_bounding_shaped = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryExtents_reply_bounding_shaped, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_clip_shaped = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryExtents_reply_clip_shaped, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(2);
-    f_bounding_shape_extents_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryExtents_reply_bounding_shape_extents_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_bounding_shape_extents_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryExtents_reply_bounding_shape_extents_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_bounding_shape_extents_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryExtents_reply_bounding_shape_extents_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_bounding_shape_extents_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryExtents_reply_bounding_shape_extents_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_clip_shape_extents_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryExtents_reply_clip_shape_extents_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_clip_shape_extents_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryExtents_reply_clip_shape_extents_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_clip_shape_extents_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryExtents_reply_clip_shape_extents_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_clip_shape_extents_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_QueryExtents_reply_clip_shape_extents_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void shapeSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_destination_window;
-    int f_enable;
-    f_destination_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_SelectInput_destination_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_enable = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_SelectInput_enable, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -14261,65 +13184,53 @@ static void shapeSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
 
 static void shapeInputSelected(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_destination_window;
-    f_destination_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_InputSelected_destination_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void shapeInputSelected_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_enabled;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-InputSelected");
 
     REPLY(reply);
-    f_enabled = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_InputSelected_reply_enabled, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (shape-InputSelected)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void shapeGetRectangles(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_source_kind;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_GetRectangles_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_source_kind = field8(tvb, offsetp, t, hf_x11_shape_GetRectangles_source_kind, byte_order);
+    field8(tvb, offsetp, t, hf_x11_shape_GetRectangles_source_kind, byte_order);
     UNUSED(3);
 }
 static void shapeGetRectangles_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_ordering;
+    int sequence_number;
     int f_rectangles_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetRectangles");
 
     REPLY(reply);
-    f_ordering = field8(tvb, offsetp, t, hf_x11_shape_GetRectangles_reply_ordering, byte_order);
+    field8(tvb, offsetp, t, hf_x11_shape_GetRectangles_reply_ordering, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (shape-GetRectangles)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_rectangles_len = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shape_GetRectangles_reply_rectangles_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_RECTANGLE(tvb, offsetp, t, byte_order, f_rectangles_len);
+    struct_xproto_RECTANGLE(tvb, offsetp, t, byte_order, f_rectangles_len);
 }
 static const value_string shape_extension_minor[] = {
     { 0, "QueryVersion" },
@@ -14334,7 +13245,6 @@ static const value_string shape_extension_minor[] = {
     { 0, NULL }
 };
 const x11_event_info shape_events[] = {
-    { "shape-Notify", shapeNotify },
     { NULL, NULL }
 };
 static x11_reply_info shape_replies[] = {
@@ -14389,34 +13299,7 @@ static void dispatch_shape(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
 
 static void register_shape(void)
 {
-    set_handler("SHAPE", dispatch_shape, shape_errors, shape_events, shape_replies);
-}
-
-static void shmCompletion(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
-{
-    int f_drawable;
-    int f_minor_event;
-    int f_major_event;
-    int f_shmseg;
-    int f_offset;
-    UNUSED(1);
-    CARD16(event_sequencenumber);
-    f_drawable = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_shm_Completion_drawable, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_minor_event = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_shm_Completion_minor_event, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_major_event = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_shm_Completion_major_event, tvb, *offsetp, 1, ENC_NA);
-    *offsetp += 1;
-    UNUSED(1);
-    f_shmseg = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_shm_Completion_shmseg, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_offset = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_shm_Completion_offset, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
+    set_handler("SHAPE", dispatch_shape, shape_errors, shape_events, NULL, shape_replies);
 }
 
 static void shmQueryVersion(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp _U_, proto_tree *t _U_, guint byte_order _U_, int length _U_)
@@ -14424,41 +13307,27 @@ static void shmQueryVersion(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offs
 }
 static void shmQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_shared_pixmaps;
-    int f_major_version;
-    int f_minor_version;
-    int f_uid;
-    int f_gid;
-    int f_pixmap_format;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
     REPLY(reply);
-    f_shared_pixmaps = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_QueryVersion_reply_shared_pixmaps, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (shm-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_QueryVersion_reply_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_QueryVersion_reply_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_uid = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_QueryVersion_reply_uid, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_gid = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_QueryVersion_reply_gid, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_pixmap_format = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_QueryVersion_reply_pixmap_format, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(15);
@@ -14466,16 +13335,10 @@ static void shmQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
 
 static void shmAttach(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_shmseg;
-    int f_shmid;
-    int f_read_only;
-    f_shmseg = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_Attach_shmseg, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_shmid = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_Attach_shmid, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_read_only = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_Attach_read_only, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -14483,178 +13346,143 @@ static void shmAttach(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto
 
 static void shmDetach(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_shmseg;
-    f_shmseg = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_Detach_shmseg, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void shmPutImage(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_gc;
-    int f_total_width;
-    int f_total_height;
-    int f_src_x;
-    int f_src_y;
-    int f_src_width;
-    int f_src_height;
-    int f_dst_x;
-    int f_dst_y;
-    int f_depth;
-    int f_format;
-    int f_send_event;
-    int f_shmseg;
-    int f_offset;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_gc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_gc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_total_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_total_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_total_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_total_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_src_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_src_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_src_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_src_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_dst_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_dst_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_dst_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_dst_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_depth = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_depth, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_format = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_format, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_send_event = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_send_event, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
-    f_shmseg = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_shmseg, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_offset = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_PutImage_offset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void shmGetImage(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_x;
-    int f_y;
-    int f_width;
-    int f_height;
-    int f_plane_mask;
-    int f_format;
-    int f_shmseg;
-    int f_offset;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_GetImage_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_GetImage_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_GetImage_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_GetImage_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_GetImage_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_plane_mask = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_GetImage_plane_mask, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_format = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_GetImage_format, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
-    f_shmseg = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_GetImage_shmseg, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_offset = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_GetImage_offset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void shmGetImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_depth;
-    int f_visual;
-    int f_size;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetImage");
 
     REPLY(reply);
-    f_depth = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_GetImage_reply_depth, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (shm-GetImage)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_visual = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_GetImage_reply_visual, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_size = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_GetImage_reply_size, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void shmCreatePixmap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_pid;
-    int f_drawable;
-    int f_width;
-    int f_height;
-    int f_depth;
-    int f_shmseg;
-    int f_offset;
-    f_pid = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_CreatePixmap_pid, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_CreatePixmap_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_CreatePixmap_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_CreatePixmap_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_depth = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_CreatePixmap_depth, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
-    f_shmseg = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_CreatePixmap_shmseg, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_offset = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_shm_CreatePixmap_offset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
+
+static void shmAttachFd(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_shm_AttachFd_shmseg, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_shm_AttachFd_read_only, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(3);
+}
+
+static void shmCreateSegment(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_shm_CreateSegment_shmseg, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_shm_CreateSegment_size, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_shm_CreateSegment_read_only, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(3);
+}
+static void shmCreateSegment_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-CreateSegment");
+
+    REPLY(reply);
+    proto_tree_add_item(t, hf_x11_shm_CreateSegment_reply_nfd, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (shm-CreateSegment)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    UNUSED(24);
+}
 static const value_string shm_extension_minor[] = {
     { 0, "QueryVersion" },
     { 1, "Attach" },
@@ -14662,15 +13490,17 @@ static const value_string shm_extension_minor[] = {
     { 3, "PutImage" },
     { 4, "GetImage" },
     { 5, "CreatePixmap" },
+    { 6, "AttachFd" },
+    { 7, "CreateSegment" },
     { 0, NULL }
 };
 const x11_event_info shm_events[] = {
-    { "shm-Completion", shmCompletion },
     { NULL, NULL }
 };
 static x11_reply_info shm_replies[] = {
     { 0, shmQueryVersion_Reply },
     { 4, shmGetImage_Reply },
+    { 7, shmCreateSegment_Reply },
     { 0, NULL }
 };
 
@@ -14702,6 +13532,12 @@ static void dispatch_shm(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_
     case 5:
 	shmCreatePixmap(tvb, pinfo, offsetp, t, byte_order, length);
 	break;
+    case 6:
+	shmAttachFd(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 7:
+	shmCreateSegment(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
     /* No need for a default case here, since Unknown is printed above,
        and UNDECODED() is taken care of by dissect_x11_request */
     }
@@ -14709,111 +13545,19 @@ static void dispatch_shm(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_
 
 static void register_shm(void)
 {
-    set_handler("MIT-SHM", dispatch_shm, shm_errors, shm_events, shm_replies);
-}
-
-static void struct_INT64(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_hi;
-	int f_lo;
-
-	item = proto_tree_add_item(root, hf_x11_struct_INT64, tvb, *offsetp, 8, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_hi = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_INT64_hi, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_lo = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_INT64_lo, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-    }
-}
-
-static int struct_size_SYSTEMCOUNTER(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
-{
-    int size = 0;
-    int f_name_len;
-    f_name_len = VALUE16(tvb, *offsetp + size + 12);
-    size += f_name_len * 1;
-    return size + 14;
-}
-
-static void struct_SYSTEMCOUNTER(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_counter;
-	int f_name_len;
-
-	item = proto_tree_add_item(root, hf_x11_struct_SYSTEMCOUNTER, tvb, *offsetp, struct_size_SYSTEMCOUNTER(tvb, offsetp, byte_order), ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_counter = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SYSTEMCOUNTER_counter, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	struct_INT64(tvb, offsetp, t, byte_order, 1);
-	f_name_len = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SYSTEMCOUNTER_name_len, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	listOfByte(tvb, offsetp, t, hf_x11_struct_SYSTEMCOUNTER_name, f_name_len, byte_order);
-    }
-}
-
-static void struct_TRIGGER(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_counter;
-	int f_wait_type;
-	int f_test_type;
-
-	item = proto_tree_add_item(root, hf_x11_struct_TRIGGER, tvb, *offsetp, 20, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_counter = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TRIGGER_counter, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_wait_type = field32(tvb, offsetp, t, hf_x11_struct_TRIGGER_wait_type, byte_order);
-	struct_INT64(tvb, offsetp, t, byte_order, 1);
-	f_test_type = field32(tvb, offsetp, t, hf_x11_struct_TRIGGER_test_type, byte_order);
-    }
-}
-
-static void struct_WAITCONDITION(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-
-	item = proto_tree_add_item(root, hf_x11_struct_WAITCONDITION, tvb, *offsetp, 28, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	struct_TRIGGER(tvb, offsetp, t, byte_order, 1);
-	struct_INT64(tvb, offsetp, t, byte_order, 1);
-    }
+    set_handler("MIT-SHM", dispatch_shm, shm_errors, shm_events, NULL, shm_replies);
 }
 
 static void syncInitialize(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_desired_major_version;
-    int f_desired_minor_version;
-    f_desired_major_version = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_Initialize_desired_major_version, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_desired_minor_version = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_Initialize_desired_minor_version, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void syncInitialize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-Initialize");
 
@@ -14823,14 +13567,10 @@ static void syncInitialize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (sync-Initialize)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_Initialize_reply_major_version, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_minor_version = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_Initialize_reply_minor_version, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(22);
@@ -14841,7 +13581,7 @@ static void syncListSystemCounters(tvbuff_t *tvb _U_, packet_info *pinfo _U_, in
 }
 static void syncListSystemCounters_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_counters_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ListSystemCounters");
@@ -14852,44 +13592,36 @@ static void syncListSystemCounters_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (sync-ListSystemCounters)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_counters_len = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_ListSystemCounters_reply_counters_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_SYSTEMCOUNTER(tvb, offsetp, t, byte_order, f_counters_len);
+    struct_sync_SYSTEMCOUNTER(tvb, offsetp, t, byte_order, f_counters_len);
 }
 
 static void syncCreateCounter(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_id;
-    f_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_CreateCounter_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_INT64(tvb, offsetp, t, byte_order, 1);
+    struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
 }
 
 static void syncDestroyCounter(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_counter;
-    f_counter = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_DestroyCounter_counter, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void syncQueryCounter(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_counter;
-    f_counter = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_QueryCounter_counter, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void syncQueryCounter_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryCounter");
 
@@ -14899,72 +13631,122 @@ static void syncQueryCounter_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (sync-QueryCounter)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_INT64(tvb, offsetp, t, byte_order, 1);
+    struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
 }
 
 static void syncAwait(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    struct_WAITCONDITION(tvb, offsetp, t, byte_order, (length - 4) / 28);
+    struct_sync_WAITCONDITION(tvb, offsetp, t, byte_order, (length - 4) / 28);
 }
 
 static void syncChangeCounter(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_counter;
-    f_counter = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_ChangeCounter_counter, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_INT64(tvb, offsetp, t, byte_order, 1);
+    struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
 }
 
 static void syncSetCounter(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_counter;
-    f_counter = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_SetCounter_counter, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_INT64(tvb, offsetp, t, byte_order, 1);
+    struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
 }
 
 static void syncCreateAlarm(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_id;
-    f_id = VALUE32(tvb, *offsetp);
+    int f_value_mask;
     proto_tree_add_item(t, hf_x11_sync_CreateAlarm_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
+    f_value_mask = VALUE32(tvb, *offsetp);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_sync_CreateAlarm_value_mask, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_sync_CreateAlarm_value_mask_mask_Counter, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_sync_CreateAlarm_value_mask_mask_ValueType, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_sync_CreateAlarm_value_mask_mask_Value, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_sync_CreateAlarm_value_mask_mask_TestType, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_sync_CreateAlarm_value_mask_mask_Delta, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_sync_CreateAlarm_value_mask_mask_Events, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    if ((f_value_mask & (1 << 0)) != 0) {
+        proto_tree_add_item(t, hf_x11_sync_CreateAlarm_Counter_counter, tvb, *offsetp, 4, byte_order);
+        *offsetp += 4;
+    }
+    if ((f_value_mask & (1 << 1)) != 0) {
+        field32(tvb, offsetp, t, hf_x11_sync_CreateAlarm_ValueType_valueType, byte_order);
+    }
+    if ((f_value_mask & (1 << 2)) != 0) {
+        struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
+    }
+    if ((f_value_mask & (1 << 3)) != 0) {
+        field32(tvb, offsetp, t, hf_x11_sync_CreateAlarm_TestType_testType, byte_order);
+    }
+    if ((f_value_mask & (1 << 4)) != 0) {
+        struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
+    }
+    if ((f_value_mask & (1 << 5)) != 0) {
+        proto_tree_add_item(t, hf_x11_sync_CreateAlarm_Events_events, tvb, *offsetp, 4, byte_order);
+        *offsetp += 4;
+    }
 }
 
 static void syncChangeAlarm(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_id;
-    f_id = VALUE32(tvb, *offsetp);
+    int f_value_mask;
     proto_tree_add_item(t, hf_x11_sync_ChangeAlarm_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
+    f_value_mask = VALUE32(tvb, *offsetp);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_sync_ChangeAlarm_value_mask, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_sync_ChangeAlarm_value_mask_mask_Counter, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_sync_ChangeAlarm_value_mask_mask_ValueType, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_sync_ChangeAlarm_value_mask_mask_Value, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_sync_ChangeAlarm_value_mask_mask_TestType, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_sync_ChangeAlarm_value_mask_mask_Delta, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_sync_ChangeAlarm_value_mask_mask_Events, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    if ((f_value_mask & (1 << 0)) != 0) {
+        proto_tree_add_item(t, hf_x11_sync_ChangeAlarm_Counter_counter, tvb, *offsetp, 4, byte_order);
+        *offsetp += 4;
+    }
+    if ((f_value_mask & (1 << 1)) != 0) {
+        field32(tvb, offsetp, t, hf_x11_sync_ChangeAlarm_ValueType_valueType, byte_order);
+    }
+    if ((f_value_mask & (1 << 2)) != 0) {
+        struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
+    }
+    if ((f_value_mask & (1 << 3)) != 0) {
+        field32(tvb, offsetp, t, hf_x11_sync_ChangeAlarm_TestType_testType, byte_order);
+    }
+    if ((f_value_mask & (1 << 4)) != 0) {
+        struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
+    }
+    if ((f_value_mask & (1 << 5)) != 0) {
+        proto_tree_add_item(t, hf_x11_sync_ChangeAlarm_Events_events, tvb, *offsetp, 4, byte_order);
+        *offsetp += 4;
+    }
 }
 
 static void syncDestroyAlarm(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_alarm;
-    f_alarm = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_DestroyAlarm_alarm, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void syncQueryAlarm(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_alarm;
-    f_alarm = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_QueryAlarm_alarm, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void syncQueryAlarm_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_events;
-    int f_state;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryAlarm");
 
@@ -14974,42 +13756,32 @@ static void syncQueryAlarm_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (sync-QueryAlarm)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_TRIGGER(tvb, offsetp, t, byte_order, 1);
-    struct_INT64(tvb, offsetp, t, byte_order, 1);
-    f_events = VALUE8(tvb, *offsetp);
+    struct_sync_TRIGGER(tvb, offsetp, t, byte_order, 1);
+    struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
     proto_tree_add_item(t, hf_x11_sync_QueryAlarm_reply_events, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_state = field8(tvb, offsetp, t, hf_x11_sync_QueryAlarm_reply_state, byte_order);
+    field8(tvb, offsetp, t, hf_x11_sync_QueryAlarm_reply_state, byte_order);
     UNUSED(2);
 }
 
 static void syncSetPriority(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_id;
-    int f_priority;
-    f_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_SetPriority_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_priority = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_SetPriority_priority, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void syncGetPriority(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_id;
-    f_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_GetPriority_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void syncGetPriority_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_priority;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPriority");
 
@@ -15019,66 +13791,48 @@ static void syncGetPriority_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (sync-GetPriority)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_priority = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_GetPriority_reply_priority, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void syncCreateFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_fence;
-    int f_initially_triggered;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_CreateFence_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_fence = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_CreateFence_fence, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_initially_triggered = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_CreateFence_initially_triggered, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
 static void syncTriggerFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_fence;
-    f_fence = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_TriggerFence_fence, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void syncResetFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_fence;
-    f_fence = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_ResetFence_fence, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void syncDestroyFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_fence;
-    f_fence = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_DestroyFence_fence, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void syncQueryFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_fence;
-    f_fence = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_QueryFence_fence, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void syncQueryFence_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_triggered;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryFence");
 
@@ -15088,11 +13842,8 @@ static void syncQueryFence_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (sync-QueryFence)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_triggered = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_QueryFence_reply_triggered, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(23);
@@ -15103,55 +13854,21 @@ static void syncAwaitFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
     listOfCard32(tvb, offsetp, t, hf_x11_sync_AwaitFence_fence_list, hf_x11_sync_AwaitFence_fence_list_item, (length - 4) / 4, byte_order);
 }
 
-static void syncCounterNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
-{
-    int f_kind;
-    int f_counter;
-    int f_timestamp;
-    int f_count;
-    int f_destroyed;
-    f_kind = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_sync_CounterNotify_kind, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    CARD16(event_sequencenumber);
-    f_counter = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_sync_CounterNotify_counter, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    struct_INT64(tvb, offsetp, t, byte_order, 1);
-    struct_INT64(tvb, offsetp, t, byte_order, 1);
-    f_timestamp = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_sync_CounterNotify_timestamp, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_count = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_sync_CounterNotify_count, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_destroyed = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_sync_CounterNotify_destroyed, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    UNUSED(1);
-}
-
 static void syncAlarmNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_kind;
-    int f_alarm;
-    int f_timestamp;
-    int f_state;
-    f_kind = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_AlarmNotify_kind, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_alarm = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_sync_AlarmNotify_alarm, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_INT64(tvb, offsetp, t, byte_order, 1);
-    struct_INT64(tvb, offsetp, t, byte_order, 1);
-    f_timestamp = VALUE32(tvb, *offsetp);
+    struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
+    struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
     proto_tree_add_item(t, hf_x11_sync_AlarmNotify_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_state = field8(tvb, offsetp, t, hf_x11_sync_AlarmNotify_state, byte_order);
+    field8(tvb, offsetp, t, hf_x11_sync_AlarmNotify_state, byte_order);
     UNUSED(3);
 }
+
 static const value_string sync_extension_minor[] = {
     { 0, "Initialize" },
     { 1, "ListSystemCounters" },
@@ -15176,7 +13893,6 @@ static const value_string sync_extension_minor[] = {
     { 0, NULL }
 };
 const x11_event_info sync_events[] = {
-    { "sync-CounterNotify", syncCounterNotify },
     { "sync-AlarmNotify", syncAlarmNotify },
     { NULL, NULL }
 };
@@ -15267,25 +13983,19 @@ static void dispatch_sync(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto
 
 static void register_sync(void)
 {
-    set_handler("SYNC", dispatch_sync, sync_errors, sync_events, sync_replies);
+    set_handler("SYNC", dispatch_sync, sync_errors, sync_events, NULL, sync_replies);
 }
 
 static void xc_miscGetVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_client_major_version;
-    int f_client_minor_version;
-    f_client_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xc_misc_GetVersion_client_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_client_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xc_misc_GetVersion_client_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void xc_miscGetVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_server_major_version;
-    int f_server_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetVersion");
 
@@ -15295,14 +14005,10 @@ static void xc_miscGetVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xc_misc-GetVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_server_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xc_misc_GetVersion_reply_server_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_server_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xc_misc_GetVersion_reply_server_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
@@ -15312,9 +14018,7 @@ static void xc_miscGetXIDRange(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *o
 }
 static void xc_miscGetXIDRange_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_start_id;
-    int f_count;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetXIDRange");
 
@@ -15324,28 +14028,22 @@ static void xc_miscGetXIDRange_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xc_misc-GetXIDRange)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_start_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xc_misc_GetXIDRange_reply_start_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_count = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xc_misc_GetXIDRange_reply_count, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xc_miscGetXIDList(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_count;
-    f_count = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xc_misc_GetXIDList_count, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xc_miscGetXIDList_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_ids_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetXIDList");
@@ -15356,8 +14054,6 @@ static void xc_miscGetXIDList_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xc_misc-GetXIDList)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_ids_len = VALUE32(tvb, *offsetp);
@@ -15408,25 +14104,19 @@ static void dispatch_xc_misc(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pr
 
 static void register_xc_misc(void)
 {
-    set_handler("XC-MISC", dispatch_xc_misc, xc_misc_errors, xc_misc_events, xc_misc_replies);
+    set_handler("XC-MISC", dispatch_xc_misc, xc_misc_errors, xc_misc_events, NULL, xc_misc_replies);
 }
 
 static void xevieQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_client_major_version;
-    int f_client_minor_version;
-    f_client_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xevie_QueryVersion_client_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_client_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xevie_QueryVersion_client_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void xevieQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_server_major_version;
-    int f_server_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -15436,14 +14126,10 @@ static void xevieQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xevie-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_server_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xevie_QueryVersion_reply_server_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_server_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xevie_QueryVersion_reply_server_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(20);
@@ -15451,14 +14137,12 @@ static void xevieQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
 
 static void xevieStart(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xevie_Start_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xevieStart_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-Start");
 
@@ -15468,8 +14152,6 @@ static void xevieStart_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pr
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xevie-Start)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(24);
@@ -15477,14 +14159,12 @@ static void xevieStart_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pr
 
 static void xevieEnd(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_cmap;
-    f_cmap = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xevie_End_cmap, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xevieEnd_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-End");
 
@@ -15494,21 +14174,19 @@ static void xevieEnd_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xevie-End)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(24);
 }
 
-static void struct_Event(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xevie_Event(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
 
-	item = proto_tree_add_item(root, hf_x11_struct_Event, tvb, *offsetp, 32, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xevie_Event, tvb, *offsetp, 32, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
 	UNUSED(32);
     }
@@ -15516,16 +14194,14 @@ static void struct_Event(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint by
 
 static void xevieSend(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_data_type;
-    struct_Event(tvb, offsetp, t, byte_order, 1);
-    f_data_type = VALUE32(tvb, *offsetp);
+    struct_xevie_Event(tvb, offsetp, t, byte_order, 1);
     proto_tree_add_item(t, hf_x11_xevie_Send_data_type, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(64);
 }
 static void xevieSend_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-Send");
 
@@ -15535,8 +14211,6 @@ static void xevieSend_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xevie-Send)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(24);
@@ -15544,14 +14218,12 @@ static void xevieSend_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
 
 static void xevieSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_event_mask;
-    f_event_mask = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xevie_SelectInput_event_mask, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xevieSelectInput_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-SelectInput");
 
@@ -15561,8 +14233,6 @@ static void xevieSelectInput_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xevie-SelectInput)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(24);
@@ -15619,33 +14289,25 @@ static void dispatch_xevie(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
 
 static void register_xevie(void)
 {
-    set_handler("XEVIE", dispatch_xevie, xevie_errors, xevie_events, xevie_replies);
+    set_handler("XEVIE", dispatch_xevie, xevie_errors, xevie_events, NULL, xevie_replies);
 }
 
-static void struct_DrmClipRect(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xf86dri_DrmClipRect(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_x1;
-	int f_y1;
-	int f_x2;
-	int f_x3;
 
-	item = proto_tree_add_item(root, hf_x11_struct_DrmClipRect, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xf86dri_DrmClipRect, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_x1 = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DrmClipRect_x1, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xf86dri_DrmClipRect_x1, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_y1 = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DrmClipRect_y1, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xf86dri_DrmClipRect_y1, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_x2 = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DrmClipRect_x2, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xf86dri_DrmClipRect_x2, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_x3 = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DrmClipRect_x3, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xf86dri_DrmClipRect_x3, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
     }
 }
@@ -15655,10 +14317,7 @@ static void xf86driQueryVersion(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *
 }
 static void xf86driQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_dri_major_version;
-    int f_dri_minor_version;
-    int f_dri_minor_patch;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -15668,32 +14327,24 @@ static void xf86driQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86dri-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dri_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_QueryVersion_reply_dri_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_dri_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_QueryVersion_reply_dri_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_dri_minor_patch = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_QueryVersion_reply_dri_minor_patch, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xf86driQueryDirectRenderingCapable(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_QueryDirectRenderingCapable_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xf86driQueryDirectRenderingCapable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_is_capable;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryDirectRenderingCapable");
 
@@ -15703,27 +14354,20 @@ static void xf86driQueryDirectRenderingCapable_Reply(tvbuff_t *tvb, packet_info
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86dri-QueryDirectRenderingCapable)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_is_capable = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_QueryDirectRenderingCapable_reply_is_capable, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
 static void xf86driOpenConnection(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_OpenConnection_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xf86driOpenConnection_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_sarea_handle_low;
-    int f_sarea_handle_high;
+    int sequence_number;
     int f_bus_id_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-OpenConnection");
@@ -15734,14 +14378,10 @@ static void xf86driOpenConnection_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86dri-OpenConnection)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_sarea_handle_low = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_OpenConnection_reply_sarea_handle_low, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_sarea_handle_high = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_OpenConnection_reply_sarea_handle_high, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_bus_id_len = VALUE32(tvb, *offsetp);
@@ -15753,25 +14393,18 @@ static void xf86driOpenConnection_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
 
 static void xf86driCloseConnection(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_CloseConnection_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xf86driGetClientDriverName(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetClientDriverName_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xf86driGetClientDriverName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_client_driver_major_version;
-    int f_client_driver_minor_version;
-    int f_client_driver_patch_version;
+    int sequence_number;
     int f_client_driver_name_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetClientDriverName");
@@ -15782,17 +14415,12 @@ static void xf86driGetClientDriverName_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86dri-GetClientDriverName)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_client_driver_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetClientDriverName_reply_client_driver_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_client_driver_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetClientDriverName_reply_client_driver_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_client_driver_patch_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetClientDriverName_reply_client_driver_patch_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_client_driver_name_len = VALUE32(tvb, *offsetp);
@@ -15804,23 +14432,16 @@ static void xf86driGetClientDriverName_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void xf86driCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_visual;
-    int f_context;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_CreateContext_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_visual = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_CreateContext_visual, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_CreateContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xf86driCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_hw_context;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-CreateContext");
 
@@ -15830,42 +14451,30 @@ static void xf86driCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86dri-CreateContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_hw_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_CreateContext_reply_hw_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xf86driDestroyContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_context;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_DestroyContext_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_DestroyContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xf86driCreateDrawable(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_drawable;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_CreateDrawable_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_CreateDrawable_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xf86driCreateDrawable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_hw_drawable_handle;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-CreateDrawable");
 
@@ -15875,50 +14484,31 @@ static void xf86driCreateDrawable_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86dri-CreateDrawable)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_hw_drawable_handle = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_CreateDrawable_reply_hw_drawable_handle, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xf86driDestroyDrawable(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_drawable;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_DestroyDrawable_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_DestroyDrawable_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xf86driGetDrawableInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_drawable;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xf86driGetDrawableInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_drawable_table_index;
-    int f_drawable_table_stamp;
-    int f_drawable_origin_X;
-    int f_drawable_origin_Y;
-    int f_drawable_size_W;
-    int f_drawable_size_H;
+    int sequence_number;
     int f_num_clip_rects;
-    int f_back_x;
-    int f_back_y;
     int f_num_back_clip_rects;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDrawableInfo");
@@ -15929,59 +14519,42 @@ static void xf86driGetDrawableInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86dri-GetDrawableInfo)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable_table_index = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_drawable_table_index, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable_table_stamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_drawable_table_stamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable_origin_X = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_drawable_origin_X, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drawable_origin_Y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_drawable_origin_Y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drawable_size_W = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_drawable_size_W, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drawable_size_H = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_drawable_size_H, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_num_clip_rects = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_num_clip_rects, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_back_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_back_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_back_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_back_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_num_back_clip_rects = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_num_back_clip_rects, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_DrmClipRect(tvb, offsetp, t, byte_order, f_num_clip_rects);
-    struct_DrmClipRect(tvb, offsetp, t, byte_order, f_num_back_clip_rects);
+    struct_xf86dri_DrmClipRect(tvb, offsetp, t, byte_order, f_num_clip_rects);
+    struct_xf86dri_DrmClipRect(tvb, offsetp, t, byte_order, f_num_back_clip_rects);
 }
 
 static void xf86driGetDeviceInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDeviceInfo_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xf86driGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_framebuffer_handle_low;
-    int f_framebuffer_handle_high;
-    int f_framebuffer_origin_offset;
-    int f_framebuffer_size;
-    int f_framebuffer_stride;
+    int sequence_number;
     int f_device_private_size;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceInfo");
@@ -15992,23 +14565,16 @@ static void xf86driGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86dri-GetDeviceInfo)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_framebuffer_handle_low = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDeviceInfo_reply_framebuffer_handle_low, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_framebuffer_handle_high = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDeviceInfo_reply_framebuffer_handle_high, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_framebuffer_origin_offset = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDeviceInfo_reply_framebuffer_origin_offset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_framebuffer_size = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDeviceInfo_reply_framebuffer_size, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_framebuffer_stride = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_GetDeviceInfo_reply_framebuffer_stride, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_device_private_size = VALUE32(tvb, *offsetp);
@@ -16019,19 +14585,14 @@ static void xf86driGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
 
 static void xf86driAuthConnection(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_magic;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_AuthConnection_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_magic = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_AuthConnection_magic, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xf86driAuthConnection_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_authenticated;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-AuthConnection");
 
@@ -16041,11 +14602,8 @@ static void xf86driAuthConnection_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86dri-AuthConnection)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_authenticated = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86dri_AuthConnection_reply_authenticated, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
@@ -16133,7 +14691,61 @@ static void dispatch_xf86dri(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pr
 
 static void register_xf86dri(void)
 {
-    set_handler("XFree86-DRI", dispatch_xf86dri, xf86dri_errors, xf86dri_events, xf86dri_replies);
+    set_handler("XFree86-DRI", dispatch_xf86dri, xf86dri_errors, xf86dri_events, NULL, xf86dri_replies);
+}
+
+static void struct_xf86vidmode_ModeInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xf86vidmode_ModeInfo, tvb, *offsetp, 48, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_xf86vidmode_ModeInfo_dotclock, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_xf86vidmode_ModeInfo_hdisplay, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_xf86vidmode_ModeInfo_hsyncstart, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_xf86vidmode_ModeInfo_hsyncend, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_xf86vidmode_ModeInfo_htotal, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_xf86vidmode_ModeInfo_hskew, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_xf86vidmode_ModeInfo_vdisplay, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_xf86vidmode_ModeInfo_vsyncstart, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_xf86vidmode_ModeInfo_vsyncend, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_xf86vidmode_ModeInfo_vtotal, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	UNUSED(4);
+	{
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xf86vidmode_ModeInfo_flags, tvb, *offsetp, 4, byte_order);
+	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Positive_HSync, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Negative_HSync, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Positive_VSync, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Negative_VSync, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Interlace, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Composite_Sync, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Positive_CSync, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Negative_CSync, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_HSkew, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Broadcast, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Pixmux, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Double_Clock, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xf86vidmode_ModeInfo_flags_mask_Half_Clock, tvb, *offsetp, 4, byte_order);
+	}
+	*offsetp += 4;
+	UNUSED(12);
+	proto_tree_add_item(t, hf_x11_struct_xf86vidmode_ModeInfo_privsize, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+    }
 }
 
 static void xf86vidmodeQueryVersion(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp _U_, proto_tree *t _U_, guint byte_order _U_, int length _U_)
@@ -16141,9 +14753,7 @@ static void xf86vidmodeQueryVersion(tvbuff_t *tvb _U_, packet_info *pinfo _U_, i
 }
 static void xf86vidmodeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -16153,40 +14763,23 @@ static void xf86vidmodeQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86vidmode-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_QueryVersion_reply_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_QueryVersion_reply_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xf86vidmodeGetModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
 }
 static void xf86vidmodeGetModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_dotclock;
-    int f_hdisplay;
-    int f_hsyncstart;
-    int f_hsyncend;
-    int f_htotal;
-    int f_hskew;
-    int f_vdisplay;
-    int f_vsyncstart;
-    int f_vsyncend;
-    int f_vtotal;
-    int f_flags;
+    int sequence_number;
     int f_privsize;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetModeLine");
@@ -16197,42 +14790,29 @@ static void xf86vidmodeGetModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86vidmode-GetModeLine)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dotclock = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_dotclock, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_hdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_hdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_hsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_hsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_htotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_htotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hskew = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_hskew, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_vdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_vsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_vsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vtotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_vtotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_flags = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_flags, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -16260,50 +14840,28 @@ static void xf86vidmodeGetModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void xf86vidmodeModModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_hdisplay;
-    int f_hsyncstart;
-    int f_hsyncend;
-    int f_htotal;
-    int f_hskew;
-    int f_vdisplay;
-    int f_vsyncstart;
-    int f_vsyncend;
-    int f_vtotal;
-    int f_flags;
     int f_privsize;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_hdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_hdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_hsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_hsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_htotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_htotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hskew = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_hskew, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_vdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_vsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_vsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vtotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_vtotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_flags = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_flags, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -16332,27 +14890,21 @@ static void xf86vidmodeModModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
 
 static void xf86vidmodeSwitchMode(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_zoom;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchMode_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_zoom = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchMode_zoom, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xf86vidmodeGetMonitor(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetMonitor_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
 }
 static void xf86vidmodeGetMonitor_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_vendor_length;
     int f_model_length;
     int f_num_hsync;
@@ -16366,8 +14918,6 @@ static void xf86vidmodeGetMonitor_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86vidmode-GetMonitor)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_vendor_length = VALUE8(tvb, *offsetp);
@@ -16392,27 +14942,21 @@ static void xf86vidmodeGetMonitor_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
 
 static void xf86vidmodeLockModeSwitch(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_lock;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_LockModeSwitch_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_lock = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_LockModeSwitch_lock, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xf86vidmodeGetAllModeLines(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetAllModeLines_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
 }
 static void xf86vidmodeGetAllModeLines_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_modecount;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetAllModeLines");
@@ -16423,78 +14967,41 @@ static void xf86vidmodeGetAllModeLines_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86vidmode-GetAllModeLines)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_modecount = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetAllModeLines_reply_modecount, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_ModeInfo(tvb, offsetp, t, byte_order, f_modecount);
+    struct_xf86vidmode_ModeInfo(tvb, offsetp, t, byte_order, f_modecount);
 }
 
 static void xf86vidmodeAddModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_dotclock;
-    int f_hdisplay;
-    int f_hsyncstart;
-    int f_hsyncend;
-    int f_htotal;
-    int f_hskew;
-    int f_vdisplay;
-    int f_vsyncstart;
-    int f_vsyncend;
-    int f_vtotal;
-    int f_flags;
     int f_privsize;
-    int f_after_dotclock;
-    int f_after_hdisplay;
-    int f_after_hsyncstart;
-    int f_after_hsyncend;
-    int f_after_htotal;
-    int f_after_hskew;
-    int f_after_vdisplay;
-    int f_after_vsyncstart;
-    int f_after_vsyncend;
-    int f_after_vtotal;
-    int f_after_flags;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dotclock = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_dotclock, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_hdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_hdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_hsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_hsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_htotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_htotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hskew = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_hskew, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_vdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_vsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_vsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vtotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_vtotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_flags = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_flags, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -16517,38 +15024,27 @@ static void xf86vidmodeAddModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
     f_privsize = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_privsize, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_after_dotclock = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_dotclock, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_after_hdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_hdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_after_hsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_hsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_after_hsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_hsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_after_htotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_htotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_after_hskew = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_hskew, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_after_vdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_vdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_after_vsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_vsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_after_vsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_vsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_after_vtotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_vtotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_after_flags = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_flags, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -16574,54 +15070,30 @@ static void xf86vidmodeAddModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
 
 static void xf86vidmodeDeleteModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_dotclock;
-    int f_hdisplay;
-    int f_hsyncstart;
-    int f_hsyncend;
-    int f_htotal;
-    int f_hskew;
-    int f_vdisplay;
-    int f_vsyncstart;
-    int f_vsyncend;
-    int f_vtotal;
-    int f_flags;
     int f_privsize;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dotclock = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_dotclock, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_hdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_hdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_hsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_hsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_htotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_htotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hskew = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_hskew, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_vdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_vsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_vsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vtotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_vtotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_flags = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_flags, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -16650,54 +15122,30 @@ static void xf86vidmodeDeleteModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int
 
 static void xf86vidmodeValidateModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_dotclock;
-    int f_hdisplay;
-    int f_hsyncstart;
-    int f_hsyncend;
-    int f_htotal;
-    int f_hskew;
-    int f_vdisplay;
-    int f_vsyncstart;
-    int f_vsyncend;
-    int f_vtotal;
-    int f_flags;
     int f_privsize;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dotclock = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_dotclock, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_hdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_hdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_hsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_hsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_htotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_htotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hskew = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_hskew, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_vdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_vsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_vsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vtotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_vtotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_flags = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_flags, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -16725,8 +15173,7 @@ static void xf86vidmodeValidateModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, i
 }
 static void xf86vidmodeValidateModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ValidateModeLine");
 
@@ -16736,11 +15183,8 @@ static void xf86vidmodeValidateModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86vidmode-ValidateModeLine)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_status = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_reply_status, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
@@ -16748,54 +15192,30 @@ static void xf86vidmodeValidateModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void xf86vidmodeSwitchToMode(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_dotclock;
-    int f_hdisplay;
-    int f_hsyncstart;
-    int f_hsyncend;
-    int f_htotal;
-    int f_hskew;
-    int f_vdisplay;
-    int f_vsyncstart;
-    int f_vsyncend;
-    int f_vtotal;
-    int f_flags;
     int f_privsize;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dotclock = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_dotclock, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_hdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_hdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_hsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_hsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_htotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_htotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_hskew = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_hskew, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vdisplay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_vdisplay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vsyncstart = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_vsyncstart, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vsyncend = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_vsyncend, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vtotal = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_vtotal, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_flags = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_flags, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -16824,17 +15244,13 @@ static void xf86vidmodeSwitchToMode(tvbuff_t *tvb, packet_info *pinfo _U_, int *
 
 static void xf86vidmodeGetViewPort(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetViewPort_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
 }
 static void xf86vidmodeGetViewPort_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_x;
-    int f_y;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetViewPort");
 
@@ -16844,14 +15260,10 @@ static void xf86vidmodeGetViewPort_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86vidmode-GetViewPort)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetViewPort_reply_x, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_y = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetViewPort_reply_y, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(16);
@@ -16859,35 +15271,26 @@ static void xf86vidmodeGetViewPort_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void xf86vidmodeSetViewPort(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_x;
-    int f_y;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SetViewPort_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_x = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SetViewPort_x, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_y = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SetViewPort_y, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xf86vidmodeGetDotClocks(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetDotClocks_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
 }
 static void xf86vidmodeGetDotClocks_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_flags;
     int f_clocks;
-    int f_maxclocks;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDotClocks");
 
@@ -16897,8 +15300,6 @@ static void xf86vidmodeGetDotClocks_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86vidmode-GetDotClocks)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_flags = VALUE32(tvb, *offsetp);
@@ -16911,7 +15312,6 @@ static void xf86vidmodeGetDotClocks_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     f_clocks = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetDotClocks_reply_clocks, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_maxclocks = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetDotClocks_reply_maxclocks, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -16920,33 +15320,21 @@ static void xf86vidmodeGetDotClocks_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void xf86vidmodeSetClientVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_major;
-    int f_minor;
-    f_major = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SetClientVersion_major, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_minor = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SetClientVersion_minor, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xf86vidmodeSetGamma(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_red;
-    int f_green;
-    int f_blue;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SetGamma_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_red = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SetGamma_red, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_green = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SetGamma_green, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_blue = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SetGamma_blue, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -16954,18 +15342,13 @@ static void xf86vidmodeSetGamma(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
 
 static void xf86vidmodeGetGamma(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetGamma_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(26);
 }
 static void xf86vidmodeGetGamma_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_red;
-    int f_green;
-    int f_blue;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetGamma");
 
@@ -16975,17 +15358,12 @@ static void xf86vidmodeGetGamma_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86vidmode-GetGamma)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_red = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetGamma_reply_red, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_green = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetGamma_reply_green, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_blue = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetGamma_reply_blue, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
@@ -16993,18 +15371,14 @@ static void xf86vidmodeGetGamma_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
 
 static void xf86vidmodeGetGammaRamp(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    int f_size;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetGammaRamp_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_size = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetGammaRamp_size, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void xf86vidmodeGetGammaRamp_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_size;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetGammaRamp");
@@ -17015,8 +15389,6 @@ static void xf86vidmodeGetGammaRamp_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86vidmode-GetGammaRamp)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_size = VALUE16(tvb, *offsetp);
@@ -17030,9 +15402,7 @@ static void xf86vidmodeGetGammaRamp_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void xf86vidmodeSetGammaRamp(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
     int f_size;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_SetGammaRamp_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_size = VALUE16(tvb, *offsetp);
@@ -17048,16 +15418,13 @@ static void xf86vidmodeSetGammaRamp(tvbuff_t *tvb, packet_info *pinfo _U_, int *
 
 static void xf86vidmodeGetGammaRampSize(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetGammaRampSize_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
 }
 static void xf86vidmodeGetGammaRampSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_size;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetGammaRampSize");
 
@@ -17067,11 +15434,8 @@ static void xf86vidmodeGetGammaRampSize_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86vidmode-GetGammaRampSize)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_size = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetGammaRampSize_reply_size, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(22);
@@ -17079,16 +15443,13 @@ static void xf86vidmodeGetGammaRampSize_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void xf86vidmodeGetPermissions(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_screen;
-    f_screen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xf86vidmode_GetPermissions_screen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
 }
 static void xf86vidmodeGetPermissions_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_permissions;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPermissions");
 
@@ -17098,11 +15459,8 @@ static void xf86vidmodeGetPermissions_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xf86vidmode-GetPermissions)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_permissions = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_GetPermissions_reply_permissions, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -17234,25 +15592,19 @@ static void dispatch_xf86vidmode(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
 
 static void register_xf86vidmode(void)
 {
-    set_handler("XFree86-VidModeExtension", dispatch_xf86vidmode, xf86vidmode_errors, xf86vidmode_events, xf86vidmode_replies);
+    set_handler("XFree86-VidModeExtension", dispatch_xf86vidmode, xf86vidmode_errors, xf86vidmode_events, NULL, xf86vidmode_replies);
 }
 
 static void xfixesQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_client_major_version;
-    int f_client_minor_version;
-    f_client_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_QueryVersion_client_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_client_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_QueryVersion_client_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xfixesQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -17262,14 +15614,10 @@ static void xfixesQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xfixes-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_QueryVersion_reply_major_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_QueryVersion_reply_minor_version, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(16);
@@ -17277,59 +15625,20 @@ static void xfixesQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
 
 static void xfixesChangeSaveSet(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_mode;
-    int f_target;
-    int f_map;
-    int f_window;
-    f_mode = field8(tvb, offsetp, t, hf_x11_xfixes_ChangeSaveSet_mode, byte_order);
-    f_target = field8(tvb, offsetp, t, hf_x11_xfixes_ChangeSaveSet_target, byte_order);
-    f_map = field8(tvb, offsetp, t, hf_x11_xfixes_ChangeSaveSet_map, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xfixes_ChangeSaveSet_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xfixes_ChangeSaveSet_target, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xfixes_ChangeSaveSet_map, byte_order);
     UNUSED(1);
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_ChangeSaveSet_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
-static void xfixesSelectionNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
-{
-    int f_subtype;
-    int f_window;
-    int f_owner;
-    int f_selection;
-    int f_timestamp;
-    int f_selection_timestamp;
-    f_subtype = field8(tvb, offsetp, t, hf_x11_xfixes_SelectionNotify_subtype, byte_order);
-    CARD16(event_sequencenumber);
-    f_window = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xfixes_SelectionNotify_window, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_owner = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xfixes_SelectionNotify_owner, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_selection = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xfixes_SelectionNotify_selection, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xfixes_SelectionNotify_timestamp, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_selection_timestamp = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xfixes_SelectionNotify_selection_timestamp, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    UNUSED(8);
-}
-
 static void xfixesSelectSelectionInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_selection;
-    int f_event_mask;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SelectSelectionInput_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_selection = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SelectSelectionInput_selection, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_event_mask = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xfixes_SelectSelectionInput_event_mask, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -17342,34 +15651,23 @@ static void xfixesSelectSelectionInput(tvbuff_t *tvb, packet_info *pinfo _U_, in
 
 static void xfixesCursorNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_subtype;
-    int f_window;
-    int f_cursor_serial;
-    int f_timestamp;
-    int f_name;
-    f_subtype = field8(tvb, offsetp, t, hf_x11_xfixes_CursorNotify_subtype, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xfixes_CursorNotify_subtype, byte_order);
     CARD16(event_sequencenumber);
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CursorNotify_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_cursor_serial = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CursorNotify_cursor_serial, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_timestamp = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CursorNotify_timestamp, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_name = field32(tvb, offsetp, t, hf_x11_xfixes_CursorNotify_name, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xfixes_CursorNotify_name, byte_order);
     UNUSED(12);
 }
 
+
 static void xfixesSelectCursorInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_event_mask;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SelectCursorInput_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_event_mask = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xfixes_SelectCursorInput_event_mask, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -17383,14 +15681,9 @@ static void xfixesGetCursorImage(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int
 }
 static void xfixesGetCursorImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_x;
-    int f_y;
+    int sequence_number;
     int f_width;
     int f_height;
-    int f_xhot;
-    int f_yhot;
-    int f_cursor_serial;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetCursorImage");
 
@@ -17400,14 +15693,10 @@ static void xfixesGetCursorImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xfixes-GetCursorImage)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImage_reply_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImage_reply_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_width = VALUE16(tvb, *offsetp);
@@ -17416,13 +15705,10 @@ static void xfixesGetCursorImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImage_reply_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_xhot = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImage_reply_xhot, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_yhot = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImage_reply_yhot, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_cursor_serial = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImage_reply_cursor_serial, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(8);
@@ -17431,192 +15717,132 @@ static void xfixesGetCursorImage_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
 
 static void xfixesCreateRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_region;
-    f_region = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreateRegion_region, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_RECTANGLE(tvb, offsetp, t, byte_order, (length - 8) / 8);
+    struct_xproto_RECTANGLE(tvb, offsetp, t, byte_order, (length - 8) / 8);
 }
 
 static void xfixesCreateRegionFromBitmap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_region;
-    int f_bitmap;
-    f_region = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreateRegionFromBitmap_region, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_bitmap = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreateRegionFromBitmap_bitmap, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesCreateRegionFromWindow(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_region;
-    int f_window;
-    int f_kind;
-    f_region = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreateRegionFromWindow_region, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreateRegionFromWindow_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_kind = field8(tvb, offsetp, t, hf_x11_xfixes_CreateRegionFromWindow_kind, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xfixes_CreateRegionFromWindow_kind, byte_order);
     UNUSED(3);
 }
 
 static void xfixesCreateRegionFromGC(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_region;
-    int f_gc;
-    f_region = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreateRegionFromGC_region, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_gc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreateRegionFromGC_gc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesCreateRegionFromPicture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_region;
-    int f_picture;
-    f_region = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreateRegionFromPicture_region, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_picture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreateRegionFromPicture_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesDestroyRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_region;
-    f_region = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_DestroyRegion_region, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesSetRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_region;
-    f_region = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SetRegion_region, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_RECTANGLE(tvb, offsetp, t, byte_order, (length - 8) / 8);
+    struct_xproto_RECTANGLE(tvb, offsetp, t, byte_order, (length - 8) / 8);
 }
 
 static void xfixesCopyRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_source;
-    int f_destination;
-    f_source = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CopyRegion_source, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_destination = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CopyRegion_destination, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesUnionRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_source1;
-    int f_source2;
-    int f_destination;
-    f_source1 = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_UnionRegion_source1, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_source2 = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_UnionRegion_source2, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_destination = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_UnionRegion_destination, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesIntersectRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_source1;
-    int f_source2;
-    int f_destination;
-    f_source1 = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_IntersectRegion_source1, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_source2 = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_IntersectRegion_source2, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_destination = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_IntersectRegion_destination, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesSubtractRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_source1;
-    int f_source2;
-    int f_destination;
-    f_source1 = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SubtractRegion_source1, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_source2 = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SubtractRegion_source2, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_destination = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SubtractRegion_destination, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesInvertRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_source;
-    int f_destination;
-    f_source = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_InvertRegion_source, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_RECTANGLE(tvb, offsetp, t, byte_order, 1);
-    f_destination = VALUE32(tvb, *offsetp);
+    struct_xproto_RECTANGLE(tvb, offsetp, t, byte_order, 1);
     proto_tree_add_item(t, hf_x11_xfixes_InvertRegion_destination, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesTranslateRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_region;
-    int f_dx;
-    int f_dy;
-    f_region = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_TranslateRegion_region, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dx = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_TranslateRegion_dx, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_dy = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_TranslateRegion_dy, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xfixesRegionExtents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_source;
-    int f_destination;
-    f_source = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_RegionExtents_source, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_destination = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_RegionExtents_destination, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesFetchRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_region;
-    f_region = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_FetchRegion_region, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xfixesFetchRegion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-FetchRegion");
 
@@ -17627,76 +15853,51 @@ static void xfixesFetchRegion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
             "sequencenumber: %d (xfixes-FetchRegion)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_RECTANGLE(tvb, offsetp, t, byte_order, 1);
+    struct_xproto_RECTANGLE(tvb, offsetp, t, byte_order, 1);
     UNUSED(16);
-    struct_RECTANGLE(tvb, offsetp, t, byte_order, (f_length / 2));
+    struct_xproto_RECTANGLE(tvb, offsetp, t, byte_order, (f_length / 2));
 }
 
 static void xfixesSetGCClipRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_gc;
-    int f_region;
-    int f_x_origin;
-    int f_y_origin;
-    f_gc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SetGCClipRegion_gc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_region = field32(tvb, offsetp, t, hf_x11_xfixes_SetGCClipRegion_region, byte_order);
-    f_x_origin = VALUE16(tvb, *offsetp);
+    field32(tvb, offsetp, t, hf_x11_xfixes_SetGCClipRegion_region, byte_order);
     proto_tree_add_item(t, hf_x11_xfixes_SetGCClipRegion_x_origin, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y_origin = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SetGCClipRegion_y_origin, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xfixesSetWindowShapeRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_dest;
-    int f_dest_kind;
-    int f_x_offset;
-    int f_y_offset;
-    int f_region;
-    f_dest = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SetWindowShapeRegion_dest, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_dest_kind = field8(tvb, offsetp, t, hf_x11_xfixes_SetWindowShapeRegion_dest_kind, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xfixes_SetWindowShapeRegion_dest_kind, byte_order);
     UNUSED(3);
-    f_x_offset = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SetWindowShapeRegion_x_offset, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y_offset = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SetWindowShapeRegion_y_offset, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_region = field32(tvb, offsetp, t, hf_x11_xfixes_SetWindowShapeRegion_region, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xfixes_SetWindowShapeRegion_region, byte_order);
 }
 
 static void xfixesSetPictureClipRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_picture;
-    int f_region;
-    int f_x_origin;
-    int f_y_origin;
-    f_picture = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SetPictureClipRegion_picture, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_region = field32(tvb, offsetp, t, hf_x11_xfixes_SetPictureClipRegion_region, byte_order);
-    f_x_origin = VALUE16(tvb, *offsetp);
+    field32(tvb, offsetp, t, hf_x11_xfixes_SetPictureClipRegion_region, byte_order);
     proto_tree_add_item(t, hf_x11_xfixes_SetPictureClipRegion_x_origin, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y_origin = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SetPictureClipRegion_y_origin, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xfixesSetCursorName(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_cursor;
     int f_nbytes;
-    f_cursor = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_SetCursorName_cursor, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_nbytes = VALUE16(tvb, *offsetp);
@@ -17709,15 +15910,12 @@ static void xfixesSetCursorName(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
 
 static void xfixesGetCursorName(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_cursor;
-    f_cursor = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorName_cursor, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xfixesGetCursorName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_atom;
+    int sequence_number;
     int f_nbytes;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetCursorName");
@@ -17728,11 +15926,9 @@ static void xfixesGetCursorName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xfixes-GetCursorName)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_atom = field32(tvb, offsetp, t, hf_x11_xfixes_GetCursorName_reply_atom, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xfixes_GetCursorName_reply_atom, byte_order);
     f_nbytes = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorName_reply_nbytes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
@@ -17745,15 +15941,9 @@ static void xfixesGetCursorImageAndName(tvbuff_t *tvb _U_, packet_info *pinfo _U
 }
 static void xfixesGetCursorImageAndName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_x;
-    int f_y;
+    int sequence_number;
     int f_width;
     int f_height;
-    int f_xhot;
-    int f_yhot;
-    int f_cursor_serial;
-    int f_cursor_atom;
     int f_nbytes;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetCursorImageAndName");
@@ -17764,14 +15954,10 @@ static void xfixesGetCursorImageAndName_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xfixes-GetCursorImageAndName)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_width = VALUE16(tvb, *offsetp);
@@ -17780,16 +15966,13 @@ static void xfixesGetCursorImageAndName_Reply(tvbuff_t *tvb, packet_info *pinfo,
     f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_xhot = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_xhot, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_yhot = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_yhot, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_cursor_serial = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_cursor_serial, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_cursor_atom = field32(tvb, offsetp, t, hf_x11_xfixes_GetCursorImageAndName_reply_cursor_atom, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xfixes_GetCursorImageAndName_reply_cursor_atom, byte_order);
     f_nbytes = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_nbytes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
@@ -17800,21 +15983,15 @@ static void xfixesGetCursorImageAndName_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void xfixesChangeCursor(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_source;
-    int f_destination;
-    f_source = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_ChangeCursor_source, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_destination = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_ChangeCursor_destination, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesChangeCursorByName(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_src;
     int f_nbytes;
-    f_src = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_ChangeCursorByName_src, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_nbytes = VALUE16(tvb, *offsetp);
@@ -17827,77 +16004,47 @@ static void xfixesChangeCursorByName(tvbuff_t *tvb, packet_info *pinfo _U_, int
 
 static void xfixesExpandRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_source;
-    int f_destination;
-    int f_left;
-    int f_right;
-    int f_top;
-    int f_bottom;
-    f_source = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_ExpandRegion_source, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_destination = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_ExpandRegion_destination, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_left = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_ExpandRegion_left, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_right = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_ExpandRegion_right, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_top = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_ExpandRegion_top, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_bottom = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_ExpandRegion_bottom, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xfixesHideCursor(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_HideCursor_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesShowCursor(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_ShowCursor_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xfixesCreatePointerBarrier(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_barrier;
-    int f_window;
-    int f_x1;
-    int f_y1;
-    int f_x2;
-    int f_y2;
-    int f_directions;
     int f_num_devices;
-    f_barrier = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreatePointerBarrier_barrier, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreatePointerBarrier_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_x1 = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreatePointerBarrier_x1, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y1 = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreatePointerBarrier_y1, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_x2 = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreatePointerBarrier_x2, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_y2 = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_CreatePointerBarrier_y2, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_directions = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xfixes_CreatePointerBarrier_directions, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -17917,8 +16064,6 @@ static void xfixesCreatePointerBarrier(tvbuff_t *tvb, packet_info *pinfo _U_, in
 
 static void xfixesDeletePointerBarrier(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_barrier;
-    f_barrier = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xfixes_DeletePointerBarrier_barrier, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
@@ -17959,7 +16104,6 @@ static const value_string xfixes_extension_minor[] = {
     { 0, NULL }
 };
 const x11_event_info xfixes_events[] = {
-    { "xfixes-SelectionNotify", xfixesSelectionNotify },
     { "xfixes-CursorNotify", xfixesCursorNotify },
     { NULL, NULL }
 };
@@ -18088,53 +16232,39 @@ static void dispatch_xfixes(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
 
 static void register_xfixes(void)
 {
-    set_handler("XFIXES", dispatch_xfixes, xfixes_errors, xfixes_events, xfixes_replies);
+    set_handler("XFIXES", dispatch_xfixes, xfixes_errors, xfixes_events, NULL, xfixes_replies);
 }
 
-static void struct_ScreenInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xinerama_ScreenInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_x_org;
-	int f_y_org;
-	int f_width;
-	int f_height;
 
-	item = proto_tree_add_item(root, hf_x11_struct_ScreenInfo, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xinerama_ScreenInfo, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_x_org = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ScreenInfo_x_org, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xinerama_ScreenInfo_x_org, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_y_org = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ScreenInfo_y_org, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xinerama_ScreenInfo_y_org, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_width = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ScreenInfo_width, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xinerama_ScreenInfo_width, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_height = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ScreenInfo_height, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xinerama_ScreenInfo_height, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
     }
 }
 
 static void xineramaQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_major;
-    int f_minor;
-    f_major = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_QueryVersion_major, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_minor = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_QueryVersion_minor, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void xineramaQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major;
-    int f_minor;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -18144,100 +16274,72 @@ static void xineramaQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinerama-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_QueryVersion_reply_major, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_minor = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_QueryVersion_reply_minor, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xineramaGetState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_GetState_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xineramaGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_state;
-    int f_window;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetState");
 
     REPLY(reply);
-    f_state = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_GetState_reply_state, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinerama-GetState)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_GetState_reply_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xineramaGetScreenCount(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_GetScreenCount_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xineramaGetScreenCount_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_screen_count;
-    int f_window;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetScreenCount");
 
     REPLY(reply);
-    f_screen_count = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_GetScreenCount_reply_screen_count, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinerama-GetScreenCount)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_GetScreenCount_reply_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xineramaGetScreenSize(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_screen;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_GetScreenSize_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_GetScreenSize_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xineramaGetScreenSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_width;
-    int f_height;
-    int f_window;
-    int f_screen;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetScreenSize");
 
@@ -18247,20 +16349,14 @@ static void xineramaGetScreenSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinerama-GetScreenSize)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_GetScreenSize_reply_width, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_height = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_GetScreenSize_reply_height, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_GetScreenSize_reply_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_screen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_GetScreenSize_reply_screen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
@@ -18270,8 +16366,7 @@ static void xineramaIsActive(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *off
 }
 static void xineramaIsActive_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_state;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-IsActive");
 
@@ -18281,11 +16376,8 @@ static void xineramaIsActive_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinerama-IsActive)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_state = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_IsActive_reply_state, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
@@ -18295,7 +16387,7 @@ static void xineramaQueryScreens(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int
 }
 static void xineramaQueryScreens_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryScreens");
@@ -18306,15 +16398,13 @@ static void xineramaQueryScreens_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinerama-QueryScreens)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_number = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinerama_QueryScreens_reply_number, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_ScreenInfo(tvb, offsetp, t, byte_order, f_number);
+    struct_xinerama_ScreenInfo(tvb, offsetp, t, byte_order, f_number);
 }
 static const value_string xinerama_extension_minor[] = {
     { 0, "QueryVersion" },
@@ -18373,7 +16463,23 @@ static void dispatch_xinerama(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
 
 static void register_xinerama(void)
 {
-    set_handler("XINERAMA", dispatch_xinerama, xinerama_errors, xinerama_events, xinerama_replies);
+    set_handler("XINERAMA", dispatch_xinerama, xinerama_errors, xinerama_events, NULL, xinerama_replies);
+}
+
+static void struct_xinput_FP3232(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_FP3232, tvb, *offsetp, 8, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_xinput_FP3232_integral, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_xinput_FP3232_frac, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+    }
 }
 
 static void xinputGetExtensionVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
@@ -18388,10 +16494,7 @@ static void xinputGetExtensionVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int
 }
 static void xinputGetExtensionVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_server_major;
-    int f_server_minor;
-    int f_present;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetExtensionVersion");
 
@@ -18401,45 +16504,33 @@ static void xinputGetExtensionVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-GetExtensionVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_server_major = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetExtensionVersion_reply_server_major, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_server_minor = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetExtensionVersion_reply_server_minor, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_present = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetExtensionVersion_reply_present, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(19);
 }
 
-static void struct_DeviceInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xinput_DeviceInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_device_type;
-	int f_device_id;
-	int f_num_class_info;
-	int f_device_use;
 
-	item = proto_tree_add_item(root, hf_x11_struct_DeviceInfo, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_DeviceInfo, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_device_type = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DeviceInfo_device_type, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xinput_DeviceInfo_device_type, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_device_id = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DeviceInfo_device_id, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xinput_DeviceInfo_device_id, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_num_class_info = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DeviceInfo_num_class_info, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xinput_DeviceInfo_num_class_info, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_device_use = field8(tvb, offsetp, t, hf_x11_struct_DeviceInfo_device_use, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xinput_DeviceInfo_device_use, byte_order);
 	UNUSED(1);
     }
 }
@@ -18449,7 +16540,7 @@ static void xinputListInputDevices(tvbuff_t *tvb _U_, packet_info *pinfo _U_, in
 }
 static void xinputListInputDevices_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_devices_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ListInputDevices");
@@ -18460,46 +16551,39 @@ static void xinputListInputDevices_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-ListInputDevices)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_devices_len = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ListInputDevices_reply_devices_len, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(23);
-    struct_DeviceInfo(tvb, offsetp, t, byte_order, f_devices_len);
+    struct_xinput_DeviceInfo(tvb, offsetp, t, byte_order, f_devices_len);
 }
 
-static void struct_InputClassInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xinput_InputClassInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_class_id;
-	int f_event_type_base;
 
-	item = proto_tree_add_item(root, hf_x11_struct_InputClassInfo, tvb, *offsetp, 2, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_InputClassInfo, tvb, *offsetp, 2, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_class_id = field8(tvb, offsetp, t, hf_x11_struct_InputClassInfo_class_id, byte_order);
-	f_event_type_base = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_InputClassInfo_event_type_base, tvb, *offsetp, 1, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xinput_InputClassInfo_class_id, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xinput_InputClassInfo_event_type_base, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
     }
 }
 
 static void xinputOpenDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_OpenDevice_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
 }
 static void xinputOpenDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_classes;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-OpenDevice");
@@ -18510,21 +16594,17 @@ static void xinputOpenDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-OpenDevice)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_classes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_OpenDevice_reply_num_classes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(23);
-    struct_InputClassInfo(tvb, offsetp, t, byte_order, f_num_classes);
+    struct_xinput_InputClassInfo(tvb, offsetp, t, byte_order, f_num_classes);
 }
 
 static void xinputCloseDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_CloseDevice_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -18532,18 +16612,14 @@ static void xinputCloseDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
 
 static void xinputSetDeviceMode(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    int f_mode;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceMode_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_mode = field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceMode_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceMode_mode, byte_order);
     UNUSED(2);
 }
 static void xinputSetDeviceMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-SetDeviceMode");
 
@@ -18553,19 +16629,15 @@ static void xinputSetDeviceMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-SetDeviceMode)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_status = field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceMode_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceMode_reply_status, byte_order);
     UNUSED(23);
 }
 
 static void xinputSelectExtensionEvent(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
     int f_num_classes;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SelectExtensionEvent_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_classes = VALUE16(tvb, *offsetp);
@@ -18578,14 +16650,12 @@ static void xinputSelectExtensionEvent(tvbuff_t *tvb, packet_info *pinfo _U_, in
 
 static void xinputGetSelectedExtensionEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetSelectedExtensionEvents_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xinputGetSelectedExtensionEvents_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_this_classes;
     int f_num_all_classes;
 
@@ -18597,8 +16667,6 @@ static void xinputGetSelectedExtensionEvents_Reply(tvbuff_t *tvb, packet_info *p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-GetSelectedExtensionEvents)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_this_classes = VALUE16(tvb, *offsetp);
@@ -18614,16 +16682,13 @@ static void xinputGetSelectedExtensionEvents_Reply(tvbuff_t *tvb, packet_info *p
 
 static void xinputChangeDeviceDontPropagateList(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
     int f_num_classes;
-    int f_mode;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceDontPropagateList_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_classes = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceDontPropagateList_num_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mode = field8(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceDontPropagateList_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceDontPropagateList_mode, byte_order);
     UNUSED(1);
     listOfCard32(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceDontPropagateList_classes, hf_x11_xinput_ChangeDeviceDontPropagateList_classes_item, f_num_classes, byte_order);
     length -= f_num_classes * 4;
@@ -18631,14 +16696,12 @@ static void xinputChangeDeviceDontPropagateList(tvbuff_t *tvb, packet_info *pinf
 
 static void xinputGetDeviceDontPropagateList(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceDontPropagateList_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xinputGetDeviceDontPropagateList_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_classes;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceDontPropagateList");
@@ -18649,8 +16712,6 @@ static void xinputGetDeviceDontPropagateList_Reply(tvbuff_t *tvb, packet_info *p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-GetDeviceDontPropagateList)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_classes = VALUE16(tvb, *offsetp);
@@ -18662,23 +16723,15 @@ static void xinputGetDeviceDontPropagateList_Reply(tvbuff_t *tvb, packet_info *p
 
 static void xinputGetDeviceMotionEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_start;
-    int f_stop;
-    int f_device_id;
-    f_start = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_start, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_stop = field32(tvb, offsetp, t, hf_x11_xinput_GetDeviceMotionEvents_stop, byte_order);
-    f_device_id = VALUE8(tvb, *offsetp);
+    field32(tvb, offsetp, t, hf_x11_xinput_GetDeviceMotionEvents_stop, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void xinputGetDeviceMotionEvents_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_num_coords;
-    int f_num_axes;
-    int f_device_mode;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceMotionEvents");
 
@@ -18688,32 +16741,25 @@ static void xinputGetDeviceMotionEvents_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-GetDeviceMotionEvents)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_coords = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_reply_num_coords, tvb, *offsetp, 4, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_reply_num_events, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_axes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_reply_num_axes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceMotionEvents_reply_device_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceMotionEvents_reply_device_mode, byte_order);
     UNUSED(18);
 }
 
 static void xinputChangeKeyboardDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangeKeyboardDevice_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
 }
 static void xinputChangeKeyboardDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ChangeKeyboardDevice");
 
@@ -18723,34 +16769,25 @@ static void xinputChangeKeyboardDevice_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-ChangeKeyboardDevice)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_status = field8(tvb, offsetp, t, hf_x11_xinput_ChangeKeyboardDevice_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_ChangeKeyboardDevice_reply_status, byte_order);
     UNUSED(23);
 }
 
 static void xinputChangePointerDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_x_axis;
-    int f_y_axis;
-    int f_device_id;
-    f_x_axis = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangePointerDevice_x_axis, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_y_axis = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangePointerDevice_y_axis, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangePointerDevice_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
 }
 static void xinputChangePointerDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ChangePointerDevice");
 
@@ -18760,36 +16797,25 @@ static void xinputChangePointerDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-ChangePointerDevice)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_status = field8(tvb, offsetp, t, hf_x11_xinput_ChangePointerDevice_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_ChangePointerDevice_reply_status, byte_order);
     UNUSED(23);
 }
 
 static void xinputGrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_grab_window;
-    int f_time;
     int f_num_classes;
-    int f_this_device_mode;
-    int f_other_device_mode;
-    int f_owner_events;
-    int f_device_id;
-    f_grab_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GrabDevice_grab_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_time = field32(tvb, offsetp, t, hf_x11_xinput_GrabDevice_time, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_GrabDevice_time, byte_order);
     f_num_classes = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GrabDevice_num_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_this_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GrabDevice_this_device_mode, byte_order);
-    f_other_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GrabDevice_other_device_mode, byte_order);
-    f_owner_events = VALUE8(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_xinput_GrabDevice_this_device_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_GrabDevice_other_device_mode, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GrabDevice_owner_events, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GrabDevice_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(2);
@@ -18798,8 +16824,7 @@ static void xinputGrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
 }
 static void xinputGrabDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GrabDevice");
 
@@ -18809,42 +16834,27 @@ static void xinputGrabDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-GrabDevice)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_status = field8(tvb, offsetp, t, hf_x11_xinput_GrabDevice_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_GrabDevice_reply_status, byte_order);
     UNUSED(23);
 }
 
 static void xinputUngrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_time;
-    int f_device_id;
-    f_time = field32(tvb, offsetp, t, hf_x11_xinput_UngrabDevice_time, byte_order);
-    f_device_id = VALUE8(tvb, *offsetp);
+    field32(tvb, offsetp, t, hf_x11_xinput_UngrabDevice_time, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_UngrabDevice_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
 static void xinputGrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_grab_window;
     int f_num_classes;
-    int f_modifiers;
-    int f_modifier_device;
-    int f_grabbed_device;
-    int f_key;
-    int f_this_device_mode;
-    int f_other_device_mode;
-    int f_owner_events;
-    f_grab_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_grab_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_classes = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_num_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_modifiers = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_modifiers, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -18859,16 +16869,13 @@ static void xinputGrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
         proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceKey_modifiers_mask_Any, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_modifier_device = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_modifier_device, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_grabbed_device = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_grabbed_device, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_key = field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceKey_key, byte_order);
-    f_this_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceKey_this_device_mode, byte_order);
-    f_other_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceKey_other_device_mode, byte_order);
-    f_owner_events = VALUE8(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceKey_key, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceKey_this_device_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceKey_other_device_mode, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_owner_events, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(2);
@@ -18878,15 +16885,8 @@ static void xinputGrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
 
 static void xinputUngrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_grabWindow;
-    int f_modifiers;
-    int f_modifier_device;
-    int f_key;
-    int f_grabbed_device;
-    f_grabWindow = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_grabWindow, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_modifiers = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_modifiers, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -18901,39 +16901,25 @@ static void xinputUngrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *of
         proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Any, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_modifier_device = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_modifier_device, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_key = field8(tvb, offsetp, t, hf_x11_xinput_UngrabDeviceKey_key, byte_order);
-    f_grabbed_device = VALUE8(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_xinput_UngrabDeviceKey_key, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_grabbed_device, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
 static void xinputGrabDeviceButton(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_grab_window;
-    int f_grabbed_device;
-    int f_modifier_device;
     int f_num_classes;
-    int f_modifiers;
-    int f_this_device_mode;
-    int f_other_device_mode;
-    int f_button;
-    int f_owner_events;
-    f_grab_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_grab_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_grabbed_device = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_grabbed_device, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_modifier_device = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_modifier_device, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_num_classes = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_num_classes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_modifiers = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_modifiers, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -18948,10 +16934,9 @@ static void xinputGrabDeviceButton(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
         proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceButton_modifiers_mask_Any, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_this_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceButton_this_device_mode, byte_order);
-    f_other_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceButton_other_device_mode, byte_order);
-    f_button = field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceButton_button, byte_order);
-    f_owner_events = VALUE8(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceButton_this_device_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceButton_other_device_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceButton_button, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_owner_events, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(2);
@@ -18961,15 +16946,8 @@ static void xinputGrabDeviceButton(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
 
 static void xinputUngrabDeviceButton(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_grab_window;
-    int f_modifiers;
-    int f_modifier_device;
-    int f_button;
-    int f_grabbed_device;
-    f_grab_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_grab_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_modifiers = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_modifiers, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -18984,41 +16962,30 @@ static void xinputUngrabDeviceButton(tvbuff_t *tvb, packet_info *pinfo _U_, int
         proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Any, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_modifier_device = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_modifier_device, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_button = field8(tvb, offsetp, t, hf_x11_xinput_UngrabDeviceButton_button, byte_order);
-    f_grabbed_device = VALUE8(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_xinput_UngrabDeviceButton_button, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_grabbed_device, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
 static void xinputAllowDeviceEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_time;
-    int f_mode;
-    int f_device_id;
-    f_time = field32(tvb, offsetp, t, hf_x11_xinput_AllowDeviceEvents_time, byte_order);
-    f_mode = field8(tvb, offsetp, t, hf_x11_xinput_AllowDeviceEvents_mode, byte_order);
-    f_device_id = VALUE8(tvb, *offsetp);
+    field32(tvb, offsetp, t, hf_x11_xinput_AllowDeviceEvents_time, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_AllowDeviceEvents_mode, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_AllowDeviceEvents_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
 static void xinputGetDeviceFocus(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceFocus_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
 }
 static void xinputGetDeviceFocus_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_focus;
-    int f_time;
-    int f_revert_to;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceFocus");
 
@@ -19028,44 +16995,63 @@ static void xinputGetDeviceFocus_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-GetDeviceFocus)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_focus = field32(tvb, offsetp, t, hf_x11_xinput_GetDeviceFocus_reply_focus, byte_order);
-    f_time = VALUE32(tvb, *offsetp);
+    field32(tvb, offsetp, t, hf_x11_xinput_GetDeviceFocus_reply_focus, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceFocus_reply_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_revert_to = field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceFocus_reply_revert_to, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceFocus_reply_revert_to, byte_order);
     UNUSED(15);
 }
 
 static void xinputSetDeviceFocus(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_focus;
-    int f_time;
-    int f_revert_to;
-    int f_device_id;
-    f_focus = field32(tvb, offsetp, t, hf_x11_xinput_SetDeviceFocus_focus, byte_order);
-    f_time = field32(tvb, offsetp, t, hf_x11_xinput_SetDeviceFocus_time, byte_order);
-    f_revert_to = field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceFocus_revert_to, byte_order);
-    f_device_id = VALUE8(tvb, *offsetp);
+    field32(tvb, offsetp, t, hf_x11_xinput_SetDeviceFocus_focus, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_SetDeviceFocus_time, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceFocus_revert_to, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceFocus_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
+static int struct_size_xinput_FeedbackState(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+{
+    int size = 0;
+    int f_len;
+    f_len = VALUE16(tvb, *offsetp + size + 2);
+    size += (f_len - 4) * 1;
+    return size + 4;
+}
+
+static void struct_xinput_FeedbackState(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+	int f_len;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_FeedbackState, tvb, *offsetp, struct_size_xinput_FeedbackState(tvb, offsetp, byte_order), ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	field8(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackState_class_id, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_feedback_id, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+	f_len = VALUE16(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_len, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackState_uninterpreted_data, (f_len - 4), byte_order);
+    }
+}
+
 static void xinputGetFeedbackControl(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetFeedbackControl_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
 }
 static void xinputGetFeedbackControl_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_num_feedback;
+    int sequence_number;
+    int f_num_feedbacks;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetFeedbackControl");
 
@@ -19075,35 +17061,68 @@ static void xinputGetFeedbackControl_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-GetFeedbackControl)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_feedback = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_GetFeedbackControl_reply_num_feedback, tvb, *offsetp, 2, byte_order);
+    f_num_feedbacks = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_GetFeedbackControl_reply_num_feedbacks, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(22);
+    struct_xinput_FeedbackState(tvb, offsetp, t, byte_order, f_num_feedbacks);
+}
+
+static int struct_size_xinput_FeedbackCtl(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+{
+    int size = 0;
+    int f_len;
+    f_len = VALUE16(tvb, *offsetp + size + 2);
+    size += (f_len - 4) * 1;
+    return size + 4;
+}
+
+static void struct_xinput_FeedbackCtl(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+	int f_len;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_FeedbackCtl, tvb, *offsetp, struct_size_xinput_FeedbackCtl(tvb, offsetp, byte_order), ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	field8(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackCtl_class_id, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_feedback_id, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+	f_len = VALUE16(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_len, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackCtl_uninterpreted_data, (f_len - 4), byte_order);
+    }
+}
+
+static void xinputChangeFeedbackControl(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_xinput_ChangeFeedbackControl_mask, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_ChangeFeedbackControl_device_id, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    proto_tree_add_item(t, hf_x11_xinput_ChangeFeedbackControl_feedback_id, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    struct_xinput_FeedbackCtl(tvb, offsetp, t, byte_order, 1);
 }
 
 static void xinputGetDeviceKeyMapping(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    int f_first_keycode;
-    int f_count;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceKeyMapping_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_first_keycode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceKeyMapping_first_keycode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_count = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceKeyMapping_count, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void xinputGetDeviceKeyMapping_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_keysyms_per_keycode;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceKeyMapping");
 
@@ -19114,10 +17133,8 @@ static void xinputGetDeviceKeyMapping_Reply(tvbuff_t *tvb, packet_info *pinfo, i
             "sequencenumber: %d (xinput-GetDeviceKeyMapping)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_keysyms_per_keycode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceKeyMapping_reply_keysyms_per_keycode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(23);
@@ -19126,14 +17143,10 @@ static void xinputGetDeviceKeyMapping_Reply(tvbuff_t *tvb, packet_info *pinfo, i
 
 static void xinputChangeDeviceKeyMapping(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    int f_first_keycode;
     int f_keysyms_per_keycode;
     int f_keycode_count;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceKeyMapping_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_first_keycode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceKeyMapping_first_keycode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_keysyms_per_keycode = VALUE8(tvb, *offsetp);
@@ -19148,15 +17161,13 @@ static void xinputChangeDeviceKeyMapping(tvbuff_t *tvb, packet_info *pinfo _U_,
 
 static void xinputGetDeviceModifierMapping(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceModifierMapping_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
 }
 static void xinputGetDeviceModifierMapping_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_keycodes_per_modifier;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceModifierMapping");
@@ -19167,8 +17178,6 @@ static void xinputGetDeviceModifierMapping_Reply(tvbuff_t *tvb, packet_info *pin
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-GetDeviceModifierMapping)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_keycodes_per_modifier = VALUE8(tvb, *offsetp);
@@ -19180,9 +17189,7 @@ static void xinputGetDeviceModifierMapping_Reply(tvbuff_t *tvb, packet_info *pin
 
 static void xinputSetDeviceModifierMapping(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
     int f_keycodes_per_modifier;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceModifierMapping_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_keycodes_per_modifier = VALUE8(tvb, *offsetp);
@@ -19194,8 +17201,7 @@ static void xinputSetDeviceModifierMapping(tvbuff_t *tvb, packet_info *pinfo _U_
 }
 static void xinputSetDeviceModifierMapping_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-SetDeviceModifierMapping");
 
@@ -19205,25 +17211,21 @@ static void xinputSetDeviceModifierMapping_Reply(tvbuff_t *tvb, packet_info *pin
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-SetDeviceModifierMapping)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_status = field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceModifierMapping_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceModifierMapping_reply_status, byte_order);
     UNUSED(23);
 }
 
 static void xinputGetDeviceButtonMapping(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceButtonMapping_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
 }
 static void xinputGetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_map_size;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceButtonMapping");
@@ -19234,8 +17236,6 @@ static void xinputGetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-GetDeviceButtonMapping)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_map_size = VALUE8(tvb, *offsetp);
@@ -19247,9 +17247,7 @@ static void xinputGetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo
 
 static void xinputSetDeviceButtonMapping(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
     int f_map_size;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceButtonMapping_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_map_size = VALUE8(tvb, *offsetp);
@@ -19261,8 +17259,7 @@ static void xinputSetDeviceButtonMapping(tvbuff_t *tvb, packet_info *pinfo _U_,
 }
 static void xinputSetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-SetDeviceButtonMapping");
 
@@ -19272,25 +17269,51 @@ static void xinputSetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-SetDeviceButtonMapping)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_status = field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceButtonMapping_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceButtonMapping_reply_status, byte_order);
     UNUSED(23);
 }
 
+static int struct_size_xinput_InputState(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+{
+    int size = 0;
+    int f_len;
+    f_len = VALUE8(tvb, *offsetp + size + 1);
+    size += (f_len - 4) * 1;
+    return size + 4;
+}
+
+static void struct_xinput_InputState(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+	int f_len;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_InputState, tvb, *offsetp, struct_size_xinput_InputState(tvb, offsetp, byte_order), ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	field8(tvb, offsetp, t, hf_x11_struct_xinput_InputState_class_id, byte_order);
+	f_len = VALUE8(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_xinput_InputState_len, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+	proto_tree_add_item(t, hf_x11_struct_xinput_InputState_num_items, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+	UNUSED(1);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_InputState_uninterpreted_data, (f_len - 4), byte_order);
+    }
+}
+
 static void xinputQueryDeviceState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_QueryDeviceState_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
 }
 static void xinputQueryDeviceState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_classes;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryDeviceState");
@@ -19301,30 +17324,23 @@ static void xinputQueryDeviceState_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-QueryDeviceState)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_classes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_QueryDeviceState_reply_num_classes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(23);
+    struct_xinput_InputState(tvb, offsetp, t, byte_order, f_num_classes);
 }
 
 static void xinputSendExtensionEvent(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_destination;
-    int f_device_id;
-    int f_propagate;
     int f_num_classes;
     int f_num_events;
-    f_destination = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_destination, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_propagate = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SendExtensionEvent_propagate, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_num_classes = VALUE16(tvb, *offsetp);
@@ -19342,33 +17358,21 @@ static void xinputSendExtensionEvent(tvbuff_t *tvb, packet_info *pinfo _U_, int
 
 static void xinputDeviceBell(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    int f_feedback_id;
-    int f_feedback_class;
-    int f_percent;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceBell_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_feedback_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceBell_feedback_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_feedback_class = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceBell_feedback_class, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_percent = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceBell_percent, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
 static void xinputSetDeviceValuators(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device_id;
-    int f_first_valuator;
     int f_num_valuators;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceValuators_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_first_valuator = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_SetDeviceValuators_first_valuator, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_num_valuators = VALUE8(tvb, *offsetp);
@@ -19380,8 +17384,7 @@ static void xinputSetDeviceValuators(tvbuff_t *tvb, packet_info *pinfo _U_, int
 }
 static void xinputSetDeviceValuators_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-SetDeviceValuators");
 
@@ -19391,30 +17394,49 @@ static void xinputSetDeviceValuators_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-SetDeviceValuators)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_status = field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceValuators_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceValuators_reply_status, byte_order);
     UNUSED(23);
 }
 
+static int struct_size_xinput_DeviceState(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+{
+    int size = 0;
+    int f_len;
+    f_len = VALUE16(tvb, *offsetp + size + 2);
+    size += (f_len - 4) * 1;
+    return size + 4;
+}
+
+static void struct_xinput_DeviceState(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+	int f_len;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_DeviceState, tvb, *offsetp, struct_size_xinput_DeviceState(tvb, offsetp, byte_order), ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	field16(tvb, offsetp, t, hf_x11_struct_xinput_DeviceState_control_id, byte_order);
+	f_len = VALUE16(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_len, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_DeviceState_uninterpreted_data, (f_len - 4), byte_order);
+    }
+}
+
 static void xinputGetDeviceControl(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_control_id;
-    int f_device_id;
-    f_control_id = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_GetDeviceControl_control_id, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_device_id = VALUE8(tvb, *offsetp);
+    field16(tvb, offsetp, t, hf_x11_xinput_GetDeviceControl_control_id, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_GetDeviceControl_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
 }
 static void xinputGetDeviceControl_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceControl");
 
@@ -19424,134 +17446,942 @@ static void xinputGetDeviceControl_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xinput-GetDeviceControl)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_status = field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceControl_reply_status, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceControl_reply_status, byte_order);
     UNUSED(23);
+    struct_xinput_DeviceState(tvb, offsetp, t, byte_order, 1);
 }
 
-static void xinputDeviceValuator(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
+static int struct_size_xinput_DeviceCtl(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
-    int f_device_id;
-    int f_device_state;
-    int f_num_valuators;
-    int f_first_valuator;
-    f_device_id = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_DeviceValuator_device_id, tvb, *offsetp, 1, byte_order);
+    int size = 0;
+    int f_len;
+    f_len = VALUE16(tvb, *offsetp + size + 2);
+    size += (f_len - 4) * 1;
+    return size + 4;
+}
+
+static void struct_xinput_DeviceCtl(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+	int f_len;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_DeviceCtl, tvb, *offsetp, struct_size_xinput_DeviceCtl(tvb, offsetp, byte_order), ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	field16(tvb, offsetp, t, hf_x11_struct_xinput_DeviceCtl_control_id, byte_order);
+	f_len = VALUE16(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_len, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_DeviceCtl_uninterpreted_data, (f_len - 4), byte_order);
+    }
+}
+
+static void xinputChangeDeviceControl(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    field16(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceControl_control_id, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceControl_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    CARD16(event_sequencenumber);
-    f_device_state = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_DeviceValuator_device_state, tvb, *offsetp, 2, byte_order);
+    UNUSED(1);
+    struct_xinput_DeviceCtl(tvb, offsetp, t, byte_order, 1);
+}
+static void xinputChangeDeviceControl_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-ChangeDeviceControl");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-ChangeDeviceControl)", sequence_number);
     *offsetp += 2;
-    f_num_valuators = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_DeviceValuator_num_valuators, tvb, *offsetp, 1, byte_order);
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field8(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceControl_reply_status, byte_order);
+    UNUSED(23);
+}
+
+static void xinputListDeviceProperties(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_xinput_ListDeviceProperties_device_id, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(3);
+}
+static void xinputListDeviceProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_num_atoms;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-ListDeviceProperties");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-ListDeviceProperties)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_atoms = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_ListDeviceProperties_reply_num_atoms, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    UNUSED(22);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_ListDeviceProperties_reply_atoms, hf_x11_xinput_ListDeviceProperties_reply_atoms_item, f_num_atoms, byte_order);
+}
+
+static void xinputChangeDeviceProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    int f_format;
+    int f_num_items;
+    proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceProperty_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceProperty_type, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceProperty_device_id, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    f_format = field8(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceProperty_format, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceProperty_mode, byte_order);
+    UNUSED(1);
+    f_num_items = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceProperty_num_items, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    if ((f_format & (1 << 3)) != 0) {
+        listOfByte(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceProperty_8Bits_data8, f_num_items, byte_order);
+        length -= f_num_items * 1;
+    }
+    if ((f_format & (1 << 4)) != 0) {
+        listOfCard16(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceProperty_16Bits_data16, hf_x11_xinput_ChangeDeviceProperty_16Bits_data16_item, f_num_items, byte_order);
+        length -= f_num_items * 2;
+    }
+    if ((f_format & (1 << 5)) != 0) {
+        listOfCard32(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceProperty_32Bits_data32, hf_x11_xinput_ChangeDeviceProperty_32Bits_data32_item, f_num_items, byte_order);
+        length -= f_num_items * 4;
+    }
+}
+
+static void xinputDeleteDeviceProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_xinput_DeleteDeviceProperty_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_DeleteDeviceProperty_device_id, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(3);
+}
+
+static void xinputGetDeviceProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_type, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_offset, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_len, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_first_valuator = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_DeviceValuator_first_valuator, tvb, *offsetp, 1, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_delete, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    listOfInt32(tvb, offsetp, t, hf_x11_xinput_DeviceValuator_valuators, hf_x11_xinput_DeviceValuator_valuators_item, 6, byte_order);
+    UNUSED(2);
+}
+static void xinputGetDeviceProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_num_items;
+    int f_format;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceProperty");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-GetDeviceProperty)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_reply_type, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_reply_bytes_after, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_items = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_reply_num_items, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_format = field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceProperty_reply_format, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_reply_device_id, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(10);
+    if ((f_format & (1 << 3)) != 0) {
+        listOfByte(tvb, offsetp, t, hf_x11_xinput_GetDeviceProperty_reply_8Bits_data8, f_num_items, byte_order);
+    }
+    if ((f_format & (1 << 4)) != 0) {
+        listOfCard16(tvb, offsetp, t, hf_x11_xinput_GetDeviceProperty_reply_16Bits_data16, hf_x11_xinput_GetDeviceProperty_reply_16Bits_data16_item, f_num_items, byte_order);
+    }
+    if ((f_format & (1 << 5)) != 0) {
+        listOfCard32(tvb, offsetp, t, hf_x11_xinput_GetDeviceProperty_reply_32Bits_data32, hf_x11_xinput_GetDeviceProperty_reply_32Bits_data32_item, f_num_items, byte_order);
+    }
+}
+
+static void struct_xinput_GroupInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_GroupInfo, tvb, *offsetp, 4, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_xinput_GroupInfo_base, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+	proto_tree_add_item(t, hf_x11_struct_xinput_GroupInfo_latched, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+	proto_tree_add_item(t, hf_x11_struct_xinput_GroupInfo_locked, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+	proto_tree_add_item(t, hf_x11_struct_xinput_GroupInfo_effective, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+    }
+}
+
+static void struct_xinput_ModifierInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_ModifierInfo, tvb, *offsetp, 16, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_xinput_ModifierInfo_base, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_xinput_ModifierInfo_latched, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_xinput_ModifierInfo_locked, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_xinput_ModifierInfo_effective, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+    }
+}
+
+static void xinputXIQueryPointer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryPointer_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field16(tvb, offsetp, t, hf_x11_xinput_XIQueryPointer_deviceid, byte_order);
+    UNUSED(2);
+}
+static void xinputXIQueryPointer_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_buttons_len;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-XIQueryPointer");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-XIQueryPointer)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryPointer_reply_root, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryPointer_reply_child, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryPointer_reply_root_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryPointer_reply_root_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryPointer_reply_win_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryPointer_reply_win_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryPointer_reply_same_screen, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(1);
+    f_buttons_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryPointer_reply_buttons_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    struct_xinput_ModifierInfo(tvb, offsetp, t, byte_order, 1);
+    struct_xinput_GroupInfo(tvb, offsetp, t, byte_order, 1);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_XIQueryPointer_reply_buttons, hf_x11_xinput_XIQueryPointer_reply_buttons_item, f_buttons_len, byte_order);
+}
+
+static void xinputXIWarpPointer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_xinput_XIWarpPointer_src_win, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIWarpPointer_dst_win, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIWarpPointer_src_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIWarpPointer_src_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIWarpPointer_src_width, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_xinput_XIWarpPointer_src_height, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_xinput_XIWarpPointer_dst_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIWarpPointer_dst_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field16(tvb, offsetp, t, hf_x11_xinput_XIWarpPointer_deviceid, byte_order);
+    UNUSED(2);
+}
+
+static void xinputXIChangeCursor(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_xinput_XIChangeCursor_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIChangeCursor_cursor, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field16(tvb, offsetp, t, hf_x11_xinput_XIChangeCursor_deviceid, byte_order);
+    UNUSED(2);
+}
+
+static int struct_size_xinput_HierarchyChange(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+{
+    int size = 0;
+    int f_len;
+    f_len = VALUE16(tvb, *offsetp + size + 2);
+    size += ((f_len * 4) - 4) * 1;
+    return size + 4;
+}
+
+static void struct_xinput_HierarchyChange(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+	int f_len;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_HierarchyChange, tvb, *offsetp, struct_size_xinput_HierarchyChange(tvb, offsetp, byte_order), ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	field16(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_type, byte_order);
+	f_len = VALUE16(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_xinput_HierarchyChange_len, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_uninterpreted_data, ((f_len * 4) - 4), byte_order);
+    }
+}
+
+static void xinputXIChangeHierarchy(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    int f_num_changes;
+    f_num_changes = VALUE8(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIChangeHierarchy_num_changes, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    struct_xinput_HierarchyChange(tvb, offsetp, t, byte_order, f_num_changes);
+    length -= f_num_changes * 0;
+}
+
+static void xinputXISetClientPointer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_xinput_XISetClientPointer_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field16(tvb, offsetp, t, hf_x11_xinput_XISetClientPointer_deviceid, byte_order);
+    UNUSED(2);
+}
+
+static void xinputXIGetClientPointer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_xinput_XIGetClientPointer_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void xinputXIGetClientPointer_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-XIGetClientPointer");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-XIGetClientPointer)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIGetClientPointer_reply_set, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(1);
+    field16(tvb, offsetp, t, hf_x11_xinput_XIGetClientPointer_reply_deviceid, byte_order);
+    UNUSED(20);
+}
+
+static int struct_size_xinput_EventMask(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+{
+    int size = 0;
+    int f_mask_len;
+    f_mask_len = VALUE16(tvb, *offsetp + size + 2);
+    size += f_mask_len * 4;
+    return size + 4;
+}
+
+static void struct_xinput_EventMask(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+	int f_mask_len;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_EventMask, tvb, *offsetp, struct_size_xinput_EventMask(tvb, offsetp, byte_order), ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	field16(tvb, offsetp, t, hf_x11_struct_xinput_EventMask_deviceid, byte_order);
+	f_mask_len = VALUE16(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_xinput_EventMask_mask_len, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_EventMask_mask, hf_x11_struct_xinput_EventMask_mask_item, f_mask_len, byte_order);
+    }
+}
+
+static void xinputXISelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    int f_num_mask;
+    proto_tree_add_item(t, hf_x11_xinput_XISelectEvents_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_mask = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XISelectEvents_num_mask, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    UNUSED(2);
+    struct_xinput_EventMask(tvb, offsetp, t, byte_order, f_num_mask);
+    length -= f_num_mask * 0;
+}
+
+static void xinputXIQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryVersion_major_version, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryVersion_minor_version, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+}
+static void xinputXIQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-XIQueryVersion");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-XIQueryVersion)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryVersion_reply_major_version, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryVersion_reply_minor_version, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    UNUSED(20);
+}
+
+static int struct_size_xinput_DeviceClass(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+{
+    int size = 0;
+    int f_len;
+    f_len = VALUE16(tvb, *offsetp + size + 2);
+    size += ((f_len * 4) - 8) * 1;
+    return size + 8;
+}
+
+static void struct_xinput_DeviceClass(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+	int f_len;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_DeviceClass, tvb, *offsetp, struct_size_xinput_DeviceClass(tvb, offsetp, byte_order), ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	field16(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_type, byte_order);
+	f_len = VALUE16(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_len, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_sourceid, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	UNUSED(2);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_uninterpreted_data, ((f_len * 4) - 8), byte_order);
+    }
+}
+
+static int struct_size_xinput_XIDeviceInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+{
+    int size = 0;
+    int i, off;
+    int f_num_classes;
+    int f_name_len;
+    f_num_classes = VALUE16(tvb, *offsetp + size + 6);
+    f_name_len = VALUE16(tvb, *offsetp + size + 8);
+    size += (((f_name_len + 3) / 4) * 4) * 1;
+    for (i = 0; i < f_num_classes; i++) {
+        off = (*offsetp) + size + 12;
+        size += struct_size_xinput_DeviceClass(tvb, &off, byte_order);
+    }
+    return size + 12;
+}
+
+static void struct_xinput_XIDeviceInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+	int f_num_classes;
+	int f_name_len;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_XIDeviceInfo, tvb, *offsetp, struct_size_xinput_XIDeviceInfo(tvb, offsetp, byte_order), ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	field16(tvb, offsetp, t, hf_x11_struct_xinput_XIDeviceInfo_deviceid, byte_order);
+	field16(tvb, offsetp, t, hf_x11_struct_xinput_XIDeviceInfo_type, byte_order);
+	field16(tvb, offsetp, t, hf_x11_struct_xinput_XIDeviceInfo_attachment, byte_order);
+	f_num_classes = VALUE16(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_xinput_XIDeviceInfo_num_classes, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	f_name_len = VALUE16(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_xinput_XIDeviceInfo_name_len, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	proto_tree_add_item(t, hf_x11_struct_xinput_XIDeviceInfo_enabled, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+	UNUSED(1);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_XIDeviceInfo_name, (((f_name_len + 3) / 4) * 4), byte_order);
+	struct_xinput_DeviceClass(tvb, offsetp, t, byte_order, f_num_classes);
+    }
+}
+
+static void xinputXIQueryDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    field16(tvb, offsetp, t, hf_x11_xinput_XIQueryDevice_deviceid, byte_order);
+    UNUSED(2);
+}
+static void xinputXIQueryDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_num_infos;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-XIQueryDevice");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-XIQueryDevice)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_infos = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIQueryDevice_reply_num_infos, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    UNUSED(22);
+    struct_xinput_XIDeviceInfo(tvb, offsetp, t, byte_order, f_num_infos);
+}
+
+static void xinputXISetFocus(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_xinput_XISetFocus_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field32(tvb, offsetp, t, hf_x11_xinput_XISetFocus_time, byte_order);
+    field16(tvb, offsetp, t, hf_x11_xinput_XISetFocus_deviceid, byte_order);
+    UNUSED(2);
+}
+
+static void xinputXIGetFocus(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    field16(tvb, offsetp, t, hf_x11_xinput_XIGetFocus_deviceid, byte_order);
+    UNUSED(2);
+}
+static void xinputXIGetFocus_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-XIGetFocus");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-XIGetFocus)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIGetFocus_reply_focus, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    UNUSED(20);
+}
+
+static void xinputXIGrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    int f_mask_len;
+    proto_tree_add_item(t, hf_x11_xinput_XIGrabDevice_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field32(tvb, offsetp, t, hf_x11_xinput_XIGrabDevice_time, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_XIGrabDevice_cursor, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field16(tvb, offsetp, t, hf_x11_xinput_XIGrabDevice_deviceid, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_XIGrabDevice_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_XIGrabDevice_paired_device_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_XIGrabDevice_owner_events, byte_order);
+    UNUSED(1);
+    f_mask_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIGrabDevice_mask_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_XIGrabDevice_mask, hf_x11_xinput_XIGrabDevice_mask_item, f_mask_len, byte_order);
+    length -= f_mask_len * 4;
+}
+static void xinputXIGrabDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-XIGrabDevice");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-XIGrabDevice)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field8(tvb, offsetp, t, hf_x11_xinput_XIGrabDevice_reply_status, byte_order);
+    UNUSED(23);
+}
+
+static void xinputXIUngrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    field32(tvb, offsetp, t, hf_x11_xinput_XIUngrabDevice_time, byte_order);
+    field16(tvb, offsetp, t, hf_x11_xinput_XIUngrabDevice_deviceid, byte_order);
+    UNUSED(2);
+}
+
+static void xinputXIAllowEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    field32(tvb, offsetp, t, hf_x11_xinput_XIAllowEvents_time, byte_order);
+    field16(tvb, offsetp, t, hf_x11_xinput_XIAllowEvents_deviceid, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_XIAllowEvents_event_mode, byte_order);
+    UNUSED(1);
+    proto_tree_add_item(t, hf_x11_xinput_XIAllowEvents_touchid, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIAllowEvents_grab_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+
+static void struct_xinput_GrabModifierInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_GrabModifierInfo, tvb, *offsetp, 8, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	field32(tvb, offsetp, t, hf_x11_struct_xinput_GrabModifierInfo_modifiers, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xinput_GrabModifierInfo_status, byte_order);
+	UNUSED(3);
+    }
+}
+
+static void xinputXIPassiveGrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    int f_num_modifiers;
+    int f_mask_len;
+    field32(tvb, offsetp, t, hf_x11_xinput_XIPassiveGrabDevice_time, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_XIPassiveGrabDevice_grab_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIPassiveGrabDevice_cursor, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIPassiveGrabDevice_detail, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field16(tvb, offsetp, t, hf_x11_xinput_XIPassiveGrabDevice_deviceid, byte_order);
+    f_num_modifiers = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIPassiveGrabDevice_num_modifiers, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    f_mask_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIPassiveGrabDevice_mask_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    field8(tvb, offsetp, t, hf_x11_xinput_XIPassiveGrabDevice_grab_type, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_XIPassiveGrabDevice_grab_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_XIPassiveGrabDevice_paired_device_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_XIPassiveGrabDevice_owner_events, byte_order);
+    UNUSED(2);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_XIPassiveGrabDevice_mask, hf_x11_xinput_XIPassiveGrabDevice_mask_item, f_mask_len, byte_order);
+    length -= f_mask_len * 4;
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_XIPassiveGrabDevice_modifiers, hf_x11_xinput_XIPassiveGrabDevice_modifiers_item, f_num_modifiers, byte_order);
+    length -= f_num_modifiers * 4;
+}
+static void xinputXIPassiveGrabDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_num_modifiers;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-XIPassiveGrabDevice");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-XIPassiveGrabDevice)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_modifiers = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIPassiveGrabDevice_reply_num_modifiers, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    UNUSED(22);
+    struct_xinput_GrabModifierInfo(tvb, offsetp, t, byte_order, f_num_modifiers);
+}
+
+static void xinputXIPassiveUngrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    int f_num_modifiers;
+    proto_tree_add_item(t, hf_x11_xinput_XIPassiveUngrabDevice_grab_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIPassiveUngrabDevice_detail, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field16(tvb, offsetp, t, hf_x11_xinput_XIPassiveUngrabDevice_deviceid, byte_order);
+    f_num_modifiers = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIPassiveUngrabDevice_num_modifiers, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    field8(tvb, offsetp, t, hf_x11_xinput_XIPassiveUngrabDevice_grab_type, byte_order);
+    UNUSED(3);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_XIPassiveUngrabDevice_modifiers, hf_x11_xinput_XIPassiveUngrabDevice_modifiers_item, f_num_modifiers, byte_order);
+    length -= f_num_modifiers * 4;
+}
+
+static void xinputXIListProperties(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    field16(tvb, offsetp, t, hf_x11_xinput_XIListProperties_deviceid, byte_order);
+    UNUSED(2);
+}
+static void xinputXIListProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_num_properties;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-XIListProperties");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-XIListProperties)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_properties = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIListProperties_reply_num_properties, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    UNUSED(22);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_XIListProperties_reply_properties, hf_x11_xinput_XIListProperties_reply_properties_item, f_num_properties, byte_order);
+}
+
+static void xinputXIChangeProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    int f_format;
+    int f_num_items;
+    field16(tvb, offsetp, t, hf_x11_xinput_XIChangeProperty_deviceid, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_XIChangeProperty_mode, byte_order);
+    f_format = field8(tvb, offsetp, t, hf_x11_xinput_XIChangeProperty_format, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_XIChangeProperty_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIChangeProperty_type, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_items = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIChangeProperty_num_items, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    if ((f_format & (1 << 3)) != 0) {
+        listOfByte(tvb, offsetp, t, hf_x11_xinput_XIChangeProperty_8Bits_data8, f_num_items, byte_order);
+        length -= f_num_items * 1;
+    }
+    if ((f_format & (1 << 4)) != 0) {
+        listOfCard16(tvb, offsetp, t, hf_x11_xinput_XIChangeProperty_16Bits_data16, hf_x11_xinput_XIChangeProperty_16Bits_data16_item, f_num_items, byte_order);
+        length -= f_num_items * 2;
+    }
+    if ((f_format & (1 << 5)) != 0) {
+        listOfCard32(tvb, offsetp, t, hf_x11_xinput_XIChangeProperty_32Bits_data32, hf_x11_xinput_XIChangeProperty_32Bits_data32_item, f_num_items, byte_order);
+        length -= f_num_items * 4;
+    }
+}
+
+static void xinputXIDeleteProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    field16(tvb, offsetp, t, hf_x11_xinput_XIDeleteProperty_deviceid, byte_order);
+    UNUSED(2);
+    proto_tree_add_item(t, hf_x11_xinput_XIDeleteProperty_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+
+static void xinputXIGetProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    field16(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_deviceid, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_XIGetProperty_delete, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    UNUSED(1);
+    proto_tree_add_item(t, hf_x11_xinput_XIGetProperty_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIGetProperty_type, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIGetProperty_offset, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIGetProperty_len, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void xinputXIGetProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_num_items;
+    int f_format;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-XIGetProperty");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-XIGetProperty)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIGetProperty_reply_type, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_XIGetProperty_reply_bytes_after, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_items = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIGetProperty_reply_num_items, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_format = field8(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_reply_format, byte_order);
+    UNUSED(11);
+    if ((f_format & (1 << 3)) != 0) {
+        listOfByte(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_reply_8Bits_data8, f_num_items, byte_order);
+    }
+    if ((f_format & (1 << 4)) != 0) {
+        listOfCard16(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_reply_16Bits_data16, hf_x11_xinput_XIGetProperty_reply_16Bits_data16_item, f_num_items, byte_order);
+    }
+    if ((f_format & (1 << 5)) != 0) {
+        listOfCard32(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_reply_32Bits_data32, hf_x11_xinput_XIGetProperty_reply_32Bits_data32_item, f_num_items, byte_order);
+    }
+}
+
+static void xinputXIGetSelectedEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    proto_tree_add_item(t, hf_x11_xinput_XIGetSelectedEvents_window, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+}
+static void xinputXIGetSelectedEvents_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int sequence_number;
+    int f_num_masks;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-XIGetSelectedEvents");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (xinput-XIGetSelectedEvents)", sequence_number);
+    *offsetp += 2;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_num_masks = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIGetSelectedEvents_reply_num_masks, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    UNUSED(22);
+    struct_xinput_EventMask(tvb, offsetp, t, byte_order, f_num_masks);
+}
+
+static void struct_xinput_BarrierReleasePointerInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_BarrierReleasePointerInfo, tvb, *offsetp, 12, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_xinput_BarrierReleasePointerInfo_deviceid, tvb, *offsetp, 2, byte_order);
+	*offsetp += 2;
+	UNUSED(2);
+	proto_tree_add_item(t, hf_x11_struct_xinput_BarrierReleasePointerInfo_barrier, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	proto_tree_add_item(t, hf_x11_struct_xinput_BarrierReleasePointerInfo_eventid, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+    }
+}
+
+static void xinputXIBarrierReleasePointer(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
+{
+    int f_num_barriers;
+    f_num_barriers = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_XIBarrierReleasePointer_num_barriers, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    struct_xinput_BarrierReleasePointerInfo(tvb, offsetp, t, byte_order, f_num_barriers);
+    length -= f_num_barriers * 12;
 }
 
 static void xinputDeviceKeyPress(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_detail;
-    int f_time;
-    int f_root;
-    int f_event;
-    int f_child;
-    int f_root_x;
-    int f_root_y;
-    int f_event_x;
-    int f_event_y;
-    int f_state;
-    int f_same_screen;
-    int f_device_id;
-    f_detail = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_detail, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_root = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_root, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_event = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_event, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_child = field32(tvb, offsetp, t, hf_x11_xinput_DeviceKeyPress_child, byte_order);
-    f_root_x = VALUE16(tvb, *offsetp);
+    field32(tvb, offsetp, t, hf_x11_xinput_DeviceKeyPress_child, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_root_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_root_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_root_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_event_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_event_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_event_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_event_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_state = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_state, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_same_screen = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_same_screen, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
-static void xinputFocusIn(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
+
+static void xinputDeviceFocusIn(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_detail;
-    int f_time;
-    int f_window;
-    int f_mode;
-    int f_device_id;
-    f_detail = field8(tvb, offsetp, t, hf_x11_xinput_FocusIn_detail, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_DeviceFocusIn_detail, byte_order);
     CARD16(event_sequencenumber);
-    f_time = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_FocusIn_time, tvb, *offsetp, 4, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_DeviceFocusIn_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_window = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_FocusIn_window, tvb, *offsetp, 4, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_DeviceFocusIn_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mode = field8(tvb, offsetp, t, hf_x11_xinput_FocusIn_mode, byte_order);
-    f_device_id = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_FocusIn_device_id, tvb, *offsetp, 1, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_DeviceFocusIn_mode, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_DeviceFocusIn_device_id, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(18);
 }
 
+
 static void xinputDeviceStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_device_id;
-    int f_time;
-    int f_num_keys;
-    int f_num_buttons;
-    int f_num_valuators;
-    int f_classes_reported;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceStateNotify_device_id, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceStateNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_num_keys = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceStateNotify_num_keys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_num_buttons = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceStateNotify_num_buttons, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_num_valuators = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceStateNotify_num_valuators, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_classes_reported = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceStateNotify_classes_reported, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     listOfByte(tvb, offsetp, t, hf_x11_xinput_DeviceStateNotify_buttons, 4, byte_order);
@@ -19559,93 +18389,472 @@ static void xinputDeviceStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     listOfCard32(tvb, offsetp, t, hf_x11_xinput_DeviceStateNotify_valuators, hf_x11_xinput_DeviceStateNotify_valuators_item, 3, byte_order);
 }
 
+
 static void xinputDeviceMappingNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_device_id;
-    int f_request;
-    int f_first_keycode;
-    int f_count;
-    int f_time;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceMappingNotify_device_id, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_request = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceMappingNotify_request, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_first_keycode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceMappingNotify_first_keycode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_count = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceMappingNotify_count, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceMappingNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
 }
 
+
 static void xinputChangeDeviceNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_device_id;
-    int f_time;
-    int f_request;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceNotify_device_id, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_request = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceNotify_request, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(23);
 }
 
+
 static void xinputDeviceKeyStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_device_id;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceKeyStateNotify_device_id, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
     CARD16(event_sequencenumber);
     listOfByte(tvb, offsetp, t, hf_x11_xinput_DeviceKeyStateNotify_keys, 28, byte_order);
 }
 
+
 static void xinputDeviceButtonStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_device_id;
-    f_device_id = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DeviceButtonStateNotify_device_id, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
     CARD16(event_sequencenumber);
     listOfByte(tvb, offsetp, t, hf_x11_xinput_DeviceButtonStateNotify_buttons, 28, byte_order);
 }
 
+
 static void xinputDevicePresenceNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_time;
-    int f_devchange;
-    int f_device_id;
-    int f_control;
     UNUSED(1);
     CARD16(event_sequencenumber);
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DevicePresenceNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_devchange = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xinput_DevicePresenceNotify_devchange, tvb, *offsetp, 1, ENC_NA);
-    *offsetp += 1;
-    f_device_id = VALUE8(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_xinput_DevicePresenceNotify_devchange, byte_order);
     proto_tree_add_item(t, hf_x11_xinput_DevicePresenceNotify_device_id, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    f_control = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xinput_DevicePresenceNotify_control, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(20);
 }
+
+
+static void xinputDevicePropertyNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
+{
+    field8(tvb, offsetp, t, hf_x11_xinput_DevicePropertyNotify_state, byte_order);
+    CARD16(event_sequencenumber);
+    proto_tree_add_item(t, hf_x11_xinput_DevicePropertyNotify_time, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_DevicePropertyNotify_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    UNUSED(19);
+    proto_tree_add_item(t, hf_x11_xinput_DevicePropertyNotify_device_id, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+}
+
+
+static void xinputDeviceChanged(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int f_num_classes;
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 1,
+                               "opcode: DeviceChanged (1)");
+    field16(tvb, offsetp, t, hf_x11_xinput_DeviceChanged_deviceid, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_DeviceChanged_time, byte_order);
+    f_num_classes = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_DeviceChanged_num_classes, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    field16(tvb, offsetp, t, hf_x11_xinput_DeviceChanged_sourceid, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_DeviceChanged_reason, byte_order);
+    UNUSED(11);
+    struct_xinput_DeviceClass(tvb, offsetp, t, byte_order, f_num_classes);
+}
+
+
+static void xinputKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int f_buttons_len;
+    int f_valuators_len;
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 2,
+                               "opcode: KeyPress (2)");
+    field16(tvb, offsetp, t, hf_x11_xinput_KeyPress_deviceid, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_KeyPress_time, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_KeyPress_detail, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_KeyPress_root, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_KeyPress_event, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_KeyPress_child, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_KeyPress_root_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_KeyPress_root_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_KeyPress_event_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_KeyPress_event_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_buttons_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_KeyPress_buttons_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    f_valuators_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_KeyPress_valuators_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    field16(tvb, offsetp, t, hf_x11_xinput_KeyPress_sourceid, byte_order);
+    UNUSED(2);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_KeyPress_flags, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_KeyPress_flags_mask_KeyRepeat, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    struct_xinput_ModifierInfo(tvb, offsetp, t, byte_order, 1);
+    struct_xinput_GroupInfo(tvb, offsetp, t, byte_order, 1);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_KeyPress_button_mask, hf_x11_xinput_KeyPress_button_mask_item, f_buttons_len, byte_order);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_KeyPress_valuator_mask, hf_x11_xinput_KeyPress_valuator_mask_item, f_valuators_len, byte_order);
+}
+
+
+static void xinputButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int f_buttons_len;
+    int f_valuators_len;
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 4,
+                               "opcode: ButtonPress (4)");
+    field16(tvb, offsetp, t, hf_x11_xinput_ButtonPress_deviceid, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_ButtonPress_time, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_ButtonPress_detail, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_ButtonPress_root, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_ButtonPress_event, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_ButtonPress_child, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_ButtonPress_root_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_ButtonPress_root_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_ButtonPress_event_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_ButtonPress_event_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_buttons_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_ButtonPress_buttons_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    f_valuators_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_ButtonPress_valuators_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    field16(tvb, offsetp, t, hf_x11_xinput_ButtonPress_sourceid, byte_order);
+    UNUSED(2);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_ButtonPress_flags, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_ButtonPress_flags_mask_PointerEmulated, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    struct_xinput_ModifierInfo(tvb, offsetp, t, byte_order, 1);
+    struct_xinput_GroupInfo(tvb, offsetp, t, byte_order, 1);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_ButtonPress_button_mask, hf_x11_xinput_ButtonPress_button_mask_item, f_buttons_len, byte_order);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_ButtonPress_valuator_mask, hf_x11_xinput_ButtonPress_valuator_mask_item, f_valuators_len, byte_order);
+}
+
+
+static void xinputEnter(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int f_buttons_len;
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 7,
+                               "opcode: Enter (7)");
+    field16(tvb, offsetp, t, hf_x11_xinput_Enter_deviceid, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_Enter_time, byte_order);
+    field16(tvb, offsetp, t, hf_x11_xinput_Enter_sourceid, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_Enter_mode, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xinput_Enter_detail, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_Enter_root, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_Enter_event, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_Enter_child, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_Enter_root_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_Enter_root_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_Enter_event_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_Enter_event_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_Enter_same_screen, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    proto_tree_add_item(t, hf_x11_xinput_Enter_focus, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
+    f_buttons_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_Enter_buttons_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    struct_xinput_ModifierInfo(tvb, offsetp, t, byte_order, 1);
+    struct_xinput_GroupInfo(tvb, offsetp, t, byte_order, 1);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_Enter_buttons, hf_x11_xinput_Enter_buttons_item, f_buttons_len, byte_order);
+}
+
+
+static void struct_xinput_HierarchyInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xinput_HierarchyInfo, tvb, *offsetp, 12, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	field16(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyInfo_deviceid, byte_order);
+	field16(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyInfo_attachment, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyInfo_type, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xinput_HierarchyInfo_enabled, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+	UNUSED(2);
+	{
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xinput_HierarchyInfo_flags, tvb, *offsetp, 4, byte_order);
+	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xinput_HierarchyInfo_flags_mask_MasterAdded, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xinput_HierarchyInfo_flags_mask_MasterRemoved, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xinput_HierarchyInfo_flags_mask_SlaveAdded, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xinput_HierarchyInfo_flags_mask_SlaveRemoved, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xinput_HierarchyInfo_flags_mask_SlaveAttached, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xinput_HierarchyInfo_flags_mask_SlaveDetached, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xinput_HierarchyInfo_flags_mask_DeviceEnabled, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xinput_HierarchyInfo_flags_mask_DeviceDisabled, tvb, *offsetp, 4, byte_order);
+	}
+	*offsetp += 4;
+    }
+}
+
+static void xinputHierarchy(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int f_num_infos;
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 11,
+                               "opcode: Hierarchy (11)");
+    field16(tvb, offsetp, t, hf_x11_xinput_Hierarchy_deviceid, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_Hierarchy_time, byte_order);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_Hierarchy_flags, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_Hierarchy_flags_mask_MasterAdded, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_Hierarchy_flags_mask_MasterRemoved, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_Hierarchy_flags_mask_SlaveAdded, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_Hierarchy_flags_mask_SlaveRemoved, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_Hierarchy_flags_mask_SlaveAttached, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_Hierarchy_flags_mask_SlaveDetached, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_Hierarchy_flags_mask_DeviceEnabled, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_Hierarchy_flags_mask_DeviceDisabled, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    f_num_infos = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_Hierarchy_num_infos, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    UNUSED(10);
+    struct_xinput_HierarchyInfo(tvb, offsetp, t, byte_order, f_num_infos);
+}
+
+
+static void xinputProperty(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 12,
+                               "opcode: Property (12)");
+    field16(tvb, offsetp, t, hf_x11_xinput_Property_deviceid, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_Property_time, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_Property_property, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field8(tvb, offsetp, t, hf_x11_xinput_Property_what, byte_order);
+    UNUSED(11);
+}
+
+
+static void xinputRawKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int f_valuators_len;
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 13,
+                               "opcode: RawKeyPress (13)");
+    field16(tvb, offsetp, t, hf_x11_xinput_RawKeyPress_deviceid, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_RawKeyPress_time, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_RawKeyPress_detail, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_RawKeyPress_sourceid, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    f_valuators_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_RawKeyPress_valuators_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_RawKeyPress_flags, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_RawKeyPress_flags_mask_KeyRepeat, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    UNUSED(4);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_RawKeyPress_valuator_mask, hf_x11_xinput_RawKeyPress_valuator_mask_item, f_valuators_len, byte_order);
+}
+
+
+static void xinputRawButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int f_valuators_len;
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 15,
+                               "opcode: RawButtonPress (15)");
+    field16(tvb, offsetp, t, hf_x11_xinput_RawButtonPress_deviceid, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_RawButtonPress_time, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_RawButtonPress_detail, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_RawButtonPress_sourceid, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    f_valuators_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_RawButtonPress_valuators_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_RawButtonPress_flags, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_RawButtonPress_flags_mask_PointerEmulated, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    UNUSED(4);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_RawButtonPress_valuator_mask, hf_x11_xinput_RawButtonPress_valuator_mask_item, f_valuators_len, byte_order);
+}
+
+
+static void xinputTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int f_buttons_len;
+    int f_valuators_len;
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 18,
+                               "opcode: TouchBegin (18)");
+    field16(tvb, offsetp, t, hf_x11_xinput_TouchBegin_deviceid, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_TouchBegin_time, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_TouchBegin_detail, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_TouchBegin_root, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_TouchBegin_event, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_TouchBegin_child, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_TouchBegin_root_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_TouchBegin_root_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_TouchBegin_event_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_TouchBegin_event_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    f_buttons_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_TouchBegin_buttons_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    f_valuators_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_TouchBegin_valuators_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    field16(tvb, offsetp, t, hf_x11_xinput_TouchBegin_sourceid, byte_order);
+    UNUSED(2);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_TouchBegin_flags, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_TouchBegin_flags_mask_TouchPendingEnd, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_TouchBegin_flags_mask_TouchEmulatingPointer, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    struct_xinput_ModifierInfo(tvb, offsetp, t, byte_order, 1);
+    struct_xinput_GroupInfo(tvb, offsetp, t, byte_order, 1);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_TouchBegin_button_mask, hf_x11_xinput_TouchBegin_button_mask_item, f_buttons_len, byte_order);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_TouchBegin_valuator_mask, hf_x11_xinput_TouchBegin_valuator_mask_item, f_valuators_len, byte_order);
+}
+
+
+static void xinputTouchOwnership(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 21,
+                               "opcode: TouchOwnership (21)");
+    field16(tvb, offsetp, t, hf_x11_xinput_TouchOwnership_deviceid, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_TouchOwnership_time, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_TouchOwnership_touchid, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_TouchOwnership_root, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_TouchOwnership_event, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_TouchOwnership_child, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field16(tvb, offsetp, t, hf_x11_xinput_TouchOwnership_sourceid, byte_order);
+    UNUSED(2);
+    field32(tvb, offsetp, t, hf_x11_xinput_TouchOwnership_flags, byte_order);
+    UNUSED(8);
+}
+
+
+static void xinputRawTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    int f_valuators_len;
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 22,
+                               "opcode: RawTouchBegin (22)");
+    field16(tvb, offsetp, t, hf_x11_xinput_RawTouchBegin_deviceid, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_RawTouchBegin_time, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_RawTouchBegin_detail, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_RawTouchBegin_sourceid, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    f_valuators_len = VALUE16(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_xinput_RawTouchBegin_valuators_len, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_RawTouchBegin_flags, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_RawTouchBegin_flags_mask_TouchPendingEnd, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xinput_RawTouchBegin_flags_mask_TouchEmulatingPointer, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    UNUSED(4);
+    listOfCard32(tvb, offsetp, t, hf_x11_xinput_RawTouchBegin_valuator_mask, hf_x11_xinput_RawTouchBegin_valuator_mask_item, f_valuators_len, byte_order);
+}
+
+
+static void xinputBarrierHit(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order)
+{
+    proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 25,
+                               "opcode: BarrierHit (25)");
+    field16(tvb, offsetp, t, hf_x11_xinput_BarrierHit_deviceid, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xinput_BarrierHit_time, byte_order);
+    proto_tree_add_item(t, hf_x11_xinput_BarrierHit_eventid, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_BarrierHit_root, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_BarrierHit_event, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_BarrierHit_barrier, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_BarrierHit_dtime, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_BarrierHit_flags, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    field16(tvb, offsetp, t, hf_x11_xinput_BarrierHit_sourceid, byte_order);
+    UNUSED(2);
+    proto_tree_add_item(t, hf_x11_xinput_BarrierHit_root_x, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xinput_BarrierHit_root_y, tvb, *offsetp, 4, byte_order);
+    *offsetp += 4;
+    struct_xinput_FP3232(tvb, offsetp, t, byte_order, 1);
+    struct_xinput_FP3232(tvb, offsetp, t, byte_order, 1);
+}
+
 static const value_string xinput_extension_minor[] = {
     { 1, "GetExtensionVersion" },
     { 2, "ListInputDevices" },
@@ -19669,6 +18878,7 @@ static const value_string xinput_extension_minor[] = {
     { 20, "GetDeviceFocus" },
     { 21, "SetDeviceFocus" },
     { 22, "GetFeedbackControl" },
+    { 23, "ChangeFeedbackControl" },
     { 24, "GetDeviceKeyMapping" },
     { 25, "ChangeDeviceKeyMapping" },
     { 26, "GetDeviceModifierMapping" },
@@ -19680,20 +18890,63 @@ static const value_string xinput_extension_minor[] = {
     { 32, "DeviceBell" },
     { 33, "SetDeviceValuators" },
     { 34, "GetDeviceControl" },
+    { 35, "ChangeDeviceControl" },
+    { 36, "ListDeviceProperties" },
+    { 37, "ChangeDeviceProperty" },
+    { 38, "DeleteDeviceProperty" },
+    { 39, "GetDeviceProperty" },
+    { 40, "XIQueryPointer" },
+    { 41, "XIWarpPointer" },
+    { 42, "XIChangeCursor" },
+    { 43, "XIChangeHierarchy" },
+    { 44, "XISetClientPointer" },
+    { 45, "XIGetClientPointer" },
+    { 46, "XISelectEvents" },
+    { 47, "XIQueryVersion" },
+    { 48, "XIQueryDevice" },
+    { 49, "XISetFocus" },
+    { 50, "XIGetFocus" },
+    { 51, "XIGrabDevice" },
+    { 52, "XIUngrabDevice" },
+    { 53, "XIAllowEvents" },
+    { 54, "XIPassiveGrabDevice" },
+    { 55, "XIPassiveUngrabDevice" },
+    { 56, "XIListProperties" },
+    { 57, "XIChangeProperty" },
+    { 58, "XIDeleteProperty" },
+    { 59, "XIGetProperty" },
+    { 60, "XIGetSelectedEvents" },
+    { 61, "XIBarrierReleasePointer" },
     { 0, NULL }
 };
 const x11_event_info xinput_events[] = {
-    { "xinput-DeviceValuator", xinputDeviceValuator },
     { "xinput-DeviceKeyPress", xinputDeviceKeyPress },
-    { "xinput-FocusIn", xinputFocusIn },
+    { "xinput-DeviceFocusIn", xinputDeviceFocusIn },
     { "xinput-DeviceStateNotify", xinputDeviceStateNotify },
     { "xinput-DeviceMappingNotify", xinputDeviceMappingNotify },
     { "xinput-ChangeDeviceNotify", xinputChangeDeviceNotify },
     { "xinput-DeviceKeyStateNotify", xinputDeviceKeyStateNotify },
     { "xinput-DeviceButtonStateNotify", xinputDeviceButtonStateNotify },
     { "xinput-DevicePresenceNotify", xinputDevicePresenceNotify },
+    { "xinput-DevicePropertyNotify", xinputDevicePropertyNotify },
     { NULL, NULL }
 };
+static const x11_generic_event_info xinput_generic_events[] = {
+	{   1, xinputDeviceChanged },
+	{   2, xinputKeyPress },
+	{   4, xinputButtonPress },
+	{   7, xinputEnter },
+	{  11, xinputHierarchy },
+	{  12, xinputProperty },
+	{  13, xinputRawKeyPress },
+	{  15, xinputRawButtonPress },
+	{  18, xinputTouchBegin },
+	{  21, xinputTouchOwnership },
+	{  22, xinputRawTouchBegin },
+	{  25, xinputBarrierHit },
+	{   0, NULL },
+};
+
 static x11_reply_info xinput_replies[] = {
     { 1, xinputGetExtensionVersion_Reply },
     { 2, xinputListInputDevices_Reply },
@@ -19715,6 +18968,19 @@ static x11_reply_info xinput_replies[] = {
     { 30, xinputQueryDeviceState_Reply },
     { 33, xinputSetDeviceValuators_Reply },
     { 34, xinputGetDeviceControl_Reply },
+    { 35, xinputChangeDeviceControl_Reply },
+    { 36, xinputListDeviceProperties_Reply },
+    { 39, xinputGetDeviceProperty_Reply },
+    { 40, xinputXIQueryPointer_Reply },
+    { 45, xinputXIGetClientPointer_Reply },
+    { 47, xinputXIQueryVersion_Reply },
+    { 48, xinputXIQueryDevice_Reply },
+    { 50, xinputXIGetFocus_Reply },
+    { 51, xinputXIGrabDevice_Reply },
+    { 54, xinputXIPassiveGrabDevice_Reply },
+    { 56, xinputXIListProperties_Reply },
+    { 59, xinputXIGetProperty_Reply },
+    { 60, xinputXIGetSelectedEvents_Reply },
     { 0, NULL }
 };
 
@@ -19794,6 +19060,9 @@ static void dispatch_xinput(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     case 22:
 	xinputGetFeedbackControl(tvb, pinfo, offsetp, t, byte_order, length);
 	break;
+    case 23:
+	xinputChangeFeedbackControl(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
     case 24:
 	xinputGetDeviceKeyMapping(tvb, pinfo, offsetp, t, byte_order, length);
 	break;
@@ -19827,6 +19096,87 @@ static void dispatch_xinput(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     case 34:
 	xinputGetDeviceControl(tvb, pinfo, offsetp, t, byte_order, length);
 	break;
+    case 35:
+	xinputChangeDeviceControl(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 36:
+	xinputListDeviceProperties(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 37:
+	xinputChangeDeviceProperty(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 38:
+	xinputDeleteDeviceProperty(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 39:
+	xinputGetDeviceProperty(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 40:
+	xinputXIQueryPointer(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 41:
+	xinputXIWarpPointer(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 42:
+	xinputXIChangeCursor(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 43:
+	xinputXIChangeHierarchy(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 44:
+	xinputXISetClientPointer(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 45:
+	xinputXIGetClientPointer(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 46:
+	xinputXISelectEvents(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 47:
+	xinputXIQueryVersion(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 48:
+	xinputXIQueryDevice(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 49:
+	xinputXISetFocus(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 50:
+	xinputXIGetFocus(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 51:
+	xinputXIGrabDevice(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 52:
+	xinputXIUngrabDevice(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 53:
+	xinputXIAllowEvents(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 54:
+	xinputXIPassiveGrabDevice(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 55:
+	xinputXIPassiveUngrabDevice(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 56:
+	xinputXIListProperties(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 57:
+	xinputXIChangeProperty(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 58:
+	xinputXIDeleteProperty(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 59:
+	xinputXIGetProperty(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 60:
+	xinputXIGetSelectedEvents(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
+    case 61:
+	xinputXIBarrierReleasePointer(tvb, pinfo, offsetp, t, byte_order, length);
+	break;
     /* No need for a default case here, since Unknown is printed above,
        and UNDECODED() is taken care of by dissect_x11_request */
     }
@@ -19834,211 +19184,191 @@ static void dispatch_xinput(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
 
 static void register_xinput(void)
 {
-    set_handler("XInputExtension", dispatch_xinput, xinput_errors, xinput_events, xinput_replies);
+    set_handler("XInputExtension", dispatch_xinput, xinput_errors, xinput_events, xinput_generic_events, xinput_replies);
 }
 
-static void struct_AXOption(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order, int count)
+static void struct_xkb_IndicatorMap(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
-    int base = *offsetp;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_fbopt;
-	int f_skopt;
-	item = proto_tree_add_item(root, hf_x11_union_AXOption, tvb, base, 2, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-
-        *offsetp = base;
-	f_fbopt = field16(tvb, offsetp, t, hf_x11_union_AXOption_fbopt, byte_order);
-        *offsetp = base;
-	f_skopt = field16(tvb, offsetp, t, hf_x11_union_AXOption_skopt, byte_order);
-        base += 2;
-    }
-    *offsetp = base;
-}
 
-static void struct_IndicatorMap(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_flags;
-	int f_whichGroups;
-	int f_groups;
-	int f_whichMods;
-	int f_mods;
-	int f_realMods;
-	int f_vmods;
-	int f_ctrls;
-
-	item = proto_tree_add_item(root, hf_x11_struct_IndicatorMap, tvb, *offsetp, 12, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_IndicatorMap, tvb, *offsetp, 12, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_flags = field8(tvb, offsetp, t, hf_x11_struct_IndicatorMap_flags, byte_order);
-	f_whichGroups = field8(tvb, offsetp, t, hf_x11_struct_IndicatorMap_whichGroups, byte_order);
-	f_groups = field8(tvb, offsetp, t, hf_x11_struct_IndicatorMap_groups, byte_order);
-	f_whichMods = field8(tvb, offsetp, t, hf_x11_struct_IndicatorMap_whichMods, byte_order);
-	f_mods = VALUE8(tvb, *offsetp);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_IndicatorMap_flags, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_IndicatorMap_whichGroups, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_IndicatorMap_groups, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_IndicatorMap_whichMods, byte_order);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_IndicatorMap_mods, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_IndicatorMap_mods, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_mods_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_mods_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_mods_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_mods_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_mods_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_mods_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_mods_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_mods_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_mods_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_mods_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_mods_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_mods_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_mods_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_mods_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_mods_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_mods_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_mods_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_mods_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_realMods = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_IndicatorMap_realMods, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_IndicatorMap_realMods, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_realMods_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_realMods_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_realMods_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_realMods_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_realMods_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_realMods_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_realMods_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_realMods_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_realMods_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_realMods_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_realMods_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_realMods_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_realMods_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_realMods_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_realMods_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_realMods_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_vmods = VALUE16(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_IndicatorMap_vmods, tvb, *offsetp, 2, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_IndicatorMap_vmods, tvb, *offsetp, 2, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_0, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_1, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_2, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_3, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_4, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_5, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_6, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_7, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_8, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_9, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_10, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_11, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_12, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_13, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_14, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_IndicatorMap_vmods_mask_15, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_0, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_1, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_2, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_3, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_4, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_5, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_6, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_7, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_8, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_9, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_10, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_11, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_12, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_13, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_14, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_vmods_mask_15, tvb, *offsetp, 2, byte_order);
 	}
 	*offsetp += 2;
-	f_ctrls = field32(tvb, offsetp, t, hf_x11_struct_IndicatorMap_ctrls, byte_order);
+	{
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_IndicatorMap_ctrls, tvb, *offsetp, 4, byte_order);
+	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_RepeatKeys, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_SlowKeys, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_BounceKeys, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_StickyKeys, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_MouseKeys, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_MouseKeysAccel, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_AccessXKeys, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_AccessXTimeoutMask, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_AccessXFeedbackMask, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_AudibleBellMask, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_Overlay1Mask, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_Overlay2Mask, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_IndicatorMap_ctrls_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
+	}
+	*offsetp += 4;
     }
 }
 
-static void struct_ModDef(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_ModDef(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_mask;
-	int f_realMods;
-	int f_vmods;
 
-	item = proto_tree_add_item(root, hf_x11_struct_ModDef, tvb, *offsetp, 4, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_ModDef, tvb, *offsetp, 4, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_mask = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_ModDef_mask, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_ModDef_mask, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_mask_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_mask_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_mask_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_mask_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_mask_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_mask_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_mask_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_mask_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_mask_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_mask_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_mask_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_mask_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_mask_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_mask_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_realMods = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_ModDef_realMods, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_ModDef_realMods, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_realMods_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_realMods_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_realMods_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_realMods_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_realMods_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_realMods_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_realMods_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_realMods_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_realMods_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_realMods_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_realMods_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_realMods_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_realMods_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_realMods_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_realMods_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_realMods_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_vmods = VALUE16(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_ModDef_vmods, tvb, *offsetp, 2, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_ModDef_vmods, tvb, *offsetp, 2, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_0, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_1, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_2, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_3, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_4, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_5, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_6, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_7, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_8, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_9, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_10, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_11, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_12, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_13, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_14, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_ModDef_vmods_mask_15, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_0, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_1, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_2, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_3, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_4, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_5, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_6, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_7, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_8, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_9, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_10, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_11, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_12, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_13, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_14, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_ModDef_vmods_mask_15, tvb, *offsetp, 2, byte_order);
 	}
 	*offsetp += 2;
     }
 }
 
-static void struct_KeyName(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_KeyName(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
 
-	item = proto_tree_add_item(root, hf_x11_struct_KeyName, tvb, *offsetp, 1, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_KeyName, tvb, *offsetp, 1, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	listOfByte(tvb, offsetp, t, hf_x11_struct_KeyName_name, 4, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_KeyName_name, 4, byte_order);
     }
 }
 
-static void struct_KeyAlias(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_KeyAlias(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
 
-	item = proto_tree_add_item(root, hf_x11_struct_KeyAlias, tvb, *offsetp, 2, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_KeyAlias, tvb, *offsetp, 2, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	listOfByte(tvb, offsetp, t, hf_x11_struct_KeyAlias_real, 4, byte_order);
-	listOfByte(tvb, offsetp, t, hf_x11_struct_KeyAlias_alias, 4, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_KeyAlias_real, 4, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_KeyAlias_alias, 4, byte_order);
     }
 }
 
-static int struct_size_CountedString16(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_xkb_CountedString16(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_length;
     f_length = VALUE16(tvb, *offsetp + size + 0);
     size += f_length * 1;
-    return size + 3;
+    size += (((f_length + 5) & (~3)) - (f_length + 2)) * 1;
+    return size + 2;
 }
 
-static void struct_CountedString16(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_CountedString16(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
@@ -20046,93 +19376,83 @@ static void struct_CountedString16(tvbuff_t *tvb, int *offsetp, proto_tree *root
 	proto_tree *t;
 	int f_length;
 
-	item = proto_tree_add_item(root, hf_x11_struct_CountedString16, tvb, *offsetp, struct_size_CountedString16(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_CountedString16, tvb, *offsetp, struct_size_xkb_CountedString16(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
 	f_length = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CountedString16_length, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_CountedString16_length, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	listOfByte(tvb, offsetp, t, hf_x11_struct_CountedString16_string, f_length, byte_order);
-	UNUSED(1);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_CountedString16_string, f_length, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_CountedString16_alignment_pad, (((f_length + 5) & (~3)) - (f_length + 2)), byte_order);
     }
 }
 
-static void struct_KTMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_KTMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_active;
-	int f_level;
-	int f_mods_mask;
-	int f_mods_mods;
-	int f_mods_vmods;
 
-	item = proto_tree_add_item(root, hf_x11_struct_KTMapEntry, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_KTMapEntry, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_active = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_KTMapEntry_active, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_level = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_KTMapEntry_level, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_KTMapEntry_active, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_mods_mask = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_KTMapEntry_mods_mask, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_KTMapEntry_mods_mask, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mask_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mask_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mask_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mask_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mask_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mask_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mask_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mask_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mask_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mask_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mask_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mask_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mask_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mask_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_mods_mods = VALUE8(tvb, *offsetp);
+	proto_tree_add_item(t, hf_x11_struct_xkb_KTMapEntry_level, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_KTMapEntry_mods_mods, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_KTMapEntry_mods_mods, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mods_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mods_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mods_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mods_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mods_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mods_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mods_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mods_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mods_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mods_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mods_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mods_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mods_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mods_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mods_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mods_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mods_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_mods_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_mods_vmods = VALUE16(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_KTMapEntry_mods_vmods, tvb, *offsetp, 2, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_KTMapEntry_mods_vmods, tvb, *offsetp, 2, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_0, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_1, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_2, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_3, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_4, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_5, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_6, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_7, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_8, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_9, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_10, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_11, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_12, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_13, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_14, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_vmods_mask_15, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_0, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_1, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_2, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_3, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_4, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_5, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_6, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_7, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_8, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_9, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_10, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_11, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_12, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_13, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_14, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTMapEntry_mods_vmods_mask_15, tvb, *offsetp, 2, byte_order);
 	}
 	*offsetp += 2;
 	UNUSED(2);
     }
 }
 
-static int struct_size_KeyType(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_xkb_KeyType(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_nMapEntries;
@@ -20144,89 +19464,81 @@ static int struct_size_KeyType(tvbuff_t *tvb, int *offsetp, guint byte_order _U_
     return size + 8;
 }
 
-static void struct_KeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_KeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_mods_mask;
-	int f_mods_mods;
-	int f_mods_vmods;
-	int f_numLevels;
 	int f_nMapEntries;
 	int f_hasPreserve;
 
-	item = proto_tree_add_item(root, hf_x11_struct_KeyType, tvb, *offsetp, struct_size_KeyType(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_KeyType, tvb, *offsetp, struct_size_xkb_KeyType(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_mods_mask = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_KeyType_mods_mask, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_KeyType_mods_mask, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mask_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mask_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mask_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mask_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mask_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mask_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mask_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mask_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mask_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mask_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mask_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mask_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mask_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mask_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_mods_mods = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_KeyType_mods_mods, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_KeyType_mods_mods, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mods_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mods_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mods_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mods_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mods_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mods_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mods_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mods_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_mods_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mods_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mods_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mods_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mods_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mods_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mods_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mods_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mods_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_mods_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_mods_vmods = VALUE16(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_KeyType_mods_vmods, tvb, *offsetp, 2, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_KeyType_mods_vmods, tvb, *offsetp, 2, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_0, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_1, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_2, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_3, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_4, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_5, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_6, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_7, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_8, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_9, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_10, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_11, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_12, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_13, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_14, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyType_mods_vmods_mask_15, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_0, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_1, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_2, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_3, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_4, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_5, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_6, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_7, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_8, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_9, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_10, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_11, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_12, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_13, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_14, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyType_mods_vmods_mask_15, tvb, *offsetp, 2, byte_order);
 	}
 	*offsetp += 2;
-	f_numLevels = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_KeyType_numLevels, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_KeyType_numLevels, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	f_nMapEntries = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_KeyType_nMapEntries, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_KeyType_nMapEntries, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	f_hasPreserve = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_KeyType_hasPreserve, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_KeyType_hasPreserve, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(1);
-	struct_KTMapEntry(tvb, offsetp, t, byte_order, f_nMapEntries);
-	struct_ModDef(tvb, offsetp, t, byte_order, (f_hasPreserve * f_nMapEntries));
+	struct_xkb_KTMapEntry(tvb, offsetp, t, byte_order, f_nMapEntries);
+	struct_xkb_ModDef(tvb, offsetp, t, byte_order, (f_hasPreserve * f_nMapEntries));
     }
 }
 
-static int struct_size_KeySymMap(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_xkb_KeySymMap(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_nSyms;
@@ -20235,346 +19547,286 @@ static int struct_size_KeySymMap(tvbuff_t *tvb, int *offsetp, guint byte_order _
     return size + 8;
 }
 
-static void struct_KeySymMap(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_KeySymMap(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_groupInfo;
-	int f_width;
 	int f_nSyms;
 
-	item = proto_tree_add_item(root, hf_x11_struct_KeySymMap, tvb, *offsetp, struct_size_KeySymMap(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_KeySymMap, tvb, *offsetp, struct_size_xkb_KeySymMap(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	listOfByte(tvb, offsetp, t, hf_x11_struct_KeySymMap_kt_index, 4, byte_order);
-	f_groupInfo = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_KeySymMap_groupInfo, tvb, *offsetp, 1, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_KeySymMap_kt_index, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_KeySymMap_groupInfo, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_width = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_KeySymMap_width, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_KeySymMap_width, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	f_nSyms = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_KeySymMap_nSyms, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_KeySymMap_nSyms, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	listOfCard32(tvb, offsetp, t, hf_x11_struct_KeySymMap_syms, hf_x11_struct_KeySymMap_syms_item, f_nSyms, byte_order);
+	listOfCard32(tvb, offsetp, t, hf_x11_struct_xkb_KeySymMap_syms, hf_x11_struct_xkb_KeySymMap_syms_item, f_nSyms, byte_order);
     }
 }
 
-static void struct_CommonBehavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_CommonBehavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_data;
 
-	item = proto_tree_add_item(root, hf_x11_struct_CommonBehavior, tvb, *offsetp, 2, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_CommonBehavior, tvb, *offsetp, 2, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CommonBehavior_type, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_CommonBehavior_type, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_data = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CommonBehavior_data, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_CommonBehavior_data, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
     }
 }
 
-static void struct_DefaultBehavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_DefaultBehavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
 
-	item = proto_tree_add_item(root, hf_x11_struct_DefaultBehavior, tvb, *offsetp, 2, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_DefaultBehavior, tvb, *offsetp, 2, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DefaultBehavior_type, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_DefaultBehavior_type, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(1);
     }
 }
 
-static void struct_RadioGroupBehavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_type;
-	int f_group;
-
-	item = proto_tree_add_item(root, hf_x11_struct_RadioGroupBehavior, tvb, *offsetp, 2, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_RadioGroupBehavior_type, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_group = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_RadioGroupBehavior_group, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-    }
-}
-
-static void struct_Overlay1Behavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_RadioGroupBehavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_key;
 
-	item = proto_tree_add_item(root, hf_x11_struct_Overlay1Behavior, tvb, *offsetp, 2, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_RadioGroupBehavior, tvb, *offsetp, 2, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Overlay1Behavior_type, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_RadioGroupBehavior_type, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_key = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Overlay1Behavior_key, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_RadioGroupBehavior_group, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
     }
 }
 
-static void struct_Overlay2Behavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_OverlayBehavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_key;
 
-	item = proto_tree_add_item(root, hf_x11_struct_Overlay2Behavior, tvb, *offsetp, 2, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_OverlayBehavior, tvb, *offsetp, 2, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Overlay2Behavior_type, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_OverlayBehavior_type, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_key = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Overlay2Behavior_key, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_OverlayBehavior_key, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
     }
 }
 
-static void struct_Behavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order, int count)
+static void struct_xkb_Behavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order, int count)
 {
     int i;
     int base = *offsetp;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	item = proto_tree_add_item(root, hf_x11_union_Behavior, tvb, base, 2, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_union_xkb_Behavior, tvb, base, 2, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
 
         *offsetp = base;
-	struct_CommonBehavior(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_CommonBehavior(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_DefaultBehavior(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_DefaultBehavior(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_DefaultBehavior(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_DefaultBehavior(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_RadioGroupBehavior(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_RadioGroupBehavior(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_Overlay1Behavior(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_OverlayBehavior(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_Overlay2Behavior(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_OverlayBehavior(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_DefaultBehavior(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_DefaultBehavior(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_RadioGroupBehavior(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_RadioGroupBehavior(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_Overlay1Behavior(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_OverlayBehavior(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_Overlay2Behavior(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_OverlayBehavior(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	f_type = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_union_Behavior_type, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_union_xkb_Behavior_type, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
         base += 2;
     }
     *offsetp = base;
 }
 
-static void struct_SetBehavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SetBehavior(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_keycode;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SetBehavior, tvb, *offsetp, 4, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SetBehavior, tvb, *offsetp, 4, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_keycode = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SetBehavior_keycode, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SetBehavior_keycode, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	struct_Behavior(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_Behavior(tvb, offsetp, t, byte_order, 1);
 	UNUSED(1);
     }
 }
 
-static void struct_SetExplicit(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SetExplicit(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_keycode;
-	int f_explicit;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SetExplicit, tvb, *offsetp, 2, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SetExplicit, tvb, *offsetp, 2, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_keycode = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SetExplicit_keycode, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SetExplicit_keycode, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_explicit = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SetExplicit_explicit, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SetExplicit_explicit, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetExplicit_explicit_mask_KeyType1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetExplicit_explicit_mask_KeyType2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetExplicit_explicit_mask_KeyType3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetExplicit_explicit_mask_KeyType4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetExplicit_explicit_mask_Interpret, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetExplicit_explicit_mask_AutoRepeat, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetExplicit_explicit_mask_Behavior, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetExplicit_explicit_mask_VModMap, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetExplicit_explicit_mask_KeyType1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetExplicit_explicit_mask_KeyType2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetExplicit_explicit_mask_KeyType3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetExplicit_explicit_mask_KeyType4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetExplicit_explicit_mask_Interpret, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetExplicit_explicit_mask_AutoRepeat, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetExplicit_explicit_mask_Behavior, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetExplicit_explicit_mask_VModMap, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
     }
 }
 
-static void struct_KeyModMap(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_KeyModMap(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_keycode;
-	int f_mods;
 
-	item = proto_tree_add_item(root, hf_x11_struct_KeyModMap, tvb, *offsetp, 2, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_KeyModMap, tvb, *offsetp, 2, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_keycode = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_KeyModMap_keycode, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_KeyModMap_keycode, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_mods = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_KeyModMap_mods, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_KeyModMap_mods, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyModMap_mods_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyModMap_mods_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyModMap_mods_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyModMap_mods_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyModMap_mods_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyModMap_mods_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyModMap_mods_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyModMap_mods_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyModMap_mods_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyModMap_mods_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyModMap_mods_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyModMap_mods_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyModMap_mods_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyModMap_mods_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyModMap_mods_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyModMap_mods_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyModMap_mods_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyModMap_mods_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
     }
 }
 
-static void struct_KeyVModMap(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_KeyVModMap(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_keycode;
-	int f_vmods;
 
-	item = proto_tree_add_item(root, hf_x11_struct_KeyVModMap, tvb, *offsetp, 4, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_KeyVModMap, tvb, *offsetp, 4, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_keycode = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_KeyVModMap_keycode, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_KeyVModMap_keycode, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(1);
-	f_vmods = VALUE16(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_KeyVModMap_vmods, tvb, *offsetp, 2, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_KeyVModMap_vmods, tvb, *offsetp, 2, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_0, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_1, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_2, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_3, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_4, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_5, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_6, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_7, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_8, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_9, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_10, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_11, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_12, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_13, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_14, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KeyVModMap_vmods_mask_15, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_0, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_1, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_2, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_3, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_4, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_5, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_6, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_7, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_8, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_9, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_10, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_11, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_12, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_13, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_14, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KeyVModMap_vmods_mask_15, tvb, *offsetp, 2, byte_order);
 	}
 	*offsetp += 2;
     }
 }
 
-static void struct_KTSetMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_KTSetMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_level;
-	int f_realMods;
-	int f_virtualMods;
 
-	item = proto_tree_add_item(root, hf_x11_struct_KTSetMapEntry, tvb, *offsetp, 4, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_KTSetMapEntry, tvb, *offsetp, 4, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_level = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_KTSetMapEntry_level, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_KTSetMapEntry_level, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_realMods = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_KTSetMapEntry_realMods, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_KTSetMapEntry_realMods, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_realMods_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_realMods_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_realMods_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_realMods_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_realMods_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_realMods_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_realMods_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_realMods_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_realMods_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_realMods_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_realMods_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_realMods_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_realMods_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_realMods_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_realMods_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_realMods_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_virtualMods = VALUE16(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_KTSetMapEntry_virtualMods, tvb, *offsetp, 2, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_KTSetMapEntry_virtualMods, tvb, *offsetp, 2, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_0, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_1, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_2, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_3, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_4, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_5, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_6, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_7, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_8, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_9, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_10, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_11, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_12, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_13, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_14, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_KTSetMapEntry_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_0, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_1, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_2, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_3, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_4, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_5, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_6, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_7, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_8, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_9, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_10, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_11, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_12, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_13, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_14, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_KTSetMapEntry_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
 	}
 	*offsetp += 2;
     }
 }
 
-static int struct_size_SetKeyType(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_xkb_SetKeyType(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_nMapEntries;
@@ -20586,661 +19838,81 @@ static int struct_size_SetKeyType(tvbuff_t *tvb, int *offsetp, guint byte_order
     return size + 8;
 }
 
-static void struct_SetKeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SetKeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_mask;
-	int f_realMods;
-	int f_virtualMods;
-	int f_numLevels;
 	int f_nMapEntries;
 	int f_preserve;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SetKeyType, tvb, *offsetp, struct_size_SetKeyType(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SetKeyType, tvb, *offsetp, struct_size_xkb_SetKeyType(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_mask = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SetKeyType_mask, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SetKeyType_mask, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_mask_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_mask_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_mask_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_mask_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_mask_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_mask_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_mask_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_mask_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_mask_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_mask_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_mask_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_mask_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_mask_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_mask_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_realMods = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SetKeyType_realMods, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SetKeyType_realMods, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_realMods_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_realMods_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_realMods_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_realMods_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_realMods_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_realMods_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_realMods_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_realMods_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_realMods_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_realMods_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_realMods_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_realMods_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_realMods_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_realMods_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_realMods_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_realMods_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_virtualMods = VALUE16(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SetKeyType_virtualMods, tvb, *offsetp, 2, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SetKeyType_virtualMods, tvb, *offsetp, 2, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_0, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_1, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_2, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_3, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_4, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_5, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_6, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_7, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_8, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_9, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_10, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_11, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_12, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_13, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_14, tvb, *offsetp, 2, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SetKeyType_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_0, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_1, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_2, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_3, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_4, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_5, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_6, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_7, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_8, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_9, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_10, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_11, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_12, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_13, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_14, tvb, *offsetp, 2, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SetKeyType_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
 	}
 	*offsetp += 2;
-	f_numLevels = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SetKeyType_numLevels, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SetKeyType_numLevels, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	f_nMapEntries = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SetKeyType_nMapEntries, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SetKeyType_nMapEntries, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	f_preserve = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SetKeyType_preserve, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SetKeyType_preserve, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(1);
-	struct_KTSetMapEntry(tvb, offsetp, t, byte_order, f_nMapEntries);
-	struct_KTSetMapEntry(tvb, offsetp, t, byte_order, (f_preserve * f_nMapEntries));
-    }
-}
-
-static int struct_size_Property(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
-{
-    int size = 0;
-    int f_valueLength;
-    int f_nameLength;
-    f_nameLength = VALUE16(tvb, *offsetp + size + 0);
-    size += f_nameLength * 1;
-    f_valueLength = VALUE16(tvb, *offsetp + size + 2);
-    size += f_valueLength * 1;
-    return size + 4;
-}
-
-static void struct_Property(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_nameLength;
-	int f_valueLength;
-
-	item = proto_tree_add_item(root, hf_x11_struct_Property, tvb, *offsetp, struct_size_Property(tvb, offsetp, byte_order), ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_nameLength = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Property_nameLength, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	listOfByte(tvb, offsetp, t, hf_x11_struct_Property_name, f_nameLength, byte_order);
-	f_valueLength = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Property_valueLength, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	listOfByte(tvb, offsetp, t, hf_x11_struct_Property_value, f_valueLength, byte_order);
-    }
-}
-
-static int struct_size_Outline(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
-{
-    int size = 0;
-    int f_nPoints;
-    f_nPoints = VALUE8(tvb, *offsetp + size + 0);
-    size += f_nPoints * 4;
-    return size + 4;
-}
-
-static void struct_Outline(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_nPoints;
-	int f_cornerRadius;
-
-	item = proto_tree_add_item(root, hf_x11_struct_Outline, tvb, *offsetp, struct_size_Outline(tvb, offsetp, byte_order), ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_nPoints = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Outline_nPoints, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_cornerRadius = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Outline_cornerRadius, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	UNUSED(2);
-	struct_POINT(tvb, offsetp, t, byte_order, f_nPoints);
-    }
-}
-
-static int struct_size_Shape(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
-{
-    int size = 0;
-    int i, off;
-    int f_nOutlines;
-    f_nOutlines = VALUE8(tvb, *offsetp + size + 4);
-    for (i = 0; i < f_nOutlines; i++) {
-        off = (*offsetp) + size + 8;
-        size += struct_size_Outline(tvb, &off, byte_order);
-    }
-    return size + 8;
-}
-
-static void struct_Shape(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_name;
-	int f_nOutlines;
-	int f_primaryNdx;
-	int f_approxNdx;
-
-	item = proto_tree_add_item(root, hf_x11_struct_Shape, tvb, *offsetp, struct_size_Shape(tvb, offsetp, byte_order), ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_name = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Shape_name, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_nOutlines = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Shape_nOutlines, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_primaryNdx = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Shape_primaryNdx, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_approxNdx = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Shape_approxNdx, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	UNUSED(1);
-	struct_Outline(tvb, offsetp, t, byte_order, f_nOutlines);
-    }
-}
-
-static void struct_Key(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_gap;
-	int f_shapeNdx;
-	int f_colorNdx;
-
-	item = proto_tree_add_item(root, hf_x11_struct_Key, tvb, *offsetp, 5, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	listOfByte(tvb, offsetp, t, hf_x11_struct_Key_name, 4, byte_order);
-	f_gap = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Key_gap, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_shapeNdx = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Key_shapeNdx, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_colorNdx = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Key_colorNdx, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-    }
-}
-
-static void struct_OverlayKey(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-
-	item = proto_tree_add_item(root, hf_x11_struct_OverlayKey, tvb, *offsetp, 2, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	listOfByte(tvb, offsetp, t, hf_x11_struct_OverlayKey_over, 4, byte_order);
-	listOfByte(tvb, offsetp, t, hf_x11_struct_OverlayKey_under, 4, byte_order);
-    }
-}
-
-static int struct_size_OverlayRow(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
-{
-    int size = 0;
-    int f_nKeys;
-    f_nKeys = VALUE8(tvb, *offsetp + size + 1);
-    size += f_nKeys * 2;
-    return size + 4;
-}
-
-static void struct_OverlayRow(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_rowUnder;
-	int f_nKeys;
-
-	item = proto_tree_add_item(root, hf_x11_struct_OverlayRow, tvb, *offsetp, struct_size_OverlayRow(tvb, offsetp, byte_order), ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_rowUnder = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_OverlayRow_rowUnder, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_nKeys = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_OverlayRow_nKeys, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	UNUSED(2);
-	struct_OverlayKey(tvb, offsetp, t, byte_order, f_nKeys);
+	struct_xkb_KTSetMapEntry(tvb, offsetp, t, byte_order, f_nMapEntries);
+	struct_xkb_KTSetMapEntry(tvb, offsetp, t, byte_order, (f_preserve * f_nMapEntries));
     }
 }
 
-static int struct_size_Overlay(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
-{
-    int size = 0;
-    int i, off;
-    int f_nRows;
-    f_nRows = VALUE8(tvb, *offsetp + size + 4);
-    for (i = 0; i < f_nRows; i++) {
-        off = (*offsetp) + size + 8;
-        size += struct_size_OverlayRow(tvb, &off, byte_order);
-    }
-    return size + 8;
-}
-
-static void struct_Overlay(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_name;
-	int f_nRows;
-
-	item = proto_tree_add_item(root, hf_x11_struct_Overlay, tvb, *offsetp, struct_size_Overlay(tvb, offsetp, byte_order), ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_name = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Overlay_name, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_nRows = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Overlay_nRows, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	UNUSED(3);
-	struct_OverlayRow(tvb, offsetp, t, byte_order, f_nRows);
-    }
-}
-
-static int struct_size_Row(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
-{
-    int size = 0;
-    int f_nKeys;
-    f_nKeys = VALUE8(tvb, *offsetp + size + 4);
-    size += f_nKeys * 5;
-    return size + 8;
-}
-
-static void struct_Row(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_top;
-	int f_left;
-	int f_nKeys;
-	int f_vertical;
-
-	item = proto_tree_add_item(root, hf_x11_struct_Row, tvb, *offsetp, struct_size_Row(tvb, offsetp, byte_order), ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_top = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Row_top, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_left = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Row_left, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_nKeys = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Row_nKeys, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_vertical = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Row_vertical, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	UNUSED(2);
-	struct_Key(tvb, offsetp, t, byte_order, f_nKeys);
-    }
-}
-
-static void struct_CommonDoodad(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_name;
-	int f_type;
-	int f_priority;
-	int f_top;
-	int f_left;
-	int f_angle;
-
-	item = proto_tree_add_item(root, hf_x11_struct_CommonDoodad, tvb, *offsetp, 12, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_name = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CommonDoodad_name, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_CommonDoodad_type, byte_order);
-	f_priority = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CommonDoodad_priority, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_top = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CommonDoodad_top, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_left = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CommonDoodad_left, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_angle = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_CommonDoodad_angle, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-    }
-}
-
-static void struct_ShapeDoodad(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_name;
-	int f_type;
-	int f_priority;
-	int f_top;
-	int f_left;
-	int f_angle;
-	int f_colorNdx;
-	int f_shapeNdx;
-
-	item = proto_tree_add_item(root, hf_x11_struct_ShapeDoodad, tvb, *offsetp, 20, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_name = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ShapeDoodad_name, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_ShapeDoodad_type, byte_order);
-	f_priority = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ShapeDoodad_priority, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_top = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ShapeDoodad_top, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_left = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ShapeDoodad_left, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_angle = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ShapeDoodad_angle, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_colorNdx = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ShapeDoodad_colorNdx, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_shapeNdx = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ShapeDoodad_shapeNdx, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	UNUSED(6);
-    }
-}
-
-static void struct_TextDoodad(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_name;
-	int f_type;
-	int f_priority;
-	int f_top;
-	int f_left;
-	int f_angle;
-	int f_width;
-	int f_height;
-	int f_colorNdx;
-
-	item = proto_tree_add_item(root, hf_x11_struct_TextDoodad, tvb, *offsetp, 20, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_name = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TextDoodad_name, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_TextDoodad_type, byte_order);
-	f_priority = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TextDoodad_priority, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_top = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TextDoodad_top, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_left = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TextDoodad_left, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_angle = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TextDoodad_angle, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_width = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TextDoodad_width, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_height = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TextDoodad_height, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_colorNdx = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_TextDoodad_colorNdx, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	UNUSED(3);
-	struct_CountedString16(tvb, offsetp, t, byte_order, 1);
-	struct_CountedString16(tvb, offsetp, t, byte_order, 1);
-    }
-}
-
-static void struct_IndicatorDoodad(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_name;
-	int f_type;
-	int f_priority;
-	int f_top;
-	int f_left;
-	int f_angle;
-	int f_shapeNdx;
-	int f_onColorNdx;
-	int f_offColorNdx;
-
-	item = proto_tree_add_item(root, hf_x11_struct_IndicatorDoodad, tvb, *offsetp, 20, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_name = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_IndicatorDoodad_name, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_IndicatorDoodad_type, byte_order);
-	f_priority = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_IndicatorDoodad_priority, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_top = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_IndicatorDoodad_top, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_left = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_IndicatorDoodad_left, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_angle = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_IndicatorDoodad_angle, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_shapeNdx = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_IndicatorDoodad_shapeNdx, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_onColorNdx = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_IndicatorDoodad_onColorNdx, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_offColorNdx = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_IndicatorDoodad_offColorNdx, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	UNUSED(5);
-    }
-}
-
-static void struct_LogoDoodad(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_name;
-	int f_type;
-	int f_priority;
-	int f_top;
-	int f_left;
-	int f_angle;
-	int f_colorNdx;
-	int f_shapeNdx;
-
-	item = proto_tree_add_item(root, hf_x11_struct_LogoDoodad, tvb, *offsetp, 20, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_name = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_LogoDoodad_name, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_LogoDoodad_type, byte_order);
-	f_priority = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_LogoDoodad_priority, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_top = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_LogoDoodad_top, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_left = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_LogoDoodad_left, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_angle = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_LogoDoodad_angle, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_colorNdx = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_LogoDoodad_colorNdx, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_shapeNdx = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_LogoDoodad_shapeNdx, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	UNUSED(6);
-	struct_CountedString16(tvb, offsetp, t, byte_order, 1);
-    }
-}
-
-static void struct_Doodad(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order, int count)
-{
-    int i;
-    int base = *offsetp;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	item = proto_tree_add_item(root, hf_x11_union_Doodad, tvb, base, 20, ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-
-        *offsetp = base;
-	struct_CommonDoodad(tvb, offsetp, t, byte_order, 1);
-        *offsetp = base;
-	struct_ShapeDoodad(tvb, offsetp, t, byte_order, 1);
-        *offsetp = base;
-	struct_TextDoodad(tvb, offsetp, t, byte_order, 1);
-        *offsetp = base;
-	struct_IndicatorDoodad(tvb, offsetp, t, byte_order, 1);
-        *offsetp = base;
-	struct_LogoDoodad(tvb, offsetp, t, byte_order, 1);
-        base += 20;
-    }
-    *offsetp = base;
-}
-
-static int struct_size_Section(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
-{
-    int size = 0;
-    int i, off;
-    int f_nOverlays;
-    int f_nDoodads;
-    int f_nRows;
-    f_nRows = VALUE8(tvb, *offsetp + size + 15);
-    f_nDoodads = VALUE8(tvb, *offsetp + size + 16);
-    f_nOverlays = VALUE8(tvb, *offsetp + size + 17);
-    for (i = 0; i < f_nRows; i++) {
-        off = (*offsetp) + size + 20;
-        size += struct_size_Row(tvb, &off, byte_order);
-    }
-    size += f_nDoodads * 20;
-    for (i = 0; i < f_nOverlays; i++) {
-        off = (*offsetp) + size + 20;
-        size += struct_size_Overlay(tvb, &off, byte_order);
-    }
-    return size + 20;
-}
-
-static void struct_Section(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
-{
-    int i;
-    for (i = 0; i < count; i++) {
-	proto_item *item;
-	proto_tree *t;
-	int f_name;
-	int f_top;
-	int f_left;
-	int f_width;
-	int f_height;
-	int f_angle;
-	int f_priority;
-	int f_nRows;
-	int f_nDoodads;
-	int f_nOverlays;
-
-	item = proto_tree_add_item(root, hf_x11_struct_Section, tvb, *offsetp, struct_size_Section(tvb, offsetp, byte_order), ENC_NA);
-	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_name = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Section_name, tvb, *offsetp, 4, byte_order);
-	*offsetp += 4;
-	f_top = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Section_top, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_left = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Section_left, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_width = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Section_width, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_height = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Section_height, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_angle = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Section_angle, tvb, *offsetp, 2, byte_order);
-	*offsetp += 2;
-	f_priority = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Section_priority, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_nRows = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Section_nRows, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_nDoodads = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Section_nDoodads, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	f_nOverlays = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Section_nOverlays, tvb, *offsetp, 1, byte_order);
-	*offsetp += 1;
-	UNUSED(2);
-	struct_Row(tvb, offsetp, t, byte_order, f_nRows);
-	struct_Doodad(tvb, offsetp, t, byte_order, f_nDoodads);
-	struct_Overlay(tvb, offsetp, t, byte_order, f_nOverlays);
-    }
-}
-
-static int struct_size_Listing(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_xkb_Listing(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_length;
@@ -21249,28 +19921,26 @@ static int struct_size_Listing(tvbuff_t *tvb, int *offsetp, guint byte_order _U_
     return size + 4;
 }
 
-static void struct_Listing(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_Listing(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_flags;
 	int f_length;
 
-	item = proto_tree_add_item(root, hf_x11_struct_Listing, tvb, *offsetp, struct_size_Listing(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_Listing, tvb, *offsetp, struct_size_xkb_Listing(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_flags = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Listing_flags, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_Listing_flags, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
 	f_length = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Listing_length, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_Listing_length, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	listOfByte(tvb, offsetp, t, hf_x11_struct_Listing_string, f_length, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_Listing_string, f_length, byte_order);
     }
 }
 
-static int struct_size_DeviceLedInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_xkb_DeviceLedInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_mapsPresent;
@@ -21282,774 +19952,707 @@ static int struct_size_DeviceLedInfo(tvbuff_t *tvb, int *offsetp, guint byte_ord
     return size + 20;
 }
 
-static void struct_DeviceLedInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_DeviceLedInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_ledClass;
-	int f_ledID;
 	int f_namesPresent;
 	int f_mapsPresent;
-	int f_physIndicators;
-	int f_state;
 
-	item = proto_tree_add_item(root, hf_x11_struct_DeviceLedInfo, tvb, *offsetp, struct_size_DeviceLedInfo(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_DeviceLedInfo, tvb, *offsetp, struct_size_xkb_DeviceLedInfo(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_ledClass = field16(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_ledClass, byte_order);
-	f_ledID = field16(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_ledID, byte_order);
+	field16(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_ledClass, byte_order);
+	field16(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_ledID, byte_order);
 	f_namesPresent = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DeviceLedInfo_namesPresent, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_DeviceLedInfo_namesPresent, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
 	f_mapsPresent = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DeviceLedInfo_mapsPresent, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_DeviceLedInfo_mapsPresent, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_physIndicators = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DeviceLedInfo_physIndicators, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_DeviceLedInfo_physIndicators, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_state = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_DeviceLedInfo_state, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_DeviceLedInfo_state, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	listOfCard32(tvb, offsetp, t, hf_x11_struct_DeviceLedInfo_names, hf_x11_struct_DeviceLedInfo_names_item, popcount(f_namesPresent), byte_order);
-	struct_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_mapsPresent));
+	listOfCard32(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_names, hf_x11_struct_xkb_DeviceLedInfo_names_item, popcount(f_namesPresent), byte_order);
+	struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_mapsPresent));
     }
 }
 
-static void struct_SANoAction(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SANoAction(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SANoAction, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SANoAction, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SANoAction_type, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SANoAction_type, byte_order);
 	UNUSED(7);
     }
 }
 
-static void struct_SASetMods(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SASetMods(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_flags;
-	int f_mask;
-	int f_realMods;
-	int f_vmodsHigh;
-	int f_vmodsLow;
-
-	item = proto_tree_add_item(root, hf_x11_struct_SASetMods, tvb, *offsetp, 8, ENC_NA);
+
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SASetMods, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SASetMods_type, byte_order);
-	f_flags = VALUE8(tvb, *offsetp);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SASetMods_type, byte_order);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SASetMods_flags, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SASetMods_flags, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_flags_mask_ClearLocks, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_flags_mask_LatchToLock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_flags_mask_GroupAbsolute, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_flags_mask_ClearLocks, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_flags_mask_LatchToLock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_flags_mask_GroupAbsolute, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_mask = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SASetMods_mask, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SASetMods_mask, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_mask_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_mask_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_mask_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_mask_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_mask_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_mask_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_mask_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_mask_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_mask_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_mask_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_mask_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_mask_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_mask_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_mask_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_realMods = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SASetMods_realMods, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SASetMods_realMods, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_realMods_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_realMods_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_realMods_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_realMods_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_realMods_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_realMods_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_realMods_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_realMods_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_realMods_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_realMods_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_realMods_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_realMods_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_realMods_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_realMods_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_realMods_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_realMods_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_vmodsHigh = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SASetMods_vmodsHigh, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SASetMods_vmodsHigh, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsHigh_mask_8, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsHigh_mask_9, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsHigh_mask_10, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsHigh_mask_11, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsHigh_mask_12, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsHigh_mask_13, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsHigh_mask_14, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsHigh_mask_15, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsHigh_mask_8, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsHigh_mask_9, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsHigh_mask_10, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsHigh_mask_11, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsHigh_mask_12, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsHigh_mask_13, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsHigh_mask_14, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsHigh_mask_15, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_vmodsLow = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SASetMods_vmodsLow, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SASetMods_vmodsLow, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsLow_mask_0, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsLow_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsLow_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsLow_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsLow_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsLow_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsLow_mask_6, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetMods_vmodsLow_mask_7, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsLow_mask_0, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsLow_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsLow_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsLow_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsLow_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsLow_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsLow_mask_6, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetMods_vmodsLow_mask_7, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
 	UNUSED(2);
     }
 }
 
-static void struct_SASetGroup(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SASetGroup(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_flags;
-	int f_group;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SASetGroup, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SASetGroup, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SASetGroup_type, byte_order);
-	f_flags = VALUE8(tvb, *offsetp);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SASetGroup_type, byte_order);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SASetGroup_flags, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SASetGroup_flags, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetGroup_flags_mask_ClearLocks, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetGroup_flags_mask_LatchToLock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetGroup_flags_mask_GroupAbsolute, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetGroup_flags_mask_ClearLocks, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetGroup_flags_mask_LatchToLock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetGroup_flags_mask_GroupAbsolute, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_group = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SASetGroup_group, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SASetGroup_group, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(5);
     }
 }
 
-static void struct_SAMovePtr(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SAMovePtr(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_flags;
-	int f_xHigh;
-	int f_xLow;
-	int f_yHigh;
-	int f_yLow;
-
-	item = proto_tree_add_item(root, hf_x11_struct_SAMovePtr, tvb, *offsetp, 8, ENC_NA);
+
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SAMovePtr, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SAMovePtr_type, byte_order);
-	f_flags = VALUE8(tvb, *offsetp);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SAMovePtr_type, byte_order);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SAMovePtr_flags, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SAMovePtr_flags, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAMovePtr_flags_mask_NoAcceleration, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAMovePtr_flags_mask_MoveAbsoluteX, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAMovePtr_flags_mask_MoveAbsoluteY, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAMovePtr_flags_mask_NoAcceleration, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAMovePtr_flags_mask_MoveAbsoluteX, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAMovePtr_flags_mask_MoveAbsoluteY, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_xHigh = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SAMovePtr_xHigh, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SAMovePtr_xHigh, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_xLow = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SAMovePtr_xLow, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SAMovePtr_xLow, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_yHigh = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SAMovePtr_yHigh, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SAMovePtr_yHigh, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_yLow = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SAMovePtr_yLow, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SAMovePtr_yLow, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(2);
     }
 }
 
-static void struct_SAPtrBtn(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SAPtrBtn(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_flags;
-	int f_count;
-	int f_button;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SAPtrBtn, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SAPtrBtn, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SAPtrBtn_type, byte_order);
-	f_flags = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SAPtrBtn_flags, tvb, *offsetp, 1, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SAPtrBtn_type, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SAPtrBtn_flags, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_count = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SAPtrBtn_count, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SAPtrBtn_count, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_button = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SAPtrBtn_button, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SAPtrBtn_button, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(4);
     }
 }
 
-static void struct_SALockPtrBtn(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SALockPtrBtn(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_flags;
-	int f_button;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SALockPtrBtn, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SALockPtrBtn, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SALockPtrBtn_type, byte_order);
-	f_flags = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SALockPtrBtn_flags, tvb, *offsetp, 1, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SALockPtrBtn_type, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SALockPtrBtn_flags, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(1);
-	f_button = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SALockPtrBtn_button, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SALockPtrBtn_button, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(4);
     }
 }
 
-static void struct_SASetPtrDflt(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SASetPtrDflt(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_flags;
-	int f_affect;
-	int f_value;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SASetPtrDflt, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SASetPtrDflt, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SASetPtrDflt_type, byte_order);
-	f_flags = VALUE8(tvb, *offsetp);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SASetPtrDflt_type, byte_order);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SASetPtrDflt_flags, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SASetPtrDflt_flags, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetPtrDflt_flags_mask_AffectDfltButton, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetPtrDflt_flags_mask_DfltBtnAbsolute, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetPtrDflt_flags_mask_AffectDfltButton, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetPtrDflt_flags_mask_DfltBtnAbsolute, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_affect = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SASetPtrDflt_affect, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SASetPtrDflt_affect, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetPtrDflt_affect_mask_AffectDfltButton, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetPtrDflt_affect_mask_DfltBtnAbsolute, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetPtrDflt_affect_mask_AffectDfltButton, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetPtrDflt_affect_mask_DfltBtnAbsolute, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_value = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SASetPtrDflt_value, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SASetPtrDflt_value, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(4);
     }
 }
 
-static void struct_SAIsoLock(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SAIsoLock(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_flags;
-	int f_mask;
-	int f_realMods;
-	int f_group;
-	int f_affect;
-	int f_vmodsHigh;
-	int f_vmodsLow;
-
-	item = proto_tree_add_item(root, hf_x11_struct_SAIsoLock, tvb, *offsetp, 8, ENC_NA);
+
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SAIsoLock, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SAIsoLock_type, byte_order);
-	f_flags = VALUE8(tvb, *offsetp);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SAIsoLock_type, byte_order);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SAIsoLock_flags, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SAIsoLock_flags, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_flags_mask_NoLock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_flags_mask_NoUnlock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_flags_mask_GroupAbsolute, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_flags_mask_ISODfltIsGroup, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_flags_mask_NoLock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_flags_mask_NoUnlock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_flags_mask_GroupAbsolute, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_flags_mask_ISODfltIsGroup, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_mask = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SAIsoLock_mask, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SAIsoLock_mask, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_mask_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_mask_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_mask_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_mask_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_mask_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_mask_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_mask_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_mask_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_mask_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_mask_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_mask_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_mask_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_mask_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_mask_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_realMods = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SAIsoLock_realMods, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SAIsoLock_realMods, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_realMods_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_realMods_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_realMods_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_realMods_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_realMods_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_realMods_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_realMods_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_realMods_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_realMods_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_realMods_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_realMods_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_realMods_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_realMods_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_realMods_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_realMods_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_realMods_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_group = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SAIsoLock_group, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SAIsoLock_group, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_affect = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SAIsoLock_affect, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SAIsoLock_affect, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_affect_mask_Ctrls, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_affect_mask_Ptr, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_affect_mask_Group, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_affect_mask_Mods, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_affect_mask_Ctrls, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_affect_mask_Ptr, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_affect_mask_Group, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_affect_mask_Mods, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_vmodsHigh = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SAIsoLock_vmodsHigh, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SAIsoLock_vmodsHigh, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsHigh_mask_8, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsHigh_mask_9, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsHigh_mask_10, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsHigh_mask_11, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsHigh_mask_12, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsHigh_mask_13, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsHigh_mask_14, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsHigh_mask_15, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsHigh_mask_8, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsHigh_mask_9, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsHigh_mask_10, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsHigh_mask_11, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsHigh_mask_12, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsHigh_mask_13, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsHigh_mask_14, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsHigh_mask_15, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_vmodsLow = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SAIsoLock_vmodsLow, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SAIsoLock_vmodsLow, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsLow_mask_0, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsLow_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsLow_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsLow_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsLow_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsLow_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsLow_mask_6, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAIsoLock_vmodsLow_mask_7, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsLow_mask_0, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsLow_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsLow_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsLow_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsLow_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsLow_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsLow_mask_6, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAIsoLock_vmodsLow_mask_7, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
     }
 }
 
-static void struct_SATerminate(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SATerminate(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SATerminate, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SATerminate, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SATerminate_type, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SATerminate_type, byte_order);
 	UNUSED(7);
     }
 }
 
-static void struct_SASwitchScreen(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SASwitchScreen(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_flags;
-	int f_newScreen;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SASwitchScreen, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SASwitchScreen, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SASwitchScreen_type, byte_order);
-	f_flags = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SASwitchScreen_flags, tvb, *offsetp, 1, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SASwitchScreen_type, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SASwitchScreen_flags, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_newScreen = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SASwitchScreen_newScreen, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SASwitchScreen_newScreen, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(5);
     }
 }
 
-static void struct_SASetControls(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SASetControls(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_boolCtrlsHigh;
-	int f_boolCtrlsLow;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SASetControls, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SASetControls, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SASetControls_type, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SASetControls_type, byte_order);
 	UNUSED(3);
-	f_boolCtrlsHigh = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SASetControls_boolCtrlsHigh, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SASetControls_boolCtrlsHigh, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsHigh_mask_AccessXFeedback, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsHigh_mask_AudibleBell, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsHigh_mask_Overlay1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsHigh_mask_Overlay2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsHigh_mask_IgnoreGroupLock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsHigh_mask_AccessXFeedback, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsHigh_mask_AudibleBell, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsHigh_mask_Overlay1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsHigh_mask_Overlay2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsHigh_mask_IgnoreGroupLock, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_boolCtrlsLow = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SASetControls_boolCtrlsLow, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SASetControls_boolCtrlsLow, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsLow_mask_RepeatKeys, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsLow_mask_SlowKeys, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsLow_mask_BounceKeys, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsLow_mask_StickyKeys, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsLow_mask_MouseKeys, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsLow_mask_MouseKeysAccel, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsLow_mask_AccessXKeys, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SASetControls_boolCtrlsLow_mask_AccessXTimeout, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsLow_mask_RepeatKeys, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsLow_mask_SlowKeys, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsLow_mask_BounceKeys, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsLow_mask_StickyKeys, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsLow_mask_MouseKeys, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsLow_mask_MouseKeysAccel, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsLow_mask_AccessXKeys, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SASetControls_boolCtrlsLow_mask_AccessXTimeout, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
 	UNUSED(2);
     }
 }
 
-static void struct_SAActionMessage(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SAActionMessage(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_flags;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SAActionMessage, tvb, *offsetp, 3, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SAActionMessage, tvb, *offsetp, 3, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SAActionMessage_type, byte_order);
-	f_flags = VALUE8(tvb, *offsetp);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SAActionMessage_type, byte_order);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SAActionMessage_flags, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SAActionMessage_flags, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAActionMessage_flags_mask_OnPress, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAActionMessage_flags_mask_OnRelease, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SAActionMessage_flags_mask_GenKeyEvent, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAActionMessage_flags_mask_OnPress, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAActionMessage_flags_mask_OnRelease, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SAActionMessage_flags_mask_GenKeyEvent, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	listOfByte(tvb, offsetp, t, hf_x11_struct_SAActionMessage_message, 6, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_SAActionMessage_message, 6, byte_order);
     }
 }
 
-static void struct_SARedirectKey(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SARedirectKey(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_newkey;
-	int f_mask;
-	int f_realModifiers;
-	int f_vmodsMaskHigh;
-	int f_vmodsMaskLow;
-	int f_vmodsHigh;
-	int f_vmodsLow;
-
-	item = proto_tree_add_item(root, hf_x11_struct_SARedirectKey, tvb, *offsetp, 8, ENC_NA);
+
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SARedirectKey, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SARedirectKey_type, byte_order);
-	f_newkey = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SARedirectKey_newkey, tvb, *offsetp, 1, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SARedirectKey_type, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SARedirectKey_newkey, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_mask = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SARedirectKey_mask, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SARedirectKey_mask, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_mask_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_mask_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_mask_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_mask_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_mask_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_mask_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_mask_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_mask_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_mask_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_mask_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_mask_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_mask_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_mask_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_mask_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_mask_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_mask_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_realModifiers = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SARedirectKey_realModifiers, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SARedirectKey_realModifiers, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_realModifiers_mask_Shift, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_realModifiers_mask_Lock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_realModifiers_mask_Control, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_realModifiers_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_realModifiers_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_realModifiers_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_realModifiers_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_realModifiers_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_realModifiers_mask_Any, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_realModifiers_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_realModifiers_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_realModifiers_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_realModifiers_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_realModifiers_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_realModifiers_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_realModifiers_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_realModifiers_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_realModifiers_mask_Any, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_vmodsMaskHigh = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SARedirectKey_vmodsMaskHigh, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SARedirectKey_vmodsMaskHigh, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskHigh_mask_8, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskHigh_mask_9, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskHigh_mask_10, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskHigh_mask_11, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskHigh_mask_12, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskHigh_mask_13, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskHigh_mask_14, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskHigh_mask_15, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskHigh_mask_8, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskHigh_mask_9, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskHigh_mask_10, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskHigh_mask_11, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskHigh_mask_12, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskHigh_mask_13, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskHigh_mask_14, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskHigh_mask_15, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_vmodsMaskLow = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SARedirectKey_vmodsMaskLow, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SARedirectKey_vmodsMaskLow, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskLow_mask_0, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskLow_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskLow_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskLow_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskLow_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskLow_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskLow_mask_6, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsMaskLow_mask_7, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskLow_mask_0, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskLow_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskLow_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskLow_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskLow_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskLow_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskLow_mask_6, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsMaskLow_mask_7, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_vmodsHigh = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SARedirectKey_vmodsHigh, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SARedirectKey_vmodsHigh, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsHigh_mask_8, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsHigh_mask_9, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsHigh_mask_10, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsHigh_mask_11, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsHigh_mask_12, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsHigh_mask_13, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsHigh_mask_14, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsHigh_mask_15, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsHigh_mask_8, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsHigh_mask_9, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsHigh_mask_10, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsHigh_mask_11, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsHigh_mask_12, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsHigh_mask_13, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsHigh_mask_14, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsHigh_mask_15, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
-	f_vmodsLow = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SARedirectKey_vmodsLow, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SARedirectKey_vmodsLow, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsLow_mask_0, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsLow_mask_1, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsLow_mask_2, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsLow_mask_3, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsLow_mask_4, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsLow_mask_5, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsLow_mask_6, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SARedirectKey_vmodsLow_mask_7, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsLow_mask_0, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsLow_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsLow_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsLow_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsLow_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsLow_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsLow_mask_6, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SARedirectKey_vmodsLow_mask_7, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
     }
 }
 
-static void struct_SADeviceBtn(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SADeviceBtn(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_flags;
-	int f_count;
-	int f_button;
-	int f_device;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SADeviceBtn, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SADeviceBtn, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SADeviceBtn_type, byte_order);
-	f_flags = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SADeviceBtn_flags, tvb, *offsetp, 1, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SADeviceBtn_type, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SADeviceBtn_flags, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_count = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SADeviceBtn_count, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SADeviceBtn_count, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_button = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SADeviceBtn_button, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SADeviceBtn_button, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_device = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SADeviceBtn_device, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SADeviceBtn_device, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(3);
     }
 }
 
-static void struct_SALockDeviceBtn(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SALockDeviceBtn(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_flags;
-	int f_button;
-	int f_device;
 
-	item = proto_tree_add_item(root, hf_x11_struct_SALockDeviceBtn, tvb, *offsetp, 5, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SALockDeviceBtn, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SALockDeviceBtn_type, byte_order);
-	f_flags = VALUE8(tvb, *offsetp);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SALockDeviceBtn_type, byte_order);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_SALockDeviceBtn_flags, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SALockDeviceBtn_flags, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SALockDeviceBtn_flags_mask_NoLock, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_SALockDeviceBtn_flags_mask_NoUnlock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SALockDeviceBtn_flags_mask_NoLock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SALockDeviceBtn_flags_mask_NoUnlock, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
 	UNUSED(1);
-	f_button = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SALockDeviceBtn_button, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SALockDeviceBtn_button, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_device = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SALockDeviceBtn_device, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SALockDeviceBtn_device, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
+	UNUSED(3);
     }
 }
 
-static void struct_SADeviceValuator(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xkb_SADeviceValuator(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	int f_device;
-	int f_val1what;
-	int f_val1index;
-	int f_val1value;
-	int f_val2what;
-	int f_val2index;
-	int f_val2value;
-
-	item = proto_tree_add_item(root, hf_x11_struct_SADeviceValuator, tvb, *offsetp, 8, ENC_NA);
+
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SADeviceValuator, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_SADeviceValuator_type, byte_order);
-	f_device = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SADeviceValuator_device, tvb, *offsetp, 1, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SADeviceValuator_type, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SADeviceValuator_device, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SADeviceValuator_val1what, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SADeviceValuator_val1index, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+	proto_tree_add_item(t, hf_x11_struct_xkb_SADeviceValuator_val1value, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_val1what = field8(tvb, offsetp, t, hf_x11_struct_SADeviceValuator_val1what, byte_order);
-	f_val1index = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SADeviceValuator_val1index, tvb, *offsetp, 1, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SADeviceValuator_val2what, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SADeviceValuator_val2index, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_val1value = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SADeviceValuator_val1value, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SADeviceValuator_val2value, tvb, *offsetp, 1, byte_order);
+	*offsetp += 1;
+    }
+}
+
+static void struct_xkb_SIAction(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SIAction, tvb, *offsetp, 2, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SIAction_type, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_SIAction_data, 7, byte_order);
+    }
+}
+
+static void struct_xkb_SymInterpret(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+{
+    int i;
+    for (i = 0; i < count; i++) {
+	proto_item *item;
+	proto_tree *t;
+
+	item = proto_tree_add_item(root, hf_x11_struct_xkb_SymInterpret, tvb, *offsetp, 10, ENC_NA);
+	t = proto_item_add_subtree(item, ett_x11_rectangle);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SymInterpret_sym, tvb, *offsetp, 4, byte_order);
+	*offsetp += 4;
+	{
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SymInterpret_mods, tvb, *offsetp, 1, byte_order);
+	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_mods_mask_Shift, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_mods_mask_Lock, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_mods_mask_Control, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_mods_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_mods_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_mods_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_mods_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_mods_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_mods_mask_Any, tvb, *offsetp, 1, byte_order);
+	}
 	*offsetp += 1;
-	f_val2what = field8(tvb, offsetp, t, hf_x11_struct_SADeviceValuator_val2what, byte_order);
-	f_val2index = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SADeviceValuator_val2index, tvb, *offsetp, 1, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xkb_SymInterpret_match, byte_order);
+	{
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xkb_SymInterpret_virtualMod, tvb, *offsetp, 1, byte_order);
+	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_virtualMod_mask_0, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_virtualMod_mask_1, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_virtualMod_mask_2, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_virtualMod_mask_3, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_virtualMod_mask_4, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_virtualMod_mask_5, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_virtualMod_mask_6, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xkb_SymInterpret_virtualMod_mask_7, tvb, *offsetp, 1, byte_order);
+	}
 	*offsetp += 1;
-	f_val2value = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SADeviceValuator_val2value, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xkb_SymInterpret_flags, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
+	struct_xkb_SIAction(tvb, offsetp, t, byte_order, 1);
     }
 }
 
-static void struct_Action(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order, int count)
+static void struct_xkb_Action(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order, int count)
 {
     int i;
     int base = *offsetp;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_type;
-	item = proto_tree_add_item(root, hf_x11_union_Action, tvb, base, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_union_xkb_Action, tvb, base, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
 
         *offsetp = base;
-	struct_SANoAction(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SANoAction(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SASetMods(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SASetMods(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SASetMods(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SASetMods(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SASetMods(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SASetMods(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SASetGroup(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SASetGroup(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SASetGroup(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SASetGroup(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SASetGroup(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SASetGroup(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SAMovePtr(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SAMovePtr(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SAPtrBtn(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SAPtrBtn(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SALockPtrBtn(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SALockPtrBtn(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SASetPtrDflt(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SASetPtrDflt(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SAIsoLock(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SAIsoLock(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SATerminate(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SATerminate(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SASwitchScreen(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SASwitchScreen(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SASetControls(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SASetControls(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SASetControls(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SASetControls(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SAActionMessage(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SAActionMessage(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SARedirectKey(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SARedirectKey(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SADeviceBtn(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SADeviceBtn(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SALockDeviceBtn(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SALockDeviceBtn(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	struct_SADeviceValuator(tvb, offsetp, t, byte_order, 1);
+	struct_xkb_SADeviceValuator(tvb, offsetp, t, byte_order, 1);
         *offsetp = base;
-	f_type = field8(tvb, offsetp, t, hf_x11_union_Action_type, byte_order);
+	field8(tvb, offsetp, t, hf_x11_union_xkb_Action_type, byte_order);
         base += 8;
     }
     *offsetp = base;
@@ -22057,40 +20660,28 @@ static void struct_Action(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint b
 
 static void xkbUseExtension(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_wantedMajor;
-    int f_wantedMinor;
-    f_wantedMajor = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_UseExtension_wantedMajor, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_wantedMinor = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_UseExtension_wantedMinor, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void xkbUseExtension_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_supported;
-    int f_serverMajor;
-    int f_serverMinor;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-UseExtension");
 
     REPLY(reply);
-    f_supported = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_UseExtension_reply_supported, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-UseExtension)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_serverMajor = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_UseExtension_reply_serverMajor, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_serverMinor = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_UseExtension_reply_serverMinor, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(20);
@@ -22098,24 +20689,92 @@ static void xkbUseExtension_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
 
 static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
     int f_affectWhich;
     int f_clear;
     int f_selectAll;
-    int f_affectMap;
-    int f_map;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SelectEvents_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_affectWhich = field16(tvb, offsetp, t, hf_x11_xkb_SelectEvents_affectWhich, byte_order);
-    f_clear = field16(tvb, offsetp, t, hf_x11_xkb_SelectEvents_clear, byte_order);
-    f_selectAll = field16(tvb, offsetp, t, hf_x11_xkb_SelectEvents_selectAll, byte_order);
-    f_affectMap = field16(tvb, offsetp, t, hf_x11_xkb_SelectEvents_affectMap, byte_order);
-    f_map = field16(tvb, offsetp, t, hf_x11_xkb_SelectEvents_map, byte_order);
+    f_affectWhich = VALUE16(tvb, *offsetp);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_affectWhich, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectWhich_mask_NewKeyboardNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectWhich_mask_MapNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectWhich_mask_StateNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectWhich_mask_ControlsNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectWhich_mask_IndicatorStateNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectWhich_mask_IndicatorMapNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectWhich_mask_NamesNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectWhich_mask_CompatMapNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectWhich_mask_BellNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectWhich_mask_ActionMessage, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectWhich_mask_AccessXNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectWhich_mask_ExtensionDeviceNotify, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
+    f_clear = VALUE16(tvb, *offsetp);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_clear, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_clear_mask_NewKeyboardNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_clear_mask_MapNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_clear_mask_StateNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_clear_mask_ControlsNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_clear_mask_IndicatorStateNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_clear_mask_IndicatorMapNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_clear_mask_NamesNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_clear_mask_CompatMapNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_clear_mask_BellNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_clear_mask_ActionMessage, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_clear_mask_AccessXNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_clear_mask_ExtensionDeviceNotify, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
+    f_selectAll = VALUE16(tvb, *offsetp);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_selectAll, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_selectAll_mask_NewKeyboardNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_selectAll_mask_MapNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_selectAll_mask_StateNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_selectAll_mask_ControlsNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_selectAll_mask_IndicatorStateNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_selectAll_mask_IndicatorMapNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_selectAll_mask_NamesNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_selectAll_mask_CompatMapNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_selectAll_mask_BellNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_selectAll_mask_ActionMessage, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_selectAll_mask_AccessXNotify, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_selectAll_mask_ExtensionDeviceNotify, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_affectMap, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectMap_mask_KeyTypes, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectMap_mask_KeySyms, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectMap_mask_ModifierMap, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectMap_mask_ExplicitComponents, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectMap_mask_KeyActions, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectMap_mask_KeyBehaviors, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectMap_mask_VirtualMods, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_affectMap_mask_VirtualModMap, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_map, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_map_mask_KeyTypes, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_map_mask_KeySyms, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_map_mask_ModifierMap, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_map_mask_ExplicitComponents, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_map_mask_KeyActions, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_map_mask_KeyBehaviors, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_map_mask_VirtualMods, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_map_mask_VirtualModMap, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
     if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 0)) != 0) {
-        int f_affectNewKeyboard;
-        int f_newKeyboardDetails;
-        f_affectNewKeyboard = VALUE16(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_NewKeyboardNotify_affectNewKeyboard, tvb, *offsetp, 2, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22124,7 +20783,6 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
             proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_NewKeyboardNotify_affectNewKeyboard_mask_DeviceID, tvb, *offsetp, 2, byte_order);
         }
         *offsetp += 2;
-        f_newKeyboardDetails = VALUE16(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_NewKeyboardNotify_newKeyboardDetails, tvb, *offsetp, 2, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22135,9 +20793,6 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         *offsetp += 2;
     }
     if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 2)) != 0) {
-        int f_affectState;
-        int f_stateDetails;
-        f_affectState = VALUE16(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_StateNotify_affectState, tvb, *offsetp, 2, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22157,7 +20812,6 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
             proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_StateNotify_affectState_mask_PointerButtons, tvb, *offsetp, 2, byte_order);
         }
         *offsetp += 2;
-        f_stateDetails = VALUE16(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_StateNotify_stateDetails, tvb, *offsetp, 2, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22179,9 +20833,6 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         *offsetp += 2;
     }
     if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 3)) != 0) {
-        int f_affectCtrls;
-        int f_ctrlDetails;
-        f_affectCtrls = VALUE32(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_ControlsNotify_affectCtrls, tvb, *offsetp, 4, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22192,7 +20843,6 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
             proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_ControlsNotify_affectCtrls_mask_ControlsEnabled, tvb, *offsetp, 4, byte_order);
         }
         *offsetp += 4;
-        f_ctrlDetails = VALUE32(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_ControlsNotify_ctrlDetails, tvb, *offsetp, 4, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22205,29 +20855,18 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         *offsetp += 4;
     }
     if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 4)) != 0) {
-        int f_affectIndicatorState;
-        int f_indicatorStateDetails;
-        f_affectIndicatorState = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SelectEvents_IndicatorStateNotify_affectIndicatorState, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_indicatorStateDetails = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SelectEvents_IndicatorStateNotify_indicatorStateDetails, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
     if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 5)) != 0) {
-        int f_affectIndicatorMap;
-        int f_indicatorMapDetails;
-        f_affectIndicatorMap = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SelectEvents_IndicatorMapNotify_affectIndicatorMap, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_indicatorMapDetails = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SelectEvents_IndicatorMapNotify_indicatorMapDetails, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
     if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 6)) != 0) {
-        int f_affectNames;
-        int f_namesDetails;
-        f_affectNames = VALUE16(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_NamesNotify_affectNames, tvb, *offsetp, 2, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22247,7 +20886,6 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
             proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_NamesNotify_affectNames_mask_RGNames, tvb, *offsetp, 2, byte_order);
         }
         *offsetp += 2;
-        f_namesDetails = VALUE16(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_NamesNotify_namesDetails, tvb, *offsetp, 2, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22269,9 +20907,6 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         *offsetp += 2;
     }
     if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 7)) != 0) {
-        int f_affectCompat;
-        int f_compatDetails;
-        f_affectCompat = VALUE8(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_CompatMapNotify_affectCompat, tvb, *offsetp, 1, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22279,7 +20914,6 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
             proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_CompatMapNotify_affectCompat_mask_GroupCompat, tvb, *offsetp, 1, byte_order);
         }
         *offsetp += 1;
-        f_compatDetails = VALUE8(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_CompatMapNotify_compatDetails, tvb, *offsetp, 1, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22289,29 +20923,18 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         *offsetp += 1;
     }
     if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 8)) != 0) {
-        int f_affectBell;
-        int f_bellDetails;
-        f_affectBell = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SelectEvents_BellNotify_affectBell, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_bellDetails = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SelectEvents_BellNotify_bellDetails, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
     }
     if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 9)) != 0) {
-        int f_affectMsgDetails;
-        int f_msgDetails;
-        f_affectMsgDetails = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SelectEvents_ActionMessage_affectMsgDetails, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_msgDetails = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SelectEvents_ActionMessage_msgDetails, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
     }
     if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 10)) != 0) {
-        int f_affectAccessX;
-        int f_accessXDetails;
-        f_affectAccessX = VALUE16(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_AccessXNotify_affectAccessX, tvb, *offsetp, 2, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22324,7 +20947,6 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
             proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_AccessXNotify_affectAccessX_mask_AXKWarning, tvb, *offsetp, 2, byte_order);
         }
         *offsetp += 2;
-        f_accessXDetails = VALUE16(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_AccessXNotify_accessXDetails, tvb, *offsetp, 2, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22339,9 +20961,6 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         *offsetp += 2;
     }
     if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 11)) != 0) {
-        int f_affectExtDev;
-        int f_extdevDetails;
-        f_affectExtDev = VALUE16(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_ExtensionDeviceNotify_affectExtDev, tvb, *offsetp, 2, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22352,7 +20971,6 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
             proto_tree_add_item(bitmask_tree, hf_x11_xkb_SelectEvents_ExtensionDeviceNotify_affectExtDev_mask_IndicatorState, tvb, *offsetp, 2, byte_order);
         }
         *offsetp += 2;
-        f_extdevDetails = VALUE16(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SelectEvents_ExtensionDeviceNotify_extdevDetails, tvb, *offsetp, 2, byte_order);
             proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22368,92 +20986,51 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
 
 static void xkbBell(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_bellClass;
-    int f_bellID;
-    int f_percent;
-    int f_forceSound;
-    int f_eventOnly;
-    int f_pitch;
-    int f_duration;
-    int f_name;
-    int f_window;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_Bell_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_bellClass = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_Bell_bellClass, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_bellID = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_Bell_bellID, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_percent = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_Bell_percent, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_forceSound = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_Bell_forceSound, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_eventOnly = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_Bell_eventOnly, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
-    f_pitch = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_Bell_pitch, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_duration = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_Bell_duration, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_name = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_Bell_name, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_Bell_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xkbGetState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetState_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
 }
 static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_deviceID;
-    int f_mods;
-    int f_baseMods;
-    int f_latchedMods;
-    int f_lockedMods;
-    int f_group;
-    int f_lockedGroup;
-    int f_baseGroup;
-    int f_latchedGroup;
-    int f_compatState;
-    int f_grabMods;
-    int f_compatGrabMods;
-    int f_lookupMods;
-    int f_compatLookupMods;
-    int f_ptrBtnState;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetState");
 
     REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetState_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-GetState)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetState_reply_mods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22468,7 +21045,6 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_mods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_baseMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetState_reply_baseMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22483,7 +21059,6 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_baseMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_latchedMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetState_reply_latchedMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22498,7 +21073,6 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_latchedMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_lockedMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetState_reply_lockedMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22513,15 +21087,12 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_lockedMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_group = field8(tvb, offsetp, t, hf_x11_xkb_GetState_reply_group, byte_order);
-    f_lockedGroup = field8(tvb, offsetp, t, hf_x11_xkb_GetState_reply_lockedGroup, byte_order);
-    f_baseGroup = VALUE16(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_xkb_GetState_reply_group, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xkb_GetState_reply_lockedGroup, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_GetState_reply_baseGroup, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_latchedGroup = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetState_reply_latchedGroup, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_compatState = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetState_reply_compatState, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22536,7 +21107,6 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_compatState_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_grabMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetState_reply_grabMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22551,7 +21121,6 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_grabMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_compatGrabMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetState_reply_compatGrabMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22566,7 +21135,6 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_compatGrabMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_lookupMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetState_reply_lookupMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22581,7 +21149,6 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_lookupMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_compatLookupMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetState_reply_compatLookupMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22597,7 +21164,6 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     }
     *offsetp += 1;
     UNUSED(1);
-    f_ptrBtnState = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetState_reply_ptrBtnState, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22621,18 +21187,8 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
 
 static void xkbLatchLockState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_affectModLocks;
-    int f_modLocks;
-    int f_lockGroup;
-    int f_groupLock;
-    int f_affectModLatches;
-    int f_latchGroup;
-    int f_groupLatch;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_LatchLockState_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_affectModLocks = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_LatchLockState_affectModLocks, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22647,7 +21203,6 @@ static void xkbLatchLockState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_LatchLockState_affectModLocks_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_modLocks = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_LatchLockState_modLocks, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22662,11 +21217,9 @@ static void xkbLatchLockState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_LatchLockState_modLocks_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_lockGroup = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_LatchLockState_lockGroup, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_groupLock = field8(tvb, offsetp, t, hf_x11_xkb_LatchLockState_groupLock, byte_order);
-    f_affectModLatches = VALUE8(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_xkb_LatchLockState_groupLock, byte_order);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_LatchLockState_affectModLatches, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22682,73 +21235,39 @@ static void xkbLatchLockState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
     }
     *offsetp += 1;
     UNUSED(1);
-    f_latchGroup = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_LatchLockState_latchGroup, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_groupLatch = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_LatchLockState_groupLatch, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xkbGetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
 }
 static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_deviceID;
-    int f_mouseKeysDfltBtn;
-    int f_numGroups;
-    int f_groupsWrap;
-    int f_internalModsMask;
-    int f_ignoreLockModsMask;
-    int f_internalModsRealMods;
-    int f_ignoreLockModsRealMods;
-    int f_internalModsVmods;
-    int f_ignoreLockModsVmods;
-    int f_repeatDelay;
-    int f_repeatInterval;
-    int f_slowKeysDelay;
-    int f_debounceDelay;
-    int f_mouseKeysDelay;
-    int f_mouseKeysInterval;
-    int f_mouseKeysTimeToMax;
-    int f_mouseKeysMaxSpeed;
-    int f_mouseKeysCurve;
-    int f_accessXTimeout;
-    int f_accessXTimeoutMask;
-    int f_accessXTimeoutValues;
-    int f_enabledControls;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetControls");
 
     REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-GetControls)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mouseKeysDfltBtn = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_mouseKeysDfltBtn, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_numGroups = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_numGroups, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_groupsWrap = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_groupsWrap, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_internalModsMask = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_internalModsMask, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22763,7 +21282,6 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_internalModsMask_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_ignoreLockModsMask = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_ignoreLockModsMask, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22778,7 +21296,6 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_ignoreLockModsMask_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_internalModsRealMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_internalModsRealMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22793,7 +21310,6 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_internalModsRealMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_ignoreLockModsRealMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_ignoreLockModsRealMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22809,7 +21325,6 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
     }
     *offsetp += 1;
     UNUSED(1);
-    f_internalModsVmods = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_internalModsVmods, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22831,7 +21346,6 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_internalModsVmods_mask_15, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_ignoreLockModsVmods = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_ignoreLockModsVmods, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22853,78 +21367,139 @@ static void xkbGetControls_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_ignoreLockModsVmods_mask_15, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_repeatDelay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_repeatDelay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_repeatInterval = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_repeatInterval, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_slowKeysDelay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_slowKeysDelay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_debounceDelay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_debounceDelay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mouseKeysDelay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_mouseKeysDelay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mouseKeysInterval = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_mouseKeysInterval, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mouseKeysTimeToMax = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_mouseKeysTimeToMax, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mouseKeysMaxSpeed = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_mouseKeysMaxSpeed, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mouseKeysCurve = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_mouseKeysCurve, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    struct_AXOption(tvb, offsetp, t, byte_order, 1);
-    f_accessXTimeout = VALUE16(tvb, *offsetp);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_accessXOption, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXOption_mask_SKPressFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXOption_mask_SKAcceptFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXOption_mask_FeatureFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXOption_mask_SlowWarnFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXOption_mask_IndicatorFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXOption_mask_StickyKeysFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXOption_mask_TwoKeys, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXOption_mask_LatchToLock, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXOption_mask_SKReleaseFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXOption_mask_SKRejectFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXOption_mask_BKRejectFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXOption_mask_DumbBell, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_accessXTimeout, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    struct_AXOption(tvb, offsetp, t, byte_order, 1);
-    struct_AXOption(tvb, offsetp, t, byte_order, 1);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_SKPressFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_SKAcceptFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_FeatureFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_SlowWarnFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_IndicatorFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_StickyKeysFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_TwoKeys, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_LatchToLock, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_SKReleaseFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_SKRejectFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_BKRejectFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask_mask_DumbBell, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_SKPressFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_SKAcceptFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_FeatureFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_SlowWarnFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_IndicatorFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_StickyKeysFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_TwoKeys, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_LatchToLock, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_SKReleaseFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_SKRejectFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_BKRejectFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues_mask_DumbBell, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
     UNUSED(2);
-    f_accessXTimeoutMask = field32(tvb, offsetp, t, hf_x11_xkb_GetControls_reply_accessXTimeoutMask, byte_order);
-    f_accessXTimeoutValues = field32(tvb, offsetp, t, hf_x11_xkb_GetControls_reply_accessXTimeoutValues, byte_order);
-    f_enabledControls = field32(tvb, offsetp, t, hf_x11_xkb_GetControls_reply_enabledControls, byte_order);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_accessXTimeoutMask, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_RepeatKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_SlowKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_BounceKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_StickyKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_MouseKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_MouseKeysAccel, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_AccessXKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_AccessXTimeoutMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_AccessXFeedbackMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_AudibleBellMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_Overlay1Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_Overlay2Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutMask_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_accessXTimeoutValues, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_RepeatKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_SlowKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_BounceKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_StickyKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_MouseKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_MouseKeysAccel, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_AccessXKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_AccessXTimeoutMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_AccessXFeedbackMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_AudibleBellMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_Overlay1Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_Overlay2Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_accessXTimeoutValues_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetControls_reply_enabledControls, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_RepeatKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_SlowKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_BounceKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_StickyKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_MouseKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_MouseKeysAccel, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_AccessXKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_AccessXTimeoutMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_AccessXFeedbackMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_AudibleBellMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_Overlay1Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_Overlay2Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetControls_reply_enabledControls_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xkb_GetControls_reply_perKeyRepeat, 32, byte_order);
 }
 
 static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_affectInternalRealMods;
-    int f_internalRealMods;
-    int f_affectIgnoreLockRealMods;
-    int f_ignoreLockRealMods;
-    int f_affectInternalVirtualMods;
-    int f_internalVirtualMods;
-    int f_affectIgnoreLockVirtualMods;
-    int f_ignoreLockVirtualMods;
-    int f_mouseKeysDfltBtn;
-    int f_groupsWrap;
-    int f_affectEnabledControls;
-    int f_enabledControls;
-    int f_changeControls;
-    int f_repeatDelay;
-    int f_repeatInterval;
-    int f_slowKeysDelay;
-    int f_debounceDelay;
-    int f_mouseKeysDelay;
-    int f_mouseKeysInterval;
-    int f_mouseKeysTimeToMax;
-    int f_mouseKeysMaxSpeed;
-    int f_mouseKeysCurve;
-    int f_accessXTimeout;
-    int f_accessXTimeoutMask;
-    int f_accessXTimeoutValues;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_affectInternalRealMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_affectInternalRealMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22939,7 +21514,6 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalRealMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_internalRealMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_internalRealMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22954,7 +21528,6 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalRealMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_affectIgnoreLockRealMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_affectIgnoreLockRealMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22969,7 +21542,6 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockRealMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_ignoreLockRealMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_ignoreLockRealMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -22984,7 +21556,6 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockRealMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_affectInternalVirtualMods = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_affectInternalVirtualMods, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23006,7 +21577,6 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalVirtualMods_mask_15, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_internalVirtualMods = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_internalVirtualMods, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23028,7 +21598,6 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalVirtualMods_mask_15, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_affectIgnoreLockVirtualMods = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23050,7 +21619,6 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_15, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_ignoreLockVirtualMods = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_ignoreLockVirtualMods, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23072,17 +21640,64 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_15, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_mouseKeysDfltBtn = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_mouseKeysDfltBtn, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_groupsWrap = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_groupsWrap, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    struct_AXOption(tvb, offsetp, t, byte_order, 1);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_accessXOptions, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXOptions_mask_SKPressFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXOptions_mask_SKAcceptFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXOptions_mask_FeatureFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXOptions_mask_SlowWarnFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXOptions_mask_IndicatorFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXOptions_mask_StickyKeysFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXOptions_mask_TwoKeys, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXOptions_mask_LatchToLock, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXOptions_mask_SKReleaseFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXOptions_mask_SKRejectFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXOptions_mask_BKRejectFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXOptions_mask_DumbBell, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
     UNUSED(2);
-    f_affectEnabledControls = field32(tvb, offsetp, t, hf_x11_xkb_SetControls_affectEnabledControls, byte_order);
-    f_enabledControls = field32(tvb, offsetp, t, hf_x11_xkb_SetControls_enabledControls, byte_order);
-    f_changeControls = VALUE32(tvb, *offsetp);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_affectEnabledControls, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_RepeatKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_SlowKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_BounceKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_StickyKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_MouseKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_MouseKeysAccel, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_AccessXKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_AccessXTimeoutMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_AccessXFeedbackMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_AudibleBellMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_Overlay1Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_Overlay2Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectEnabledControls_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_enabledControls, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_RepeatKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_SlowKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_BounceKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_StickyKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_MouseKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_MouseKeysAccel, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_AccessXKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_AccessXTimeoutMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_AccessXFeedbackMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_AudibleBellMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_Overlay1Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_Overlay2Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_enabledControls_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_changeControls, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23093,94 +21708,146 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_changeControls_mask_ControlsEnabled, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_repeatDelay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_repeatDelay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_repeatInterval = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_repeatInterval, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_slowKeysDelay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_slowKeysDelay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_debounceDelay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_debounceDelay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mouseKeysDelay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_mouseKeysDelay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mouseKeysInterval = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_mouseKeysInterval, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mouseKeysTimeToMax = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_mouseKeysTimeToMax, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mouseKeysMaxSpeed = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_mouseKeysMaxSpeed, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_mouseKeysCurve = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_mouseKeysCurve, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_accessXTimeout = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetControls_accessXTimeout, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_accessXTimeoutMask = field32(tvb, offsetp, t, hf_x11_xkb_SetControls_accessXTimeoutMask, byte_order);
-    f_accessXTimeoutValues = field32(tvb, offsetp, t, hf_x11_xkb_SetControls_accessXTimeoutValues, byte_order);
-    struct_AXOption(tvb, offsetp, t, byte_order, 1);
-    struct_AXOption(tvb, offsetp, t, byte_order, 1);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_accessXTimeoutMask, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_RepeatKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_SlowKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_BounceKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_StickyKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_MouseKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_MouseKeysAccel, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_AccessXKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_AccessXTimeoutMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_AccessXFeedbackMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_AudibleBellMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_Overlay1Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_Overlay2Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutMask_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_accessXTimeoutValues, tvb, *offsetp, 4, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_RepeatKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_SlowKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_BounceKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_StickyKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_MouseKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_MouseKeysAccel, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_AccessXKeys, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_AccessXTimeoutMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_AccessXFeedbackMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_AudibleBellMask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_Overlay1Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_Overlay2Mask, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutValues_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
+    }
+    *offsetp += 4;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_SKPressFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_SKAcceptFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_FeatureFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_SlowWarnFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_IndicatorFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_StickyKeysFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_TwoKeys, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_LatchToLock, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_SKReleaseFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_SKRejectFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_BKRejectFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsMask_mask_DumbBell, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_SKPressFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_SKAcceptFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_FeatureFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_SlowWarnFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_IndicatorFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_StickyKeysFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_TwoKeys, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_LatchToLock, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_SKReleaseFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_SKRejectFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_BKRejectFB, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_accessXTimeoutOptionsValues_mask_DumbBell, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
     listOfByte(tvb, offsetp, t, hf_x11_xkb_SetControls_perKeyRepeat, 32, byte_order);
     length -= 32 * 1;
 }
 
 static void xkbGetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_full;
-    int f_partial;
-    int f_firstType;
-    int f_nTypes;
-    int f_firstKeySym;
-    int f_nKeySyms;
-    int f_firstKeyAction;
-    int f_nKeyActions;
-    int f_firstKeyBehavior;
-    int f_nKeyBehaviors;
-    int f_virtualMods;
-    int f_firstKeyExplicit;
-    int f_nKeyExplicit;
-    int f_firstModMapKey;
-    int f_nModMapKeys;
-    int f_firstVModMapKey;
-    int f_nVModMapKeys;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_full = field16(tvb, offsetp, t, hf_x11_xkb_GetMap_full, byte_order);
-    f_partial = field16(tvb, offsetp, t, hf_x11_xkb_GetMap_partial, byte_order);
-    f_firstType = VALUE8(tvb, *offsetp);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetMap_full, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_full_mask_KeyTypes, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_full_mask_KeySyms, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_full_mask_ModifierMap, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_full_mask_ExplicitComponents, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_full_mask_KeyActions, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_full_mask_KeyBehaviors, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_full_mask_VirtualMods, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_full_mask_VirtualModMap, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetMap_partial, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_partial_mask_KeyTypes, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_partial_mask_KeySyms, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_partial_mask_ModifierMap, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_partial_mask_ExplicitComponents, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_partial_mask_KeyActions, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_partial_mask_KeyBehaviors, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_partial_mask_VirtualMods, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_partial_mask_VirtualModMap, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_firstType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nTypes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_nTypes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeySym = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_firstKeySym, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeySyms = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_nKeySyms, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeyAction = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_firstKeyAction, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyActions = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_nKeyActions, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeyBehavior = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_firstKeyBehavior, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyBehaviors = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_nKeyBehaviors, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_virtualMods = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetMap_virtualMods, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23202,97 +21869,78 @@ static void xkbGetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_firstKeyExplicit = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_firstKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyExplicit = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_nKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstModMapKey = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_firstModMapKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nModMapKeys = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_nModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstVModMapKey = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_firstVModMapKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nVModMapKeys = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_nVModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(2);
 }
 static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_deviceID;
-    int f_minKeyCode;
-    int f_maxKeyCode;
+    int sequence_number;
     int f_present;
-    int f_firstType;
     int f_nTypes;
-    int f_totalTypes;
-    int f_firstKeySym;
-    int f_totalSyms;
     int f_nKeySyms;
-    int f_firstKeyAction;
     int f_totalActions;
     int f_nKeyActions;
-    int f_firstKeyBehavior;
-    int f_nKeyBehaviors;
     int f_totalKeyBehaviors;
-    int f_firstKeyExplicit;
-    int f_nKeyExplicit;
     int f_totalKeyExplicit;
-    int f_firstModMapKey;
-    int f_nModMapKeys;
     int f_totalModMapKeys;
-    int f_firstVModMapKey;
-    int f_nVModMapKeys;
     int f_totalVModMapKeys;
     int f_virtualMods;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetMap");
 
     REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-GetMap)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(2);
-    f_minKeyCode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_minKeyCode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_maxKeyCode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_maxKeyCode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_present = field16(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_present, byte_order);
-    f_firstType = VALUE8(tvb, *offsetp);
+    f_present = VALUE16(tvb, *offsetp);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_present, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_reply_present_mask_KeyTypes, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_reply_present_mask_KeySyms, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_reply_present_mask_ModifierMap, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_reply_present_mask_ExplicitComponents, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_reply_present_mask_KeyActions, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_reply_present_mask_KeyBehaviors, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_reply_present_mask_VirtualMods, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_reply_present_mask_VirtualModMap, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_nTypes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nTypes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalTypes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_totalTypes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeySym = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstKeySym, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalSyms = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_totalSyms, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_nKeySyms = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nKeySyms, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeyAction = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstKeyAction, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_totalActions = VALUE16(tvb, *offsetp);
@@ -23301,37 +21949,29 @@ static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     f_nKeyActions = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nKeyActions, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeyBehavior = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstKeyBehavior, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyBehaviors = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nKeyBehaviors, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_totalKeyBehaviors = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_totalKeyBehaviors, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeyExplicit = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyExplicit = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_totalKeyExplicit = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_totalKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstModMapKey = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstModMapKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nModMapKeys = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_totalModMapKeys = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_totalModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstVModMapKey = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_firstVModMapKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nVModMapKeys = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetMap_reply_nVModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_totalVModMapKeys = VALUE8(tvb, *offsetp);
@@ -23361,65 +22001,64 @@ static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
     }
     *offsetp += 2;
     if ((f_present & (1 << 0)) != 0) {
-        struct_KeyType(tvb, offsetp, t, byte_order, f_nTypes);
+        struct_xkb_KeyType(tvb, offsetp, t, byte_order, f_nTypes);
     }
     if ((f_present & (1 << 1)) != 0) {
-        struct_KeySymMap(tvb, offsetp, t, byte_order, f_nKeySyms);
+        struct_xkb_KeySymMap(tvb, offsetp, t, byte_order, f_nKeySyms);
     }
     if ((f_present & (1 << 4)) != 0) {
         listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_KeyActions_acts_rtrn_count, f_nKeyActions, byte_order);
-        struct_Action(tvb, offsetp, t, byte_order, f_totalActions);
+        listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_KeyActions_alignment_pad, (((f_nKeyActions + 3) & (~3)) - f_nKeyActions), byte_order);
+        struct_xkb_Action(tvb, offsetp, t, byte_order, f_totalActions);
     }
     if ((f_present & (1 << 5)) != 0) {
-        struct_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
+        struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
     }
     if ((f_present & (1 << 6)) != 0) {
-        listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, f_nVModMapKeys, byte_order);
+        listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order);
+        listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_alignment_pad2, (((popcount(f_virtualMods) + 3) & (~3)) - popcount(f_virtualMods)), byte_order);
     }
     if ((f_present & (1 << 3)) != 0) {
-        struct_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
+        struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
+        listOfCard16(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_ExplicitComponents_alignment_pad3, hf_x11_xkb_GetMap_reply_ExplicitComponents_alignment_pad3_item, (((f_totalKeyExplicit + 1) & (~1)) - f_totalKeyExplicit), byte_order);
     }
     if ((f_present & (1 << 2)) != 0) {
-        struct_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
+        struct_xkb_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
+        listOfCard16(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_ModifierMap_alignment_pad4, hf_x11_xkb_GetMap_reply_ModifierMap_alignment_pad4_item, (((f_totalModMapKeys + 1) & (~1)) - f_totalModMapKeys), byte_order);
     }
     if ((f_present & (1 << 7)) != 0) {
-        struct_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
+        struct_xkb_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
     }
 }
 
 static void xkbSetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
     int f_present;
-    int f_flags;
-    int f_minKeyCode;
-    int f_maxKeyCode;
-    int f_firstType;
     int f_nTypes;
-    int f_firstKeySym;
     int f_nKeySyms;
-    int f_totalSyms;
-    int f_firstKeyAction;
     int f_nKeyActions;
     int f_totalActions;
-    int f_firstKeyBehavior;
-    int f_nKeyBehaviors;
     int f_totalKeyBehaviors;
-    int f_firstKeyExplicit;
-    int f_nKeyExplicit;
     int f_totalKeyExplicit;
-    int f_firstModMapKey;
-    int f_nModMapKeys;
     int f_totalModMapKeys;
-    int f_firstVModMapKey;
-    int f_nVModMapKeys;
     int f_totalVModMapKeys;
     int f_virtualMods;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_present = field16(tvb, offsetp, t, hf_x11_xkb_SetMap_present, byte_order);
-    f_flags = VALUE16(tvb, *offsetp);
+    f_present = VALUE16(tvb, *offsetp);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetMap_present, tvb, *offsetp, 2, byte_order);
+        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetMap_present_mask_KeyTypes, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetMap_present_mask_KeySyms, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetMap_present_mask_ModifierMap, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetMap_present_mask_ExplicitComponents, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetMap_present_mask_KeyActions, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetMap_present_mask_KeyBehaviors, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetMap_present_mask_VirtualMods, tvb, *offsetp, 2, byte_order);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetMap_present_mask_VirtualModMap, tvb, *offsetp, 2, byte_order);
+    }
+    *offsetp += 2;
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetMap_flags, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23427,28 +22066,22 @@ static void xkbSetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetMap_flags_mask_RecomputeActions, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_minKeyCode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_minKeyCode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_maxKeyCode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_maxKeyCode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_nTypes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nTypes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeySym = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstKeySym, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_nKeySyms = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nKeySyms, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalSyms = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_totalSyms, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_firstKeyAction = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstKeyAction, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_nKeyActions = VALUE8(tvb, *offsetp);
@@ -23457,37 +22090,29 @@ static void xkbSetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto
     f_totalActions = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_totalActions, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_firstKeyBehavior = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstKeyBehavior, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyBehaviors = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nKeyBehaviors, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_totalKeyBehaviors = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_totalKeyBehaviors, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeyExplicit = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyExplicit = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_totalKeyExplicit = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_totalKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstModMapKey = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstModMapKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nModMapKeys = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_totalModMapKeys = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_totalModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstVModMapKey = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_firstVModMapKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nVModMapKeys = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetMap_nVModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_totalVModMapKeys = VALUE8(tvb, *offsetp);
@@ -23516,52 +22141,45 @@ static void xkbSetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto
     }
     *offsetp += 2;
     if ((f_present & (1 << 0)) != 0) {
-        struct_SetKeyType(tvb, offsetp, t, byte_order, f_nTypes);
+        struct_xkb_SetKeyType(tvb, offsetp, t, byte_order, f_nTypes);
         length -= f_nTypes * 0;
     }
     if ((f_present & (1 << 1)) != 0) {
-        struct_KeySymMap(tvb, offsetp, t, byte_order, f_nKeySyms);
+        struct_xkb_KeySymMap(tvb, offsetp, t, byte_order, f_nKeySyms);
         length -= f_nKeySyms * 0;
     }
     if ((f_present & (1 << 4)) != 0) {
         listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_KeyActions_actionsCount, f_nKeyActions, byte_order);
         length -= f_nKeyActions * 1;
-        struct_Action(tvb, offsetp, t, byte_order, f_totalActions);
+        struct_xkb_Action(tvb, offsetp, t, byte_order, f_totalActions);
         length -= f_totalActions * 8;
     }
     if ((f_present & (1 << 5)) != 0) {
-        struct_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
+        struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
         length -= f_totalKeyBehaviors * 4;
     }
     if ((f_present & (1 << 6)) != 0) {
-        listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_VirtualMods_vmods, f_nVModMapKeys, byte_order);
-        length -= f_nVModMapKeys * 1;
+        listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_VirtualMods_vmods, popcount(f_virtualMods), byte_order);
+        length -= popcount(f_virtualMods) * 1;
     }
     if ((f_present & (1 << 3)) != 0) {
-        struct_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
+        struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
         length -= f_totalKeyExplicit * 2;
     }
     if ((f_present & (1 << 2)) != 0) {
-        struct_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
+        struct_xkb_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
         length -= f_totalModMapKeys * 2;
     }
     if ((f_present & (1 << 7)) != 0) {
-        struct_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
+        struct_xkb_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
         length -= f_totalVModMapKeys * 4;
     }
 }
 
 static void xkbGetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_groups;
-    int f_getAllSI;
-    int f_firstSI;
-    int f_nSI;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_groups = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_groups, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23571,37 +22189,28 @@ static void xkbGetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetCompatMap_groups_mask_Group4, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_getAllSI = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_getAllSI, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstSI = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_firstSI, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nSI = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_nSI, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void xkbGetCompatMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_deviceID;
+    int sequence_number;
     int f_groupsRtrn;
-    int f_firstSIRtrn;
     int f_nSIRtrn;
-    int f_nTotalSI;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetCompatMap");
 
     REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-GetCompatMap)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_groupsRtrn = VALUE8(tvb, *offsetp);
@@ -23615,36 +22224,27 @@ static void xkbGetCompatMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     }
     *offsetp += 1;
     UNUSED(1);
-    f_firstSIRtrn = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_reply_firstSIRtrn, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_nSIRtrn = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_reply_nSIRtrn, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nTotalSI = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetCompatMap_reply_nTotalSI, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(16);
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_GetCompatMap_reply_si_rtrn, (16 * f_nSIRtrn), byte_order);
-    struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn));
+    struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSIRtrn);
+    struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn));
 }
 
 static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_recomputeActions;
-    int f_truncateSI;
     int f_groups;
-    int f_firstSI;
     int f_nSI;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetCompatMap_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(1);
-    f_recomputeActions = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetCompatMap_recomputeActions, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_truncateSI = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetCompatMap_truncateSI, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_groups = VALUE8(tvb, *offsetp);
@@ -23657,48 +22257,39 @@ static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetCompatMap_groups_mask_Group4, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_firstSI = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetCompatMap_firstSI, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_nSI = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetCompatMap_nSI, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_SetCompatMap_si, (16 * f_nSI), byte_order);
-    length -= (16 * f_nSI) * 1;
-    struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groups));
+    struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSI);
+    length -= f_nSI * 10;
+    struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groups));
     length -= popcount(f_groups) * 4;
 }
 
 static void xkbGetIndicatorState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorState_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
 }
 static void xkbGetIndicatorState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_deviceID;
-    int f_state;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetIndicatorState");
 
     REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorState_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-GetIndicatorState)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_state = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorState_reply_state, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
@@ -23706,130 +22297,87 @@ static void xkbGetIndicatorState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
 
 static void xkbGetIndicatorMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_which;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_which = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_which, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xkbGetIndicatorMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_deviceID;
+    int sequence_number;
     int f_which;
-    int f_realIndicators;
-    int f_nIndicators;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetIndicatorMap");
 
     REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-GetIndicatorMap)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_which = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_reply_which, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_realIndicators = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_reply_realIndicators, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_nIndicators = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_reply_nIndicators, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(15);
-    struct_IndicatorMap(tvb, offsetp, t, byte_order, f_nIndicators);
+    struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which));
 }
 
 static void xkbSetIndicatorMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
     int f_which;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
     f_which = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_which, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    struct_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which));
+    struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which));
     length -= popcount(f_which) * 12;
 }
 
 static void xkbGetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_ledClass;
-    int f_ledID;
-    int f_indicator;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_ledClass = field16(tvb, offsetp, t, hf_x11_xkb_GetNamedIndicator_ledClass, byte_order);
-    f_ledID = field16(tvb, offsetp, t, hf_x11_xkb_GetNamedIndicator_ledID, byte_order);
+    field16(tvb, offsetp, t, hf_x11_xkb_GetNamedIndicator_ledClass, byte_order);
+    field16(tvb, offsetp, t, hf_x11_xkb_GetNamedIndicator_ledID, byte_order);
     UNUSED(2);
-    f_indicator = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_indicator, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_deviceID;
-    int f_indicator;
-    int f_found;
-    int f_on;
-    int f_realIndicator;
-    int f_ndx;
-    int f_map_flags;
-    int f_map_whichGroups;
-    int f_map_groups;
-    int f_map_whichMods;
-    int f_map_mods;
-    int f_map_realMods;
-    int f_map_vmod;
-    int f_map_ctrls;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetNamedIndicator");
 
     REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-GetNamedIndicator)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_indicator = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_indicator, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_found = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_found, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_on = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_on, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_realIndicator = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_realIndicator, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_ndx = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_ndx, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_map_flags = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_map_flags, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23838,7 +22386,6 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetNamedIndicator_reply_map_flags_mask_NoExplicit, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_map_whichGroups = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_map_whichGroups, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23849,14 +22396,12 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetNamedIndicator_reply_map_whichGroups_mask_UseCompat, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_map_groups = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_map_groups, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetNamedIndicator_reply_map_groups_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_map_whichMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_map_whichMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23867,7 +22412,6 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetNamedIndicator_reply_map_whichMods_mask_UseCompat, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_map_mods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_map_mods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23882,7 +22426,6 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetNamedIndicator_reply_map_mods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_map_realMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_map_realMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23897,7 +22440,6 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetNamedIndicator_reply_map_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_map_vmod = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_map_vmod, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23919,7 +22461,6 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetNamedIndicator_reply_map_vmod_mask_15, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_map_ctrls = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_map_ctrls, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23938,49 +22479,29 @@ static void xkbGetNamedIndicator_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetNamedIndicator_reply_map_ctrls_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
+    proto_tree_add_item(t, hf_x11_xkb_GetNamedIndicator_reply_supported, tvb, *offsetp, 1, byte_order);
+    *offsetp += 1;
     UNUSED(3);
 }
 
 static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_ledClass;
-    int f_ledID;
-    int f_indicator;
-    int f_setState;
-    int f_on;
-    int f_setMap;
-    int f_createMap;
-    int f_map_flags;
-    int f_map_whichGroups;
-    int f_map_groups;
-    int f_map_whichMods;
-    int f_map_realMods;
-    int f_map_vmods;
-    int f_map_ctrls;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_ledClass = field16(tvb, offsetp, t, hf_x11_xkb_SetNamedIndicator_ledClass, byte_order);
-    f_ledID = field16(tvb, offsetp, t, hf_x11_xkb_SetNamedIndicator_ledID, byte_order);
+    field16(tvb, offsetp, t, hf_x11_xkb_SetNamedIndicator_ledClass, byte_order);
+    field16(tvb, offsetp, t, hf_x11_xkb_SetNamedIndicator_ledID, byte_order);
     UNUSED(2);
-    f_indicator = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_indicator, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_setState = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_setState, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_on = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_on, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_setMap = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_setMap, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_createMap = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_createMap, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
-    f_map_flags = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_map_flags, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -23989,7 +22510,6 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetNamedIndicator_map_flags_mask_NoExplicit, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_map_whichGroups = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_map_whichGroups, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24000,14 +22520,12 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetNamedIndicator_map_whichGroups_mask_UseCompat, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_map_groups = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_map_groups, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetNamedIndicator_map_groups_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_map_whichMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_map_whichMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24018,7 +22536,6 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetNamedIndicator_map_whichMods_mask_UseCompat, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_map_realMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_map_realMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24033,7 +22550,6 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetNamedIndicator_map_realMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_map_vmods = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_map_vmods, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24055,7 +22571,6 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetNamedIndicator_map_vmods_mask_15, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_map_ctrls = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetNamedIndicator_map_ctrls, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24078,13 +22593,9 @@ static void xkbSetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *off
 
 static void xkbGetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_which;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_which = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetNames_which, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24107,33 +22618,25 @@ static void xkbGetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
 }
 static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_deviceID;
+    int sequence_number;
     int f_which;
-    int f_minKeyCode;
-    int f_maxKeyCode;
     int f_nTypes;
     int f_groupNames;
     int f_virtualMods;
-    int f_firstKey;
     int f_nKeys;
     int f_indicators;
     int f_nRadioGroups;
     int f_nKeyAliases;
-    int f_nKTLevels;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetNames");
 
     REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-GetNames)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_which = VALUE32(tvb, *offsetp);
@@ -24156,10 +22659,8 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetNames_reply_which_mask_RGNames, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_minKeyCode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_minKeyCode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_maxKeyCode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_maxKeyCode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_nTypes = VALUE8(tvb, *offsetp);
@@ -24197,7 +22698,6 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetNames_reply_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_firstKey = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_firstKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_nKeys = VALUE8(tvb, *offsetp);
@@ -24212,43 +22712,30 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     f_nKeyAliases = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_nKeyAliases, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKTLevels = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_nKTLevels, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(4);
     if ((f_which & (1 << 0)) != 0) {
-        int f_keycodesName;
-        f_keycodesName = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_Keycodes_keycodesName, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
     if ((f_which & (1 << 1)) != 0) {
-        int f_geometryName;
-        f_geometryName = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_Geometry_geometryName, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
     if ((f_which & (1 << 2)) != 0) {
-        int f_symbolsName;
-        f_symbolsName = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_Symbols_symbolsName, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
     if ((f_which & (1 << 3)) != 0) {
-        int f_physSymbolsName;
-        f_physSymbolsName = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_PhysSymbols_physSymbolsName, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
     if ((f_which & (1 << 4)) != 0) {
-        int f_typesName;
-        f_typesName = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_Types_typesName, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
     if ((f_which & (1 << 5)) != 0) {
-        int f_compatName;
-        f_compatName = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_Compat_compatName, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
@@ -24256,8 +22743,16 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KeyTypeNames_typeNames, hf_x11_xkb_GetNames_reply_KeyTypeNames_typeNames_item, f_nTypes, byte_order);
     }
     if ((f_which & (1 << 7)) != 0) {
+        int sumof_nLevelsPerType = 0;
+        {
+            int i;
+            for (i = 0; i < f_nTypes; i++) {
+                sumof_nLevelsPerType += VALUE8(tvb, *offsetp + i * 1);
+            }
+        }
         listOfByte(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_nLevelsPerType, f_nTypes, byte_order);
-        listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, (length - 56) / 4, byte_order);
+        listOfByte(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_alignment_pad, (((f_nTypes + 3) & (~3)) - f_nTypes), byte_order);
+        listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order);
     }
     if ((f_which & (1 << 8)) != 0) {
         listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
@@ -24269,10 +22764,10 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, popcount(f_groupNames), byte_order);
     }
     if ((f_which & (1 << 9)) != 0) {
-        struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
+        struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
     }
     if ((f_which & (1 << 10)) != 0) {
-        struct_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
+        struct_xkb_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
     }
     if ((f_which & (1 << 13)) != 0) {
         listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_RGNames_radioGroupNames, hf_x11_xkb_GetNames_reply_RGNames_radioGroupNames_item, f_nRadioGroups, byte_order);
@@ -24281,21 +22776,15 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
 
 static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
     int f_virtualMods;
     int f_which;
-    int f_firstType;
     int f_nTypes;
-    int f_firstKTLevelt;
     int f_nKTLevels;
     int f_indicators;
     int f_groupNames;
     int f_nRadioGroups;
-    int f_firstKey;
     int f_nKeys;
     int f_nKeyAliases;
-    int f_totalKTLevelNames;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     f_virtualMods = VALUE16(tvb, *offsetp);
@@ -24340,13 +22829,11 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetNames_which_mask_RGNames, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_firstType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_firstType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_nTypes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_nTypes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKTLevelt = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_firstKTLevelt, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_nKTLevels = VALUE8(tvb, *offsetp);
@@ -24368,7 +22855,6 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
     f_nRadioGroups = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_nRadioGroups, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKey = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_firstKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_nKeys = VALUE8(tvb, *offsetp);
@@ -24378,42 +22864,29 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
     proto_tree_add_item(t, hf_x11_xkb_SetNames_nKeyAliases, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
-    f_totalKTLevelNames = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetNames_totalKTLevelNames, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     if ((f_which & (1 << 0)) != 0) {
-        int f_keycodesName;
-        f_keycodesName = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SetNames_Keycodes_keycodesName, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
     if ((f_which & (1 << 1)) != 0) {
-        int f_geometryName;
-        f_geometryName = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SetNames_Geometry_geometryName, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
     if ((f_which & (1 << 2)) != 0) {
-        int f_symbolsName;
-        f_symbolsName = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SetNames_Symbols_symbolsName, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
     if ((f_which & (1 << 3)) != 0) {
-        int f_physSymbolsName;
-        f_physSymbolsName = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SetNames_PhysSymbols_physSymbolsName, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
     if ((f_which & (1 << 4)) != 0) {
-        int f_typesName;
-        f_typesName = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SetNames_Types_typesName, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
     if ((f_which & (1 << 5)) != 0) {
-        int f_compatName;
-        f_compatName = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_SetNames_Compat_compatName, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
     }
@@ -24422,10 +22895,17 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
         length -= f_nTypes * 4;
     }
     if ((f_which & (1 << 7)) != 0) {
+        int sumof_nLevelsPerType = 0;
+        {
+            int i;
+            for (i = 0; i < f_nKTLevels; i++) {
+                sumof_nLevelsPerType += VALUE8(tvb, *offsetp + i * 1);
+            }
+        }
         listOfByte(tvb, offsetp, t, hf_x11_xkb_SetNames_KTLevelNames_nLevelsPerType, f_nKTLevels, byte_order);
         length -= f_nKTLevels * 1;
-        listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_KTLevelNames_ktLevelNames, hf_x11_xkb_SetNames_KTLevelNames_ktLevelNames_item, (length - 52) / 4, byte_order);
-        length -= (length - 52) / 4 * 4;
+        listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_KTLevelNames_ktLevelNames, hf_x11_xkb_SetNames_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order);
+        length -= sumof_nLevelsPerType * 4;
     }
     if ((f_which & (1 << 8)) != 0) {
         listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
@@ -24440,11 +22920,11 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
         length -= popcount(f_groupNames) * 4;
     }
     if ((f_which & (1 << 9)) != 0) {
-        struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
+        struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
         length -= f_nKeys * 1;
     }
     if ((f_which & (1 << 10)) != 0) {
-        struct_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
+        struct_xkb_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
         length -= f_nKeyAliases * 2;
     }
     if ((f_which & (1 << 13)) != 0) {
@@ -24453,174 +22933,11 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
     }
 }
 
-static void xkbGetGeometry(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
-{
-    int f_deviceSpec;
-    int f_name;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_deviceSpec, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    UNUSED(2);
-    f_name = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_name, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-}
-static void xkbGetGeometry_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
-{
-    int f_length, length, sequence_number;
-    int f_deviceID;
-    int f_name;
-    int f_found;
-    int f_widthMM;
-    int f_heightMM;
-    int f_nProperties;
-    int f_nColors;
-    int f_nShapes;
-    int f_nSections;
-    int f_nDoodads;
-    int f_nKeyAliases;
-    int f_baseColorNdx;
-    int f_labelColorNdx;
-
-    col_append_fstr(pinfo->cinfo, COL_INFO, "-GetGeometry");
-
-    REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_deviceID, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    sequence_number = VALUE16(tvb, *offsetp);
-    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
-            "sequencenumber: %d (xkb-GetGeometry)", sequence_number);
-    *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
-    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_name = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_name, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_found = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_found, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    UNUSED(1);
-    f_widthMM = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_widthMM, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_heightMM = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_heightMM, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_nProperties = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_nProperties, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_nColors = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_nColors, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_nShapes = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_nShapes, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_nSections = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_nSections, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_nDoodads = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_nDoodads, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_nKeyAliases = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_nKeyAliases, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_baseColorNdx = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_baseColorNdx, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_labelColorNdx = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetGeometry_reply_labelColorNdx, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    struct_CountedString16(tvb, offsetp, t, byte_order, 1);
-    struct_Property(tvb, offsetp, t, byte_order, f_nProperties);
-    struct_CountedString16(tvb, offsetp, t, byte_order, f_nColors);
-    struct_Shape(tvb, offsetp, t, byte_order, f_nShapes);
-    struct_Section(tvb, offsetp, t, byte_order, f_nSections);
-    struct_Doodad(tvb, offsetp, t, byte_order, f_nDoodads);
-    struct_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
-}
-
-static void xkbSetGeometry(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
-{
-    int f_deviceSpec;
-    int f_nShapes;
-    int f_nSections;
-    int f_name;
-    int f_widthMM;
-    int f_heightMM;
-    int f_nProperties;
-    int f_nColors;
-    int f_nDoodads;
-    int f_nKeyAliases;
-    int f_baseColorNdx;
-    int f_labelColorNdx;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_SetGeometry_deviceSpec, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_nShapes = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_SetGeometry_nShapes, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_nSections = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_SetGeometry_nSections, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_name = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_SetGeometry_name, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_widthMM = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_SetGeometry_widthMM, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_heightMM = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_SetGeometry_heightMM, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_nProperties = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_SetGeometry_nProperties, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_nColors = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_SetGeometry_nColors, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_nDoodads = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_SetGeometry_nDoodads, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_nKeyAliases = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_SetGeometry_nKeyAliases, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_baseColorNdx = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_SetGeometry_baseColorNdx, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_labelColorNdx = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_SetGeometry_labelColorNdx, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    UNUSED(2);
-    struct_CountedString16(tvb, offsetp, t, byte_order, 1);
-    struct_Property(tvb, offsetp, t, byte_order, f_nProperties);
-    length -= f_nProperties * 0;
-    struct_CountedString16(tvb, offsetp, t, byte_order, f_nColors);
-    length -= f_nColors * 0;
-    struct_Shape(tvb, offsetp, t, byte_order, f_nShapes);
-    length -= f_nShapes * 0;
-    struct_Section(tvb, offsetp, t, byte_order, f_nSections);
-    length -= f_nSections * 0;
-    struct_Doodad(tvb, offsetp, t, byte_order, f_nDoodads);
-    length -= f_nDoodads * 20;
-    struct_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
-    length -= f_nKeyAliases * 2;
-}
-
 static void xkbPerClientFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_change;
-    int f_value;
-    int f_ctrlsToChange;
-    int f_autoCtrls;
-    int f_autoCtrlsValues;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_change = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_change, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24631,7 +22948,6 @@ static void xkbPerClientFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_PerClientFlags_change_mask_SendEventUsesXKBState, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_value = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_value, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24642,7 +22958,6 @@ static void xkbPerClientFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_PerClientFlags_value_mask_SendEventUsesXKBState, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_ctrlsToChange = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_ctrlsToChange, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24661,7 +22976,6 @@ static void xkbPerClientFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_PerClientFlags_ctrlsToChange_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_autoCtrls = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_autoCtrls, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24680,7 +22994,6 @@ static void xkbPerClientFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_PerClientFlags_autoCtrls_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_autoCtrlsValues = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_autoCtrlsValues, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24702,28 +23015,19 @@ static void xkbPerClientFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
 }
 static void xkbPerClientFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_deviceID;
-    int f_supported;
-    int f_value;
-    int f_autoCtrls;
-    int f_autoCtrlsValues;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PerClientFlags");
 
     REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-PerClientFlags)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_supported = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_reply_supported, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24734,7 +23038,6 @@ static void xkbPerClientFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_PerClientFlags_reply_supported_mask_SendEventUsesXKBState, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_value = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_reply_value, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24745,7 +23048,6 @@ static void xkbPerClientFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_PerClientFlags_reply_value_mask_SendEventUsesXKBState, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_autoCtrls = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_reply_autoCtrls, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24764,7 +23066,6 @@ static void xkbPerClientFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_PerClientFlags_reply_autoCtrls_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_autoCtrlsValues = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_PerClientFlags_reply_autoCtrlsValues, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24788,75 +23089,30 @@ static void xkbPerClientFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
 
 static void xkbListComponents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_maxNames;
-    int f_keymapsSpecLen;
-    int f_keycodesSpecLen;
-    int f_typesSpecLen;
-    int f_compatMapSpecLen;
-    int f_symbolsSpecLen;
-    int f_geometrySpecLen;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_maxNames = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_maxNames, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_keymapsSpecLen = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_ListComponents_keymapsSpecLen, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_ListComponents_keymapsSpec, f_keymapsSpecLen, byte_order);
-    length -= f_keymapsSpecLen * 1;
-    f_keycodesSpecLen = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_ListComponents_keycodesSpecLen, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_ListComponents_keycodesSpec, f_keycodesSpecLen, byte_order);
-    length -= f_keycodesSpecLen * 1;
-    f_typesSpecLen = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_ListComponents_typesSpecLen, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_ListComponents_typesSpec, f_typesSpecLen, byte_order);
-    length -= f_typesSpecLen * 1;
-    f_compatMapSpecLen = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_ListComponents_compatMapSpecLen, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_ListComponents_compatMapSpec, f_compatMapSpecLen, byte_order);
-    length -= f_compatMapSpecLen * 1;
-    f_symbolsSpecLen = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_ListComponents_symbolsSpecLen, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_ListComponents_symbolsSpec, f_symbolsSpecLen, byte_order);
-    length -= f_symbolsSpecLen * 1;
-    f_geometrySpecLen = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_ListComponents_geometrySpecLen, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_ListComponents_geometrySpec, f_geometrySpecLen, byte_order);
-    length -= f_geometrySpecLen * 1;
 }
 static void xkbListComponents_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_deviceID;
+    int sequence_number;
     int f_nKeymaps;
     int f_nKeycodes;
     int f_nTypes;
     int f_nCompatMaps;
     int f_nSymbols;
     int f_nGeometries;
-    int f_extra;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ListComponents");
 
     REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-ListComponents)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_nKeymaps = VALUE16(tvb, *offsetp);
@@ -24877,34 +23133,21 @@ static void xkbListComponents_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
     f_nGeometries = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_reply_nGeometries, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_extra = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ListComponents_reply_extra, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(10);
-    struct_Listing(tvb, offsetp, t, byte_order, f_nKeymaps);
-    struct_Listing(tvb, offsetp, t, byte_order, f_nKeycodes);
-    struct_Listing(tvb, offsetp, t, byte_order, f_nTypes);
-    struct_Listing(tvb, offsetp, t, byte_order, f_nCompatMaps);
-    struct_Listing(tvb, offsetp, t, byte_order, f_nSymbols);
-    struct_Listing(tvb, offsetp, t, byte_order, f_nGeometries);
+    struct_xkb_Listing(tvb, offsetp, t, byte_order, f_nKeymaps);
+    struct_xkb_Listing(tvb, offsetp, t, byte_order, f_nKeycodes);
+    struct_xkb_Listing(tvb, offsetp, t, byte_order, f_nTypes);
+    struct_xkb_Listing(tvb, offsetp, t, byte_order, f_nCompatMaps);
+    struct_xkb_Listing(tvb, offsetp, t, byte_order, f_nSymbols);
+    struct_xkb_Listing(tvb, offsetp, t, byte_order, f_nGeometries);
 }
 
 static void xkbGetKbdByName(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_need;
-    int f_want;
-    int f_load;
-    int f_keymapsSpecLen;
-    int f_keycodesSpecLen;
-    int f_typesSpecLen;
-    int f_compatMapSpecLen;
-    int f_symbolsSpecLen;
-    int f_geometrySpecLen;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_need = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_need, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24918,7 +23161,6 @@ static void xkbGetKbdByName(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_need_mask_OtherNames, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_want = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_want, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -24932,79 +23174,34 @@ static void xkbGetKbdByName(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_want_mask_OtherNames, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_load = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_load, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
-    f_keymapsSpecLen = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_keymapsSpecLen, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_keymapsSpec, f_keymapsSpecLen, byte_order);
-    length -= f_keymapsSpecLen * 1;
-    f_keycodesSpecLen = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_keycodesSpecLen, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_keycodesSpec, f_keycodesSpecLen, byte_order);
-    length -= f_keycodesSpecLen * 1;
-    f_typesSpecLen = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_typesSpecLen, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_typesSpec, f_typesSpecLen, byte_order);
-    length -= f_typesSpecLen * 1;
-    f_compatMapSpecLen = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_compatMapSpecLen, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_compatMapSpec, f_compatMapSpecLen, byte_order);
-    length -= f_compatMapSpecLen * 1;
-    f_symbolsSpecLen = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_symbolsSpecLen, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_symbolsSpec, f_symbolsSpecLen, byte_order);
-    length -= f_symbolsSpecLen * 1;
-    f_geometrySpecLen = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_geometrySpecLen, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_geometrySpec, f_geometrySpecLen, byte_order);
-    length -= f_geometrySpecLen * 1;
 }
 static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_deviceID;
-    int f_minKeyCode;
-    int f_maxKeyCode;
-    int f_loaded;
-    int f_newKeyboard;
-    int f_found;
+    int sequence_number;
     int f_reported;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetKbdByName");
 
     REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-GetKbdByName)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minKeyCode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_minKeyCode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_maxKeyCode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_maxKeyCode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_loaded = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_loaded, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_newKeyboard = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_newKeyboard, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_found = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_found, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -25033,75 +23230,58 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     }
     *offsetp += 2;
     UNUSED(16);
-    if ((f_reported & (1 << 0)) != 0) {
-        int f_getmap_type;
-        int f_typeDeviceID;
-        int f_getmap_sequence;
-        int f_getmap_length;
-        int f_typeMinKeyCode;
-        int f_typeMaxKeyCode;
+    if ((f_reported & ((1 << 0)|(1 << 2)|(1 << 3))) != 0) {
         int f_present;
-        int f_firstType;
         int f_nTypes;
-        int f_totalTypes;
-        int f_firstKeySym;
-        int f_totalSyms;
         int f_nKeySyms;
-        int f_firstKeyAction;
         int f_totalActions;
         int f_nKeyActions;
-        int f_firstKeyBehavior;
-        int f_nKeyBehaviors;
         int f_totalKeyBehaviors;
-        int f_firstKeyExplicit;
-        int f_nKeyExplicit;
         int f_totalKeyExplicit;
-        int f_firstModMapKey;
-        int f_nModMapKeys;
         int f_totalModMapKeys;
-        int f_firstVModMapKey;
-        int f_nVModMapKeys;
         int f_totalVModMapKeys;
         int f_virtualMods;
-        f_getmap_type = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_getmap_type, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_typeDeviceID = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_typeDeviceID, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_getmap_sequence = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_getmap_sequence, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_getmap_length = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_getmap_length, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
         UNUSED(2);
-        f_typeMinKeyCode = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_typeMinKeyCode, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_typeMaxKeyCode = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_typeMaxKeyCode, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_present = field16(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_present, byte_order);
-        f_firstType = VALUE8(tvb, *offsetp);
+        f_present = VALUE16(tvb, *offsetp);
+        {
+            proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_present, tvb, *offsetp, 2, byte_order);
+            proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
+            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_Types_present_mask_KeyTypes, tvb, *offsetp, 2, byte_order);
+            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_Types_present_mask_KeySyms, tvb, *offsetp, 2, byte_order);
+            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_Types_present_mask_ModifierMap, tvb, *offsetp, 2, byte_order);
+            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_Types_present_mask_ExplicitComponents, tvb, *offsetp, 2, byte_order);
+            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_Types_present_mask_KeyActions, tvb, *offsetp, 2, byte_order);
+            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_Types_present_mask_KeyBehaviors, tvb, *offsetp, 2, byte_order);
+            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_Types_present_mask_VirtualMods, tvb, *offsetp, 2, byte_order);
+            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_Types_present_mask_VirtualModMap, tvb, *offsetp, 2, byte_order);
+        }
+        *offsetp += 2;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstType, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         f_nTypes = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nTypes, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_totalTypes = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_totalTypes, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_firstKeySym = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstKeySym, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_totalSyms = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_totalSyms, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         f_nKeySyms = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nKeySyms, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_firstKeyAction = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstKeyAction, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         f_totalActions = VALUE16(tvb, *offsetp);
@@ -25110,37 +23290,29 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         f_nKeyActions = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nKeyActions, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_firstKeyBehavior = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstKeyBehavior, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nKeyBehaviors = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nKeyBehaviors, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         f_totalKeyBehaviors = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_totalKeyBehaviors, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_firstKeyExplicit = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstKeyExplicit, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nKeyExplicit = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nKeyExplicit, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         f_totalKeyExplicit = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_totalKeyExplicit, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_firstModMapKey = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstModMapKey, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nModMapKeys = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nModMapKeys, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         f_totalModMapKeys = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_totalModMapKeys, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_firstVModMapKey = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_firstVModMapKey, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_nVModMapKeys = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_nVModMapKeys, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         f_totalVModMapKeys = VALUE8(tvb, *offsetp);
@@ -25170,40 +23342,42 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         }
         *offsetp += 2;
         if ((f_present & (1 << 0)) != 0) {
-            struct_KeyType(tvb, offsetp, t, byte_order, f_nTypes);
+            struct_xkb_KeyType(tvb, offsetp, t, byte_order, f_nTypes);
         }
         if ((f_present & (1 << 1)) != 0) {
-            struct_KeySymMap(tvb, offsetp, t, byte_order, f_nKeySyms);
+            struct_xkb_KeySymMap(tvb, offsetp, t, byte_order, f_nKeySyms);
         }
         if ((f_present & (1 << 4)) != 0) {
             listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_KeyActions_acts_rtrn_count, f_nKeyActions, byte_order);
-            struct_Action(tvb, offsetp, t, byte_order, f_totalActions);
+            struct_xkb_Action(tvb, offsetp, t, byte_order, f_totalActions);
         }
         if ((f_present & (1 << 5)) != 0) {
-            struct_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
+            struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
         }
         if ((f_present & (1 << 6)) != 0) {
-            listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_VirtualMods_vmods_rtrn, f_nVModMapKeys, byte_order);
+            listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order);
         }
         if ((f_present & (1 << 3)) != 0) {
-            struct_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
+            struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
         }
         if ((f_present & (1 << 2)) != 0) {
-            struct_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
+            struct_xkb_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
         }
         if ((f_present & (1 << 7)) != 0) {
-            struct_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
+            struct_xkb_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
         }
     }
     if ((f_reported & (1 << 1)) != 0) {
-        int f_compatDeviceID;
         int f_groupsRtrn;
-        int f_firstSIRtrn;
         int f_nSIRtrn;
-        int f_nTotalSI;
-        f_compatDeviceID = VALUE8(tvb, *offsetp);
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_compatmap_type, tvb, *offsetp, 1, byte_order);
+        *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_compatDeviceID, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_compatmap_sequence, tvb, *offsetp, 2, byte_order);
+        *offsetp += 2;
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_compatmap_length, tvb, *offsetp, 4, byte_order);
+        *offsetp += 4;
         f_groupsRtrn = VALUE8(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_groupsRtrn, tvb, *offsetp, 1, byte_order);
@@ -25215,356 +23389,55 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         }
         *offsetp += 1;
         UNUSED(1);
-        f_firstSIRtrn = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_firstSIRtrn, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         f_nSIRtrn = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_nSIRtrn, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_nTotalSI = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_nTotalSI, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
         UNUSED(16);
-        listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_CompatMap_si_rtrn, (16 * f_nSIRtrn), byte_order);
-        struct_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn));
-    }
-    if ((f_reported & (1 << 2)) != 0) {
-        int f_clientDeviceID;
-        int f_clientMinKeyCode;
-        int f_clientMaxKeyCode;
-        int f_present;
-        int f_firstType;
-        int f_nTypes;
-        int f_totalTypes;
-        int f_firstKeySym;
-        int f_totalSyms;
-        int f_nKeySyms;
-        int f_firstKeyAction;
-        int f_totalActions;
-        int f_nKeyActions;
-        int f_firstKeyBehavior;
-        int f_nKeyBehaviors;
-        int f_totalKeyBehaviors;
-        int f_firstKeyExplicit;
-        int f_nKeyExplicit;
-        int f_totalKeyExplicit;
-        int f_firstModMapKey;
-        int f_nModMapKeys;
-        int f_totalModMapKeys;
-        int f_firstVModMapKey;
-        int f_nVModMapKeys;
-        int f_totalVModMapKeys;
-        int f_virtualMods;
-        f_clientDeviceID = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_clientDeviceID, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        UNUSED(2);
-        f_clientMinKeyCode = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_clientMinKeyCode, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_clientMaxKeyCode = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_clientMaxKeyCode, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_present = field16(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_present, byte_order);
-        f_firstType = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_firstType, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nTypes = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_nTypes, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalTypes = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_totalTypes, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_firstKeySym = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_firstKeySym, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalSyms = VALUE16(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_totalSyms, tvb, *offsetp, 2, byte_order);
-        *offsetp += 2;
-        f_nKeySyms = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_nKeySyms, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_firstKeyAction = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_firstKeyAction, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalActions = VALUE16(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_totalActions, tvb, *offsetp, 2, byte_order);
-        *offsetp += 2;
-        f_nKeyActions = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_nKeyActions, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_firstKeyBehavior = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_firstKeyBehavior, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nKeyBehaviors = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_nKeyBehaviors, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalKeyBehaviors = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_totalKeyBehaviors, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_firstKeyExplicit = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_firstKeyExplicit, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nKeyExplicit = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_nKeyExplicit, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalKeyExplicit = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_totalKeyExplicit, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_firstModMapKey = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_firstModMapKey, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nModMapKeys = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_nModMapKeys, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalModMapKeys = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_totalModMapKeys, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_firstVModMapKey = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_firstVModMapKey, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nVModMapKeys = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_nVModMapKeys, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalVModMapKeys = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_totalVModMapKeys, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        UNUSED(1);
-        f_virtualMods = VALUE16(tvb, *offsetp);
-        {
-            proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods, tvb, *offsetp, 2, byte_order);
-            proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_0, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_1, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_2, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_3, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_4, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_5, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_6, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_7, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_8, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_9, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_10, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_11, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_12, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_13, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_14, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
-        }
-        *offsetp += 2;
-        if ((f_present & (1 << 0)) != 0) {
-            struct_KeyType(tvb, offsetp, t, byte_order, f_nTypes);
-        }
-        if ((f_present & (1 << 1)) != 0) {
-            struct_KeySymMap(tvb, offsetp, t, byte_order, f_nKeySyms);
-        }
-        if ((f_present & (1 << 4)) != 0) {
-            listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_KeyActions_acts_rtrn_count, f_nKeyActions, byte_order);
-            struct_Action(tvb, offsetp, t, byte_order, f_totalActions);
-        }
-        if ((f_present & (1 << 5)) != 0) {
-            struct_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
-        }
-        if ((f_present & (1 << 6)) != 0) {
-            listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_ClientSymbols_VirtualMods_vmods_rtrn, f_nVModMapKeys, byte_order);
-        }
-        if ((f_present & (1 << 3)) != 0) {
-            struct_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
-        }
-        if ((f_present & (1 << 2)) != 0) {
-            struct_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
-        }
-        if ((f_present & (1 << 7)) != 0) {
-            struct_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
-        }
-    }
-    if ((f_reported & (1 << 3)) != 0) {
-        int f_serverDeviceID;
-        int f_serverMinKeyCode;
-        int f_serverMaxKeyCode;
-        int f_present;
-        int f_firstType;
-        int f_nTypes;
-        int f_totalTypes;
-        int f_firstKeySym;
-        int f_totalSyms;
-        int f_nKeySyms;
-        int f_firstKeyAction;
-        int f_totalActions;
-        int f_nKeyActions;
-        int f_firstKeyBehavior;
-        int f_nKeyBehaviors;
-        int f_totalKeyBehaviors;
-        int f_firstKeyExplicit;
-        int f_nKeyExplicit;
-        int f_totalKeyExplicit;
-        int f_firstModMapKey;
-        int f_nModMapKeys;
-        int f_totalModMapKeys;
-        int f_firstVModMapKey;
-        int f_nVModMapKeys;
-        int f_totalVModMapKeys;
-        int f_virtualMods;
-        f_serverDeviceID = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_serverDeviceID, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        UNUSED(2);
-        f_serverMinKeyCode = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_serverMinKeyCode, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_serverMaxKeyCode = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_serverMaxKeyCode, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_present = field16(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_present, byte_order);
-        f_firstType = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_firstType, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nTypes = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_nTypes, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalTypes = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_totalTypes, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_firstKeySym = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_firstKeySym, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalSyms = VALUE16(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_totalSyms, tvb, *offsetp, 2, byte_order);
-        *offsetp += 2;
-        f_nKeySyms = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_nKeySyms, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_firstKeyAction = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_firstKeyAction, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalActions = VALUE16(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_totalActions, tvb, *offsetp, 2, byte_order);
-        *offsetp += 2;
-        f_nKeyActions = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_nKeyActions, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_firstKeyBehavior = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_firstKeyBehavior, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nKeyBehaviors = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_nKeyBehaviors, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalKeyBehaviors = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_totalKeyBehaviors, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_firstKeyExplicit = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_firstKeyExplicit, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nKeyExplicit = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_nKeyExplicit, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalKeyExplicit = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_totalKeyExplicit, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_firstModMapKey = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_firstModMapKey, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nModMapKeys = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_nModMapKeys, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalModMapKeys = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_totalModMapKeys, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_firstVModMapKey = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_firstVModMapKey, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nVModMapKeys = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_nVModMapKeys, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_totalVModMapKeys = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_totalVModMapKeys, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        UNUSED(1);
-        f_virtualMods = VALUE16(tvb, *offsetp);
-        {
-            proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods, tvb, *offsetp, 2, byte_order);
-            proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_0, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_1, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_2, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_3, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_4, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_5, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_6, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_7, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_8, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_9, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_10, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_11, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_12, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_13, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_14, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
-        }
-        *offsetp += 2;
-        if ((f_present & (1 << 0)) != 0) {
-            struct_KeyType(tvb, offsetp, t, byte_order, f_nTypes);
-        }
-        if ((f_present & (1 << 1)) != 0) {
-            struct_KeySymMap(tvb, offsetp, t, byte_order, f_nKeySyms);
-        }
-        if ((f_present & (1 << 4)) != 0) {
-            listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_KeyActions_acts_rtrn_count, f_nKeyActions, byte_order);
-            struct_Action(tvb, offsetp, t, byte_order, f_totalActions);
-        }
-        if ((f_present & (1 << 5)) != 0) {
-            struct_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
-        }
-        if ((f_present & (1 << 6)) != 0) {
-            listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_ServerSymbols_VirtualMods_vmods_rtrn, f_nVModMapKeys, byte_order);
-        }
-        if ((f_present & (1 << 3)) != 0) {
-            struct_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
-        }
-        if ((f_present & (1 << 2)) != 0) {
-            struct_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
-        }
-        if ((f_present & (1 << 7)) != 0) {
-            struct_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
-        }
+        struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSIRtrn);
+        struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn));
     }
     if ((f_reported & (1 << 4)) != 0) {
-        int f_indicatorDeviceID;
-        int f_which;
-        int f_realIndicators;
         int f_nIndicators;
-        f_indicatorDeviceID = VALUE8(tvb, *offsetp);
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_IndicatorMaps_indicatormap_type, tvb, *offsetp, 1, byte_order);
+        *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_IndicatorMaps_indicatorDeviceID, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_which = VALUE32(tvb, *offsetp);
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_IndicatorMaps_indicatormap_sequence, tvb, *offsetp, 2, byte_order);
+        *offsetp += 2;
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_IndicatorMaps_indicatormap_length, tvb, *offsetp, 4, byte_order);
+        *offsetp += 4;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_IndicatorMaps_which, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_realIndicators = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_IndicatorMaps_realIndicators, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
         f_nIndicators = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_IndicatorMaps_nIndicators, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         UNUSED(15);
-        struct_IndicatorMap(tvb, offsetp, t, byte_order, f_nIndicators);
+        struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, f_nIndicators);
     }
-    if ((f_reported & (1 << 5)) != 0) {
-        int f_keyDeviceID;
+    if ((f_reported & ((1 << 5)|(1 << 7))) != 0) {
         int f_which;
-        int f_keyMinKeyCode;
-        int f_keyMaxKeyCode;
         int f_nTypes;
         int f_groupNames;
         int f_virtualMods;
-        int f_firstKey;
         int f_nKeys;
         int f_indicators;
         int f_nRadioGroups;
         int f_nKeyAliases;
         int f_nKTLevels;
-        f_keyDeviceID = VALUE8(tvb, *offsetp);
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_keyname_type, tvb, *offsetp, 1, byte_order);
+        *offsetp += 1;
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_keyDeviceID, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_keyname_sequence, tvb, *offsetp, 2, byte_order);
+        *offsetp += 2;
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_keyname_length, tvb, *offsetp, 4, byte_order);
+        *offsetp += 4;
         f_which = VALUE32(tvb, *offsetp);
         {
             proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_which, tvb, *offsetp, 4, byte_order);
@@ -25585,10 +23458,8 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
             proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_KeyNames_which_mask_RGNames, tvb, *offsetp, 4, byte_order);
         }
         *offsetp += 4;
-        f_keyMinKeyCode = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_keyMinKeyCode, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_keyMaxKeyCode = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_keyMaxKeyCode, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         f_nTypes = VALUE8(tvb, *offsetp);
@@ -25626,7 +23497,6 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
             proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_KeyNames_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
         }
         *offsetp += 2;
-        f_firstKey = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_firstKey, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         f_nKeys = VALUE8(tvb, *offsetp);
@@ -25646,38 +23516,26 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
         *offsetp += 2;
         UNUSED(4);
         if ((f_which & (1 << 0)) != 0) {
-            int f_keycodesName;
-            f_keycodesName = VALUE32(tvb, *offsetp);
             proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_Keycodes_keycodesName, tvb, *offsetp, 4, byte_order);
             *offsetp += 4;
         }
         if ((f_which & (1 << 1)) != 0) {
-            int f_geometryName;
-            f_geometryName = VALUE32(tvb, *offsetp);
             proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_Geometry_geometryName, tvb, *offsetp, 4, byte_order);
             *offsetp += 4;
         }
         if ((f_which & (1 << 2)) != 0) {
-            int f_symbolsName;
-            f_symbolsName = VALUE32(tvb, *offsetp);
             proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_Symbols_symbolsName, tvb, *offsetp, 4, byte_order);
             *offsetp += 4;
         }
         if ((f_which & (1 << 3)) != 0) {
-            int f_physSymbolsName;
-            f_physSymbolsName = VALUE32(tvb, *offsetp);
             proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_PhysSymbols_physSymbolsName, tvb, *offsetp, 4, byte_order);
             *offsetp += 4;
         }
         if ((f_which & (1 << 4)) != 0) {
-            int f_typesName;
-            f_typesName = VALUE32(tvb, *offsetp);
             proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_Types_typesName, tvb, *offsetp, 4, byte_order);
             *offsetp += 4;
         }
         if ((f_which & (1 << 5)) != 0) {
-            int f_compatName;
-            f_compatName = VALUE32(tvb, *offsetp);
             proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_Compat_compatName, tvb, *offsetp, 4, byte_order);
             *offsetp += 4;
         }
@@ -25685,8 +23543,15 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
             listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KeyTypeNames_typeNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KeyTypeNames_typeNames_item, f_nTypes, byte_order);
         }
         if ((f_which & (1 << 7)) != 0) {
+            int sumof_nLevelsPerType = 0;
+            {
+                int i;
+                for (i = 0; i < f_nKTLevels; i++) {
+                    sumof_nLevelsPerType += VALUE8(tvb, *offsetp + i * 1);
+                }
+            }
             listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_nLevelsPerType, f_nKTLevels, byte_order);
-            listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, (length - 237) / 4, byte_order);
+            listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order);
         }
         if ((f_which & (1 << 8)) != 0) {
             listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
@@ -25698,251 +23563,57 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
             listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, popcount(f_groupNames), byte_order);
         }
         if ((f_which & (1 << 9)) != 0) {
-            struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
+            struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
         }
         if ((f_which & (1 << 10)) != 0) {
-            struct_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
+            struct_xkb_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
         }
         if ((f_which & (1 << 13)) != 0) {
             listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_RGNames_radioGroupNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_RGNames_radioGroupNames_item, f_nRadioGroups, byte_order);
         }
     }
-    if ((f_reported & (1 << 7)) != 0) {
-        int f_otherDeviceID;
-        int f_which;
-        int f_otherMinKeyCode;
-        int f_otherMaxKeyCode;
-        int f_nTypes;
-        int f_groupNames;
-        int f_virtualMods;
-        int f_firstKey;
-        int f_nKeys;
-        int f_indicators;
-        int f_nRadioGroups;
-        int f_nKeyAliases;
-        int f_nKTLevels;
-        f_otherDeviceID = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_otherDeviceID, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_which = VALUE32(tvb, *offsetp);
-        {
-            proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_which, tvb, *offsetp, 4, byte_order);
-            proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_Keycodes, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_Geometry, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_Symbols, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_PhysSymbols, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_Types, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_Compat, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_KeyTypeNames, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_KTLevelNames, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_IndicatorNames, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_KeyNames, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_KeyAliases, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_VirtualModNames, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_GroupNames, tvb, *offsetp, 4, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_which_mask_RGNames, tvb, *offsetp, 4, byte_order);
-        }
-        *offsetp += 4;
-        f_otherMinKeyCode = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_otherMinKeyCode, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_otherMaxKeyCode = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_otherMaxKeyCode, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nTypes = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_nTypes, tvb, *offsetp, 1, byte_order);
+    if ((f_reported & (1 << 6)) != 0) {
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_geometry_type, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_groupNames = VALUE8(tvb, *offsetp);
-        {
-            proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_groupNames, tvb, *offsetp, 1, byte_order);
-            proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_groupNames_mask_Group1, tvb, *offsetp, 1, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_groupNames_mask_Group2, tvb, *offsetp, 1, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_groupNames_mask_Group3, tvb, *offsetp, 1, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_groupNames_mask_Group4, tvb, *offsetp, 1, byte_order);
-        }
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_geometryDeviceID, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_virtualMods = VALUE16(tvb, *offsetp);
-        {
-            proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods, tvb, *offsetp, 2, byte_order);
-            proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_0, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_1, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_2, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_3, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_4, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_5, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_6, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_7, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_8, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_9, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_10, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_11, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_12, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_13, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_14, tvb, *offsetp, 2, byte_order);
-            proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_OtherNames_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
-        }
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_geometry_sequence, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_firstKey = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_firstKey, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nKeys = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_nKeys, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_indicators = VALUE32(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_indicators, tvb, *offsetp, 4, byte_order);
+        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_geometry_length, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_nRadioGroups = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_nRadioGroups, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nKeyAliases = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_nKeyAliases, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_nKTLevels = VALUE16(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_nKTLevels, tvb, *offsetp, 2, byte_order);
-        *offsetp += 2;
-        UNUSED(4);
-        if ((f_which & (1 << 0)) != 0) {
-            int f_keycodesName;
-            f_keycodesName = VALUE32(tvb, *offsetp);
-            proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_Keycodes_keycodesName, tvb, *offsetp, 4, byte_order);
-            *offsetp += 4;
-        }
-        if ((f_which & (1 << 1)) != 0) {
-            int f_geometryName;
-            f_geometryName = VALUE32(tvb, *offsetp);
-            proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_Geometry_geometryName, tvb, *offsetp, 4, byte_order);
-            *offsetp += 4;
-        }
-        if ((f_which & (1 << 2)) != 0) {
-            int f_symbolsName;
-            f_symbolsName = VALUE32(tvb, *offsetp);
-            proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_Symbols_symbolsName, tvb, *offsetp, 4, byte_order);
-            *offsetp += 4;
-        }
-        if ((f_which & (1 << 3)) != 0) {
-            int f_physSymbolsName;
-            f_physSymbolsName = VALUE32(tvb, *offsetp);
-            proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_PhysSymbols_physSymbolsName, tvb, *offsetp, 4, byte_order);
-            *offsetp += 4;
-        }
-        if ((f_which & (1 << 4)) != 0) {
-            int f_typesName;
-            f_typesName = VALUE32(tvb, *offsetp);
-            proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_Types_typesName, tvb, *offsetp, 4, byte_order);
-            *offsetp += 4;
-        }
-        if ((f_which & (1 << 5)) != 0) {
-            int f_compatName;
-            f_compatName = VALUE32(tvb, *offsetp);
-            proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_OtherNames_Compat_compatName, tvb, *offsetp, 4, byte_order);
-            *offsetp += 4;
-        }
-        if ((f_which & (1 << 6)) != 0) {
-            listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KeyTypeNames_typeNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_KeyTypeNames_typeNames_item, f_nTypes, byte_order);
-        }
-        if ((f_which & (1 << 7)) != 0) {
-            listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_nLevelsPerType, f_nKTLevels, byte_order);
-            listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames_item, (length - 286) / 4, byte_order);
-        }
-        if ((f_which & (1 << 8)) != 0) {
-            listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
-        }
-        if ((f_which & (1 << 11)) != 0) {
-            listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order);
-        }
-        if ((f_which & (1 << 12)) != 0) {
-            listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_OtherNames_GroupNames_groups_item, popcount(f_groupNames), byte_order);
-        }
-        if ((f_which & (1 << 9)) != 0) {
-            struct_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
-        }
-        if ((f_which & (1 << 10)) != 0) {
-            struct_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
-        }
-        if ((f_which & (1 << 13)) != 0) {
-            listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_RGNames_radioGroupNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_RGNames_radioGroupNames_item, f_nRadioGroups, byte_order);
-        }
-    }
-    if ((f_reported & (1 << 6)) != 0) {
-        int f_geometryDeviceID;
-        int f_name;
-        int f_geometryFound;
-        int f_widthMM;
-        int f_heightMM;
-        int f_nProperties;
-        int f_nColors;
-        int f_nShapes;
-        int f_nSections;
-        int f_nDoodads;
-        int f_nKeyAliases;
-        int f_baseColorNdx;
-        int f_labelColorNdx;
-        f_geometryDeviceID = VALUE8(tvb, *offsetp);
-        proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_geometryDeviceID, tvb, *offsetp, 1, byte_order);
-        *offsetp += 1;
-        f_name = VALUE32(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_name, tvb, *offsetp, 4, byte_order);
         *offsetp += 4;
-        f_geometryFound = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_geometryFound, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
         UNUSED(1);
-        f_widthMM = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_widthMM, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_heightMM = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_heightMM, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_nProperties = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_nProperties, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_nColors = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_nColors, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_nShapes = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_nShapes, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_nSections = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_nSections, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_nDoodads = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_nDoodads, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_nKeyAliases = VALUE16(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_nKeyAliases, tvb, *offsetp, 2, byte_order);
         *offsetp += 2;
-        f_baseColorNdx = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_baseColorNdx, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        f_labelColorNdx = VALUE8(tvb, *offsetp);
         proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_labelColorNdx, tvb, *offsetp, 1, byte_order);
         *offsetp += 1;
-        struct_CountedString16(tvb, offsetp, t, byte_order, 1);
-        struct_Property(tvb, offsetp, t, byte_order, f_nProperties);
-        struct_CountedString16(tvb, offsetp, t, byte_order, f_nColors);
-        struct_Shape(tvb, offsetp, t, byte_order, f_nShapes);
-        struct_Section(tvb, offsetp, t, byte_order, f_nSections);
-        struct_Doodad(tvb, offsetp, t, byte_order, f_nDoodads);
-        struct_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
+        struct_xkb_CountedString16(tvb, offsetp, t, byte_order, 1);
     }
 }
 
 static void xkbGetDeviceInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_wanted;
-    int f_allButtons;
-    int f_firstButton;
-    int f_nButtons;
-    int f_ledClass;
-    int f_ledID;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_wanted = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_wanted, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -25953,53 +23624,34 @@ static void xkbGetDeviceInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetDeviceInfo_wanted_mask_IndicatorState, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_allButtons = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_allButtons, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstButton = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_firstButton, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nButtons = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_nButtons, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
-    f_ledClass = field16(tvb, offsetp, t, hf_x11_xkb_GetDeviceInfo_ledClass, byte_order);
-    f_ledID = field16(tvb, offsetp, t, hf_x11_xkb_GetDeviceInfo_ledID, byte_order);
+    field16(tvb, offsetp, t, hf_x11_xkb_GetDeviceInfo_ledClass, byte_order);
+    field16(tvb, offsetp, t, hf_x11_xkb_GetDeviceInfo_ledID, byte_order);
 }
 static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_deviceID;
-    int f_present;
-    int f_supported;
-    int f_unsupported;
+    int sequence_number;
     int f_nDeviceLedFBs;
-    int f_firstBtnWanted;
-    int f_nBtnsWanted;
-    int f_firstBtnRtrn;
     int f_nBtnsRtrn;
-    int f_totalBtns;
-    int f_hasOwnState;
-    int f_dfltKbdFB;
-    int f_dfltLedFB;
-    int f_devType;
     int f_nameLen;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceInfo");
 
     REPLY(reply);
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-GetDeviceInfo)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_present = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_present, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26010,7 +23662,6 @@ static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetDeviceInfo_reply_present_mask_IndicatorState, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_supported = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_supported, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26021,7 +23672,6 @@ static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetDeviceInfo_reply_supported_mask_IndicatorState, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_unsupported = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_unsupported, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26035,55 +23685,43 @@ static void xkbGetDeviceInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     f_nDeviceLedFBs = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_nDeviceLedFBs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_firstBtnWanted = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_firstBtnWanted, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nBtnsWanted = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_nBtnsWanted, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstBtnRtrn = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_firstBtnRtrn, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_nBtnsRtrn = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_nBtnsRtrn, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_totalBtns = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_totalBtns, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_hasOwnState = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_hasOwnState, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_dfltKbdFB = field16(tvb, offsetp, t, hf_x11_xkb_GetDeviceInfo_reply_dfltKbdFB, byte_order);
-    f_dfltLedFB = field16(tvb, offsetp, t, hf_x11_xkb_GetDeviceInfo_reply_dfltLedFB, byte_order);
+    field16(tvb, offsetp, t, hf_x11_xkb_GetDeviceInfo_reply_dfltKbdFB, byte_order);
+    field16(tvb, offsetp, t, hf_x11_xkb_GetDeviceInfo_reply_dfltLedFB, byte_order);
     UNUSED(2);
-    f_devType = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_devType, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_nameLen = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_GetDeviceInfo_reply_nameLen, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfByte(tvb, offsetp, t, hf_x11_xkb_GetDeviceInfo_reply_name, f_nameLen, byte_order);
-    struct_Action(tvb, offsetp, t, byte_order, f_nBtnsRtrn);
-    struct_DeviceLedInfo(tvb, offsetp, t, byte_order, f_nDeviceLedFBs);
+    struct_xkb_Action(tvb, offsetp, t, byte_order, f_nBtnsRtrn);
+    struct_xkb_DeviceLedInfo(tvb, offsetp, t, byte_order, f_nDeviceLedFBs);
 }
 
 static void xkbSetDeviceInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_deviceSpec;
-    int f_firstBtn;
     int f_nBtns;
-    int f_change;
     int f_nDeviceLedFBs;
-    f_deviceSpec = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDeviceInfo_deviceSpec, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_firstBtn = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDeviceInfo_firstBtn, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     f_nBtns = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDeviceInfo_nBtns, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_change = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetDeviceInfo_change, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26097,33 +23735,25 @@ static void xkbSetDeviceInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp
     f_nDeviceLedFBs = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDeviceInfo_nDeviceLedFBs, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    struct_Action(tvb, offsetp, t, byte_order, f_nBtns);
+    struct_xkb_Action(tvb, offsetp, t, byte_order, f_nBtns);
     length -= f_nBtns * 8;
-    struct_DeviceLedInfo(tvb, offsetp, t, byte_order, f_nDeviceLedFBs);
+    struct_xkb_DeviceLedInfo(tvb, offsetp, t, byte_order, f_nDeviceLedFBs);
     length -= f_nDeviceLedFBs * 0;
 }
 
 static void xkbSetDebuggingFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
     int f_msgLength;
-    int f_affectFlags;
-    int f_flags;
-    int f_affectCtrls;
-    int f_ctrls;
     f_msgLength = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDebuggingFlags_msgLength, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(2);
-    f_affectFlags = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDebuggingFlags_affectFlags, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_flags = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDebuggingFlags_flags, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_affectCtrls = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDebuggingFlags_affectCtrls, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ctrls = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDebuggingFlags_ctrls, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     listOfByte(tvb, offsetp, t, hf_x11_xkb_SetDebuggingFlags_message, f_msgLength, byte_order);
@@ -26131,11 +23761,7 @@ static void xkbSetDebuggingFlags(tvbuff_t *tvb, packet_info *pinfo _U_, int *off
 }
 static void xkbSetDebuggingFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_currentFlags;
-    int f_currentCtrls;
-    int f_supportedFlags;
-    int f_supportedCtrls;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-SetDebuggingFlags");
 
@@ -26145,127 +23771,30 @@ static void xkbSetDebuggingFlags_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xkb-SetDebuggingFlags)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_currentFlags = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDebuggingFlags_reply_currentFlags, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_currentCtrls = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDebuggingFlags_reply_currentCtrls, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_supportedFlags = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDebuggingFlags_reply_supportedFlags, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_supportedCtrls = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_SetDebuggingFlags_reply_supportedCtrls, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(8);
 }
 
-static void xkbNewKeyboardNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
-{
-    int f_xkbType;
-    int f_sequence;
-    int f_time;
-    int f_deviceID;
-    int f_oldDeviceID;
-    int f_minKeyCode;
-    int f_maxKeyCode;
-    int f_oldMinKeyCode;
-    int f_oldMaxKeyCode;
-    int f_requestMajor;
-    int f_requestMinor;
-    int f_changed;
-    f_xkbType = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_NewKeyboardNotify_xkbType, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    CARD16(event_sequencenumber);
-    f_sequence = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_NewKeyboardNotify_sequence, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_NewKeyboardNotify_time, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_deviceID = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_NewKeyboardNotify_deviceID, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_oldDeviceID = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_NewKeyboardNotify_oldDeviceID, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_minKeyCode = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_NewKeyboardNotify_minKeyCode, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_maxKeyCode = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_NewKeyboardNotify_maxKeyCode, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_oldMinKeyCode = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_NewKeyboardNotify_oldMinKeyCode, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_oldMaxKeyCode = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_NewKeyboardNotify_oldMaxKeyCode, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_requestMajor = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_NewKeyboardNotify_requestMajor, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_requestMinor = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_NewKeyboardNotify_requestMinor, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_changed = VALUE16(tvb, *offsetp);
-    {
-        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_NewKeyboardNotify_changed, tvb, *offsetp, 2, byte_order);
-        proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_NewKeyboardNotify_changed_mask_Keycodes, tvb, *offsetp, 2, byte_order);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_NewKeyboardNotify_changed_mask_Geometry, tvb, *offsetp, 2, byte_order);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_NewKeyboardNotify_changed_mask_DeviceID, tvb, *offsetp, 2, byte_order);
-    }
-    *offsetp += 2;
-    UNUSED(14);
-}
-
 static void xkbMapNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_xkbType;
-    int f_sequence;
-    int f_time;
-    int f_deviceID;
-    int f_ptrBtnActions;
-    int f_changed;
-    int f_minKeyCode;
-    int f_maxKeyCode;
-    int f_firstType;
-    int f_nTypes;
-    int f_firstKeySym;
-    int f_nKeySyms;
-    int f_firstKeyAct;
-    int f_nKeyActs;
-    int f_firstKeyBehavior;
-    int f_nKeyBehavior;
-    int f_firstKeyExplicit;
-    int f_nKeyExplicit;
-    int f_firstModMapKey;
-    int f_nModMapKeys;
-    int f_firstVModMapKey;
-    int f_nVModMapKeys;
-    int f_virtualMods;
-    f_xkbType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_xkbType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_sequence = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_MapNotify_sequence, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_ptrBtnActions = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_ptrBtnActions, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_changed = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_MapNotify_changed, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26279,55 +23808,38 @@ static void xkbMapNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_MapNotify_changed_mask_VirtualModMap, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_minKeyCode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_minKeyCode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_maxKeyCode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_maxKeyCode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_firstType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nTypes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_nTypes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeySym = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_firstKeySym, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeySyms = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_nKeySyms, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeyAct = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_firstKeyAct, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyActs = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_nKeyActs, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeyBehavior = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_firstKeyBehavior, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyBehavior = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_nKeyBehavior, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstKeyExplicit = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_firstKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyExplicit = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_nKeyExplicit, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstModMapKey = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_firstModMapKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nModMapKeys = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_nModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstVModMapKey = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_firstVModMapKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nVModMapKeys = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_MapNotify_nVModMapKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_virtualMods = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_MapNotify_virtualMods, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26352,45 +23864,16 @@ static void xkbMapNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_
     UNUSED(2);
 }
 
+
 static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_xkbType;
-    int f_sequence;
-    int f_time;
-    int f_deviceID;
-    int f_mods;
-    int f_baseMods;
-    int f_latchedMods;
-    int f_lockedMods;
-    int f_group;
-    int f_baseGroup;
-    int f_latchedGroup;
-    int f_lockedGroup;
-    int f_compatState;
-    int f_grabMods;
-    int f_compatGrabMods;
-    int f_lookupMods;
-    int f_compatLoockupMods;
-    int f_ptrBtnState;
-    int f_changed;
-    int f_keycode;
-    int f_eventType;
-    int f_requestMajor;
-    int f_requestMinor;
-    f_xkbType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_StateNotify_xkbType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_sequence = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_StateNotify_sequence, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_StateNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_StateNotify_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_mods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_StateNotify_mods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26405,7 +23888,6 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_StateNotify_mods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_baseMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_StateNotify_baseMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26420,7 +23902,6 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_StateNotify_baseMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_latchedMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_StateNotify_latchedMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26435,7 +23916,6 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_StateNotify_latchedMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_lockedMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_StateNotify_lockedMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26450,15 +23930,12 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_StateNotify_lockedMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_group = field8(tvb, offsetp, t, hf_x11_xkb_StateNotify_group, byte_order);
-    f_baseGroup = VALUE16(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_xkb_StateNotify_group, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_StateNotify_baseGroup, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_latchedGroup = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_StateNotify_latchedGroup, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_lockedGroup = field8(tvb, offsetp, t, hf_x11_xkb_StateNotify_lockedGroup, byte_order);
-    f_compatState = VALUE8(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_xkb_StateNotify_lockedGroup, byte_order);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_StateNotify_compatState, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26473,7 +23950,6 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_StateNotify_compatState_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_grabMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_StateNotify_grabMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26488,7 +23964,6 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_StateNotify_grabMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_compatGrabMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_StateNotify_compatGrabMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26503,7 +23978,6 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_StateNotify_compatGrabMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_lookupMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_StateNotify_lookupMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26518,7 +23992,6 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_StateNotify_lookupMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_compatLoockupMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_StateNotify_compatLoockupMods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26533,7 +24006,6 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_StateNotify_compatLoockupMods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_ptrBtnState = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_StateNotify_ptrBtnState, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26552,7 +24024,6 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_StateNotify_ptrBtnState_mask_Button5, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_changed = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_StateNotify_changed, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26572,52 +24043,29 @@ static void xkbStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_StateNotify_changed_mask_PointerButtons, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_keycode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_StateNotify_keycode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_eventType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_StateNotify_eventType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_requestMajor = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_StateNotify_requestMajor, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_requestMinor = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_StateNotify_requestMinor, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
+
 static void xkbControlsNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_xkbType;
-    int f_sequence;
-    int f_time;
-    int f_deviceID;
-    int f_numGroups;
-    int f_changedControls;
-    int f_enabledControls;
-    int f_enabledControlChanges;
-    int f_keycode;
-    int f_eventType;
-    int f_requestMajor;
-    int f_requestMinor;
-    f_xkbType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ControlsNotify_xkbType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_sequence = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_ControlsNotify_sequence, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ControlsNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ControlsNotify_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_numGroups = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ControlsNotify_numGroups, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(2);
-    f_changedControls = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_ControlsNotify_changedControls, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26628,7 +24076,6 @@ static void xkbControlsNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_ControlsNotify_changedControls_mask_ControlsEnabled, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_enabledControls = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_ControlsNotify_enabledControls, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26647,7 +24094,6 @@ static void xkbControlsNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_ControlsNotify_enabledControls_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_enabledControlChanges = VALUE32(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_ControlsNotify_enabledControlChanges, tvb, *offsetp, 4, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26666,116 +24112,64 @@ static void xkbControlsNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_ControlsNotify_enabledControlChanges_mask_IgnoreGroupLockMask, tvb, *offsetp, 4, byte_order);
     }
     *offsetp += 4;
-    f_keycode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ControlsNotify_keycode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_eventType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ControlsNotify_eventType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_requestMajor = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ControlsNotify_requestMajor, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_requestMinor = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ControlsNotify_requestMinor, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(4);
 }
 
+
 static void xkbIndicatorStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_xkbType;
-    int f_sequence;
-    int f_time;
-    int f_deviceID;
-    int f_state;
-    int f_stateChanged;
-    f_xkbType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_IndicatorStateNotify_xkbType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_sequence = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_IndicatorStateNotify_sequence, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_IndicatorStateNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_IndicatorStateNotify_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
-    f_state = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_IndicatorStateNotify_state, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_stateChanged = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_IndicatorStateNotify_stateChanged, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
 }
 
+
 static void xkbIndicatorMapNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_xkbType;
-    int f_sequence;
-    int f_time;
-    int f_deviceID;
-    int f_state;
-    int f_mapChanged;
-    f_xkbType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_IndicatorMapNotify_xkbType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_sequence = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_IndicatorMapNotify_sequence, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_IndicatorMapNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_IndicatorMapNotify_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
-    f_state = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_IndicatorMapNotify_state, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_mapChanged = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_IndicatorMapNotify_mapChanged, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(12);
 }
 
+
 static void xkbNamesNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_xkbType;
-    int f_sequence;
-    int f_time;
-    int f_deviceID;
-    int f_changed;
-    int f_firstType;
-    int f_nTypes;
-    int f_firstLevelName;
-    int f_nLevelNames;
-    int f_nRadioGroups;
-    int f_nKeyAliases;
-    int f_changedGroupNames;
-    int f_changedVirtualMods;
-    int f_firstKey;
-    int f_nKeys;
-    int f_changedIndicators;
-    f_xkbType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_NamesNotify_xkbType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_sequence = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_NamesNotify_sequence, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_NamesNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_NamesNotify_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
-    f_changed = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_NamesNotify_changed, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26795,26 +24189,19 @@ static void xkbNamesNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_NamesNotify_changed_mask_RGNames, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_firstType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_NamesNotify_firstType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nTypes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_NamesNotify_nTypes, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_firstLevelName = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_NamesNotify_firstLevelName, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nLevelNames = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_NamesNotify_nLevelNames, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
-    f_nRadioGroups = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_NamesNotify_nRadioGroups, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeyAliases = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_NamesNotify_nKeyAliases, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_changedGroupNames = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_NamesNotify_changedGroupNames, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26824,7 +24211,6 @@ static void xkbNamesNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_NamesNotify_changedGroupNames_mask_Group4, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_changedVirtualMods = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_NamesNotify_changedVirtualMods, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26846,42 +24232,25 @@ static void xkbNamesNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byt
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_NamesNotify_changedVirtualMods_mask_15, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_firstKey = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_NamesNotify_firstKey, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nKeys = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_NamesNotify_nKeys, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_changedIndicators = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_NamesNotify_changedIndicators, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(4);
 }
 
+
 static void xkbCompatMapNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_xkbType;
-    int f_sequence;
-    int f_time;
-    int f_deviceID;
-    int f_changedGroups;
-    int f_firstSI;
-    int f_nSI;
-    int f_nTotalSI;
-    f_xkbType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_CompatMapNotify_xkbType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_sequence = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_CompatMapNotify_sequence, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_CompatMapNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_CompatMapNotify_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_changedGroups = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_CompatMapNotify_changedGroups, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -26891,104 +24260,59 @@ static void xkbCompatMapNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_CompatMapNotify_changedGroups_mask_Group4, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_firstSI = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_CompatMapNotify_firstSI, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nSI = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_CompatMapNotify_nSI, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_nTotalSI = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_CompatMapNotify_nTotalSI, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(16);
 }
 
+
 static void xkbBellNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_xkbType;
-    int f_sequence;
-    int f_time;
-    int f_deviceID;
-    int f_bellClass;
-    int f_bellID;
-    int f_percent;
-    int f_pitch;
-    int f_duration;
-    int f_name;
-    int f_window;
-    int f_eventOnly;
-    f_xkbType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_BellNotify_xkbType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_sequence = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_BellNotify_sequence, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_BellNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_BellNotify_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_bellClass = field8(tvb, offsetp, t, hf_x11_xkb_BellNotify_bellClass, byte_order);
-    f_bellID = VALUE8(tvb, *offsetp);
+    field8(tvb, offsetp, t, hf_x11_xkb_BellNotify_bellClass, byte_order);
     proto_tree_add_item(t, hf_x11_xkb_BellNotify_bellID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_percent = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_BellNotify_percent, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_pitch = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_BellNotify_pitch, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_duration = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_BellNotify_duration, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_name = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_BellNotify_name, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_BellNotify_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_eventOnly = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_BellNotify_eventOnly, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(7);
 }
 
+
 static void xkbActionMessage(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_xkbType;
-    int f_sequence;
-    int f_time;
-    int f_deviceID;
-    int f_keycode;
-    int f_press;
-    int f_keyEventFollows;
-    int f_mods;
-    int f_group;
-    f_xkbType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ActionMessage_xkbType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_sequence = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_ActionMessage_sequence, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ActionMessage_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ActionMessage_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_keycode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ActionMessage_keycode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_press = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ActionMessage_press, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_keyEventFollows = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ActionMessage_keyEventFollows, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_mods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_ActionMessage_mods, tvb, *offsetp, 1, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -27003,38 +24327,23 @@ static void xkbActionMessage(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint b
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_ActionMessage_mods_mask_Any, tvb, *offsetp, 1, byte_order);
     }
     *offsetp += 1;
-    f_group = field8(tvb, offsetp, t, hf_x11_xkb_ActionMessage_group, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xkb_ActionMessage_group, byte_order);
     listOfByte(tvb, offsetp, t, hf_x11_xkb_ActionMessage_message, 8, byte_order);
     UNUSED(10);
 }
 
+
 static void xkbAccessXNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_xkbType;
-    int f_sequence;
-    int f_time;
-    int f_deviceID;
-    int f_keycode;
-    int f_detailt;
-    int f_slowKeysDelay;
-    int f_debounceDelay;
-    f_xkbType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_AccessXNotify_xkbType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_sequence = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_AccessXNotify_sequence, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_AccessXNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_AccessXNotify_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_keycode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_AccessXNotify_keycode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_detailt = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_AccessXNotify_detailt, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -27047,45 +24356,24 @@ static void xkbAccessXNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint b
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_AccessXNotify_detailt_mask_AXKWarning, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_slowKeysDelay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_AccessXNotify_slowKeysDelay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_debounceDelay = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_AccessXNotify_debounceDelay, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(16);
 }
 
+
 static void xkbExtensionDeviceNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_xkbType;
-    int f_sequence;
-    int f_time;
-    int f_deviceID;
-    int f_reason;
-    int f_ledClass;
-    int f_ledID;
-    int f_ledsDefined;
-    int f_ledState;
-    int f_firstButton;
-    int f_nButtons;
-    int f_supported;
-    int f_unsupported;
-    f_xkbType = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_xkbType, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_sequence = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_sequence, tvb, *offsetp, 2, byte_order);
-    *offsetp += 2;
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_deviceID = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_deviceID, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
-    f_reason = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_reason, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -27096,23 +24384,17 @@ static void xkbExtensionDeviceNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_ExtensionDeviceNotify_reason_mask_IndicatorState, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_ledClass = field16(tvb, offsetp, t, hf_x11_xkb_ExtensionDeviceNotify_ledClass, byte_order);
-    f_ledID = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_ledID, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    f_ledsDefined = VALUE32(tvb, *offsetp);
+    field16(tvb, offsetp, t, hf_x11_xkb_ExtensionDeviceNotify_ledClass, byte_order);
+    proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_ledID, tvb, *offsetp, 2, byte_order);
+    *offsetp += 2;
     proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_ledsDefined, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_ledState = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_ledState, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_firstButton = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_firstButton, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_nButtons = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_nButtons, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_supported = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_supported, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -27123,7 +24405,6 @@ static void xkbExtensionDeviceNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_ExtensionDeviceNotify_supported_mask_IndicatorState, tvb, *offsetp, 2, byte_order);
     }
     *offsetp += 2;
-    f_unsupported = VALUE16(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_ExtensionDeviceNotify_unsupported, tvb, *offsetp, 2, byte_order);
         proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
@@ -27136,6 +24417,7 @@ static void xkbExtensionDeviceNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t,
     *offsetp += 2;
     UNUSED(2);
 }
+
 static const value_string xkb_extension_minor[] = {
     { 0, "UseExtension" },
     { 1, "SelectEvents" },
@@ -27155,8 +24437,6 @@ static const value_string xkb_extension_minor[] = {
     { 16, "SetNamedIndicator" },
     { 17, "GetNames" },
     { 18, "SetNames" },
-    { 19, "GetGeometry" },
-    { 20, "SetGeometry" },
     { 21, "PerClientFlags" },
     { 22, "ListComponents" },
     { 23, "GetKbdByName" },
@@ -27166,7 +24446,6 @@ static const value_string xkb_extension_minor[] = {
     { 0, NULL }
 };
 const x11_event_info xkb_events[] = {
-    { "xkb-NewKeyboardNotify", xkbNewKeyboardNotify },
     { "xkb-MapNotify", xkbMapNotify },
     { "xkb-StateNotify", xkbStateNotify },
     { "xkb-ControlsNotify", xkbControlsNotify },
@@ -27190,7 +24469,6 @@ static x11_reply_info xkb_replies[] = {
     { 13, xkbGetIndicatorMap_Reply },
     { 15, xkbGetNamedIndicator_Reply },
     { 17, xkbGetNames_Reply },
-    { 19, xkbGetGeometry_Reply },
     { 21, xkbPerClientFlags_Reply },
     { 22, xkbListComponents_Reply },
     { 23, xkbGetKbdByName_Reply },
@@ -27263,12 +24541,6 @@ static void dispatch_xkb(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_
     case 18:
 	xkbSetNames(tvb, pinfo, offsetp, t, byte_order, length);
 	break;
-    case 19:
-	xkbGetGeometry(tvb, pinfo, offsetp, t, byte_order, length);
-	break;
-    case 20:
-	xkbSetGeometry(tvb, pinfo, offsetp, t, byte_order, length);
-	break;
     case 21:
 	xkbPerClientFlags(tvb, pinfo, offsetp, t, byte_order, length);
 	break;
@@ -27294,10 +24566,10 @@ static void dispatch_xkb(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_
 
 static void register_xkb(void)
 {
-    set_handler("XKEYBOARD", dispatch_xkb, xkb_errors, xkb_events, xkb_replies);
+    set_handler("XKEYBOARD", dispatch_xkb, xkb_errors, xkb_events, NULL, xkb_replies);
 }
 
-static int struct_size_PRINTER(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_xprint_PRINTER(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_nameLen;
@@ -27309,7 +24581,7 @@ static int struct_size_PRINTER(tvbuff_t *tvb, int *offsetp, guint byte_order _U_
     return size + 8;
 }
 
-static void struct_PRINTER(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xprint_PRINTER(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
@@ -27318,16 +24590,16 @@ static void struct_PRINTER(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint
 	int f_nameLen;
 	int f_descLen;
 
-	item = proto_tree_add_item(root, hf_x11_struct_PRINTER, tvb, *offsetp, struct_size_PRINTER(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xprint_PRINTER, tvb, *offsetp, struct_size_xprint_PRINTER(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
 	f_nameLen = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_PRINTER_nameLen, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xprint_PRINTER_nameLen, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	listOfByte(tvb, offsetp, t, hf_x11_struct_PRINTER_name, f_nameLen, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xprint_PRINTER_name, f_nameLen, byte_order);
 	f_descLen = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_PRINTER_descLen, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xprint_PRINTER_descLen, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	listOfByte(tvb, offsetp, t, hf_x11_struct_PRINTER_description, f_descLen, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xprint_PRINTER_description, f_descLen, byte_order);
     }
 }
 
@@ -27336,9 +24608,7 @@ static void xprintPrintQueryVersion(tvbuff_t *tvb _U_, packet_info *pinfo _U_, i
 }
 static void xprintPrintQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintQueryVersion");
 
@@ -27348,14 +24618,10 @@ static void xprintPrintQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xprint-PrintQueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintQueryVersion_reply_major_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintQueryVersion_reply_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
@@ -27377,7 +24643,7 @@ static void xprintPrintGetPrinterList(tvbuff_t *tvb, packet_info *pinfo _U_, int
 }
 static void xprintPrintGetPrinterList_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_listCount;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintGetPrinterList");
@@ -27388,15 +24654,13 @@ static void xprintPrintGetPrinterList_Reply(tvbuff_t *tvb, packet_info *pinfo, i
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xprint-PrintGetPrinterList)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_listCount = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetPrinterList_reply_listCount, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_PRINTER(tvb, offsetp, t, byte_order, f_listCount);
+    struct_xprint_PRINTER(tvb, offsetp, t, byte_order, f_listCount);
 }
 
 static void xprintPrintRehashPrinterList(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp _U_, proto_tree *t _U_, guint byte_order _U_, int length _U_)
@@ -27405,10 +24669,8 @@ static void xprintPrintRehashPrinterList(tvbuff_t *tvb _U_, packet_info *pinfo _
 
 static void xprintCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_id;
     int f_printerNameLen;
     int f_localeLen;
-    f_context_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_CreateContext_context_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_printerNameLen = VALUE32(tvb, *offsetp);
@@ -27425,8 +24687,6 @@ static void xprintCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
 
 static void xprintPrintSetContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintSetContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
@@ -27436,8 +24696,7 @@ static void xprintPrintGetContext(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int
 }
 static void xprintPrintGetContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_context;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintGetContext");
 
@@ -27447,19 +24706,14 @@ static void xprintPrintGetContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xprint-PrintGetContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetContext_reply_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xprintPrintDestroyContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintDestroyContext_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
@@ -27469,8 +24723,7 @@ static void xprintPrintGetScreenOfContext(tvbuff_t *tvb _U_, packet_info *pinfo
 }
 static void xprintPrintGetScreenOfContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_root;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintGetScreenOfContext");
 
@@ -27480,63 +24733,46 @@ static void xprintPrintGetScreenOfContext_Reply(tvbuff_t *tvb, packet_info *pinf
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xprint-PrintGetScreenOfContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_root = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetScreenOfContext_reply_root, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xprintPrintStartJob(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_output_mode;
-    f_output_mode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintStartJob_output_mode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
 static void xprintPrintEndJob(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_cancel;
-    f_cancel = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintEndJob_cancel, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
 static void xprintPrintStartDoc(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_driver_mode;
-    f_driver_mode = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintStartDoc_driver_mode, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
 static void xprintPrintEndDoc(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_cancel;
-    f_cancel = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintEndDoc_cancel, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
 static void xprintPrintPutDocumentData(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
     int f_len_data;
-    int f_len_fmt;
-    int f_len_options;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintPutDocumentData_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_len_data = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintPutDocumentData_len_data, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_len_fmt = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintPutDocumentData_len_fmt, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_len_options = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintPutDocumentData_len_options, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfByte(tvb, offsetp, t, hf_x11_xprint_PrintPutDocumentData_data, f_len_data, byte_order);
@@ -27547,20 +24783,14 @@ static void xprintPrintPutDocumentData(tvbuff_t *tvb, packet_info *pinfo _U_, in
 
 static void xprintPrintGetDocumentData(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    int f_max_bytes;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetDocumentData_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_max_bytes = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetDocumentData_max_bytes, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xprintPrintGetDocumentData_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status_code;
-    int f_finished_flag;
+    int sequence_number;
     int f_dataLen;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintGetDocumentData");
@@ -27571,14 +24801,10 @@ static void xprintPrintGetDocumentData_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xprint-PrintGetDocumentData)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_status_code = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetDocumentData_reply_status_code, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_finished_flag = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetDocumentData_reply_finished_flag, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_dataLen = VALUE32(tvb, *offsetp);
@@ -27590,16 +24816,12 @@ static void xprintPrintGetDocumentData_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void xprintPrintStartPage(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintStartPage_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xprintPrintEndPage(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_cancel;
-    f_cancel = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintEndPage_cancel, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -27607,22 +24829,18 @@ static void xprintPrintEndPage(tvbuff_t *tvb, packet_info *pinfo _U_, int *offse
 
 static void xprintPrintSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintSelectInput_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xprintPrintInputSelected(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintInputSelected_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xprintPrintInputSelected_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintInputSelected");
 
@@ -27632,29 +24850,21 @@ static void xprintPrintInputSelected_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xprint-PrintInputSelected)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xprintPrintGetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    int f_pool;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetAttributes_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pool = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetAttributes_pool, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
 }
 static void xprintPrintGetAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_stringLen;
-    int f_attributes;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintGetAttributes");
 
@@ -27664,31 +24874,23 @@ static void xprintPrintGetAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xprint-PrintGetAttributes)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_stringLen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetAttributes_reply_stringLen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    f_attributes = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetAttributes_reply_attributes, tvb, *offsetp, 1, ENC_ASCII|ENC_NA);
     *offsetp += 1;
 }
 
 static void xprintPrintGetOneAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
     int f_nameLen;
-    int f_pool;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetOneAttributes_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_nameLen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetOneAttributes_nameLen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pool = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetOneAttributes_pool, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -27697,7 +24899,7 @@ static void xprintPrintGetOneAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, i
 }
 static void xprintPrintGetOneAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_valueLen;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintGetOneAttributes");
@@ -27708,8 +24910,6 @@ static void xprintPrintGetOneAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xprint-PrintGetOneAttributes)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_valueLen = VALUE32(tvb, *offsetp);
@@ -27721,20 +24921,12 @@ static void xprintPrintGetOneAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void xprintPrintSetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    int f_stringLen;
-    int f_pool;
-    int f_rule;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintSetAttributes_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_stringLen = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintSetAttributes_stringLen, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_pool = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintSetAttributes_pool, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_rule = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintSetAttributes_rule, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(2);
@@ -27743,20 +24935,12 @@ static void xprintPrintSetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int
 
 static void xprintPrintGetPageDimensions(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetPageDimensions_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xprintPrintGetPageDimensions_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_width;
-    int f_height;
-    int f_offset_x;
-    int f_offset_y;
-    int f_reproducible_width;
-    int f_reproducible_height;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintGetPageDimensions");
 
@@ -27766,26 +24950,18 @@ static void xprintPrintGetPageDimensions_Reply(tvbuff_t *tvb, packet_info *pinfo
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xprint-PrintGetPageDimensions)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetPageDimensions_reply_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetPageDimensions_reply_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_offset_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetPageDimensions_reply_offset_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_offset_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetPageDimensions_reply_offset_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_reproducible_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetPageDimensions_reply_reproducible_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_reproducible_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetPageDimensions_reply_reproducible_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
@@ -27795,7 +24971,7 @@ static void xprintPrintQueryScreens(tvbuff_t *tvb _U_, packet_info *pinfo _U_, i
 }
 static void xprintPrintQueryScreens_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_listCount;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintQueryScreens");
@@ -27806,8 +24982,6 @@ static void xprintPrintQueryScreens_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xprint-PrintQueryScreens)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_listCount = VALUE32(tvb, *offsetp);
@@ -27819,51 +24993,38 @@ static void xprintPrintQueryScreens_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void xprintPrintSetImageResolution(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    int f_image_resolution;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintSetImageResolution_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_image_resolution = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintSetImageResolution_image_resolution, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void xprintPrintSetImageResolution_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_status;
-    int f_previous_resolutions;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintSetImageResolution");
 
     REPLY(reply);
-    f_status = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintSetImageResolution_reply_status, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xprint-PrintSetImageResolution)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_previous_resolutions = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintSetImageResolution_reply_previous_resolutions, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xprintPrintGetImageResolution(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetImageResolution_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xprintPrintGetImageResolution_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_image_resolution;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintGetImageResolution");
 
@@ -27873,44 +25034,21 @@ static void xprintPrintGetImageResolution_Reply(tvbuff_t *tvb, packet_info *pinf
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xprint-PrintGetImageResolution)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_image_resolution = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_PrintGetImageResolution_reply_image_resolution, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
-static void xprintNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
-{
-    int f_detail;
-    int f_context;
-    int f_cancel;
-    f_detail = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xprint_Notify_detail, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-    CARD16(event_sequencenumber);
-    f_context = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xprint_Notify_context, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_cancel = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xprint_Notify_cancel, tvb, *offsetp, 1, byte_order);
-    *offsetp += 1;
-}
-
 static void xprintAttributNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_detail;
-    int f_context;
-    f_detail = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_AttributNotify_detail, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     CARD16(event_sequencenumber);
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xprint_AttributNotify_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
+
 static const value_string xprint_extension_minor[] = {
     { 0, "PrintQueryVersion" },
     { 1, "PrintGetPrinterList" },
@@ -27940,7 +25078,6 @@ static const value_string xprint_extension_minor[] = {
     { 0, NULL }
 };
 const x11_event_info xprint_events[] = {
-    { "xprint-Notify", xprintNotify },
     { "xprint-AttributNotify", xprintAttributNotify },
     { NULL, NULL }
 };
@@ -28052,25 +25189,19 @@ static void dispatch_xprint(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
 
 static void register_xprint(void)
 {
-    set_handler("XpExtension", dispatch_xprint, xprint_errors, xprint_events, xprint_replies);
+    set_handler("XpExtension", dispatch_xprint, xprint_errors, xprint_events, NULL, xprint_replies);
 }
 
 static void xselinuxQueryVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_client_major;
-    int f_client_minor;
-    f_client_major = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_QueryVersion_client_major, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
-    f_client_minor = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_QueryVersion_client_minor, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 static void xselinuxQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_server_major;
-    int f_server_minor;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -28080,14 +25211,10 @@ static void xselinuxQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_server_major = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_QueryVersion_reply_server_major, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_server_minor = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_QueryVersion_reply_server_minor, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
@@ -28107,7 +25234,7 @@ static void xselinuxGetDeviceCreateContext(tvbuff_t *tvb _U_, packet_info *pinfo
 }
 static void xselinuxGetDeviceCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceCreateContext");
@@ -28118,8 +25245,6 @@ static void xselinuxGetDeviceCreateContext_Reply(tvbuff_t *tvb, packet_info *pin
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetDeviceCreateContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28131,9 +25256,7 @@ static void xselinuxGetDeviceCreateContext_Reply(tvbuff_t *tvb, packet_info *pin
 
 static void xselinuxSetDeviceContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device;
     int f_context_len;
-    f_device = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_SetDeviceContext_device, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28145,14 +25268,12 @@ static void xselinuxSetDeviceContext(tvbuff_t *tvb, packet_info *pinfo _U_, int
 
 static void xselinuxGetDeviceContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_device;
-    f_device = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_GetDeviceContext_device, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xselinuxGetDeviceContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceContext");
@@ -28163,8 +25284,6 @@ static void xselinuxGetDeviceContext_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetDeviceContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28189,7 +25308,7 @@ static void xselinuxGetWindowCreateContext(tvbuff_t *tvb _U_, packet_info *pinfo
 }
 static void xselinuxGetWindowCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetWindowCreateContext");
@@ -28200,8 +25319,6 @@ static void xselinuxGetWindowCreateContext_Reply(tvbuff_t *tvb, packet_info *pin
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetWindowCreateContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28213,14 +25330,12 @@ static void xselinuxGetWindowCreateContext_Reply(tvbuff_t *tvb, packet_info *pin
 
 static void xselinuxGetWindowContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_GetWindowContext_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xselinuxGetWindowContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetWindowContext");
@@ -28231,8 +25346,6 @@ static void xselinuxGetWindowContext_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetWindowContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28242,7 +25355,7 @@ static void xselinuxGetWindowContext_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     listOfByte(tvb, offsetp, t, hf_x11_xselinux_GetWindowContext_reply_context, f_context_len, byte_order);
 }
 
-static int struct_size_ListItem(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_xselinux_ListItem(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_object_context_len;
@@ -28254,29 +25367,27 @@ static int struct_size_ListItem(tvbuff_t *tvb, int *offsetp, guint byte_order _U
     return size + 12;
 }
 
-static void struct_ListItem(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xselinux_ListItem(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_name;
 	int f_object_context_len;
 	int f_data_context_len;
 
-	item = proto_tree_add_item(root, hf_x11_struct_ListItem, tvb, *offsetp, struct_size_ListItem(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xselinux_ListItem, tvb, *offsetp, struct_size_xselinux_ListItem(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_name = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ListItem_name, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xselinux_ListItem_name, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
 	f_object_context_len = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ListItem_object_context_len, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xselinux_ListItem_object_context_len, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
 	f_data_context_len = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ListItem_data_context_len, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xselinux_ListItem_data_context_len, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	listOfByte(tvb, offsetp, t, hf_x11_struct_ListItem_object_context, f_object_context_len, byte_order);
-	listOfByte(tvb, offsetp, t, hf_x11_struct_ListItem_data_context, f_data_context_len, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xselinux_ListItem_object_context, f_object_context_len, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xselinux_ListItem_data_context, f_data_context_len, byte_order);
     }
 }
 
@@ -28295,7 +25406,7 @@ static void xselinuxGetPropertyCreateContext(tvbuff_t *tvb _U_, packet_info *pin
 }
 static void xselinuxGetPropertyCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPropertyCreateContext");
@@ -28306,8 +25417,6 @@ static void xselinuxGetPropertyCreateContext_Reply(tvbuff_t *tvb, packet_info *p
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetPropertyCreateContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28332,7 +25441,7 @@ static void xselinuxGetPropertyUseContext(tvbuff_t *tvb _U_, packet_info *pinfo
 }
 static void xselinuxGetPropertyUseContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPropertyUseContext");
@@ -28343,8 +25452,6 @@ static void xselinuxGetPropertyUseContext_Reply(tvbuff_t *tvb, packet_info *pinf
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetPropertyUseContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28356,18 +25463,14 @@ static void xselinuxGetPropertyUseContext_Reply(tvbuff_t *tvb, packet_info *pinf
 
 static void xselinuxGetPropertyContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_property;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_GetPropertyContext_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_property = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_GetPropertyContext_property, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xselinuxGetPropertyContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPropertyContext");
@@ -28378,8 +25481,6 @@ static void xselinuxGetPropertyContext_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetPropertyContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28391,18 +25492,14 @@ static void xselinuxGetPropertyContext_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void xselinuxGetPropertyDataContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_property;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_GetPropertyDataContext_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_property = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_GetPropertyDataContext_property, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xselinuxGetPropertyDataContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPropertyDataContext");
@@ -28413,8 +25510,6 @@ static void xselinuxGetPropertyDataContext_Reply(tvbuff_t *tvb, packet_info *pin
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetPropertyDataContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28426,14 +25521,12 @@ static void xselinuxGetPropertyDataContext_Reply(tvbuff_t *tvb, packet_info *pin
 
 static void xselinuxListProperties(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_ListProperties_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xselinuxListProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_properties_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ListProperties");
@@ -28444,15 +25537,13 @@ static void xselinuxListProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-ListProperties)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_properties_len = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_ListProperties_reply_properties_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_ListItem(tvb, offsetp, t, byte_order, f_properties_len);
+    struct_xselinux_ListItem(tvb, offsetp, t, byte_order, f_properties_len);
 }
 
 static void xselinuxSetSelectionCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
@@ -28470,7 +25561,7 @@ static void xselinuxGetSelectionCreateContext(tvbuff_t *tvb _U_, packet_info *pi
 }
 static void xselinuxGetSelectionCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetSelectionCreateContext");
@@ -28481,8 +25572,6 @@ static void xselinuxGetSelectionCreateContext_Reply(tvbuff_t *tvb, packet_info *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetSelectionCreateContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28507,7 +25596,7 @@ static void xselinuxGetSelectionUseContext(tvbuff_t *tvb _U_, packet_info *pinfo
 }
 static void xselinuxGetSelectionUseContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetSelectionUseContext");
@@ -28518,8 +25607,6 @@ static void xselinuxGetSelectionUseContext_Reply(tvbuff_t *tvb, packet_info *pin
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetSelectionUseContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28531,14 +25618,12 @@ static void xselinuxGetSelectionUseContext_Reply(tvbuff_t *tvb, packet_info *pin
 
 static void xselinuxGetSelectionContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_selection;
-    f_selection = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_GetSelectionContext_selection, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xselinuxGetSelectionContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetSelectionContext");
@@ -28549,8 +25634,6 @@ static void xselinuxGetSelectionContext_Reply(tvbuff_t *tvb, packet_info *pinfo,
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetSelectionContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28562,14 +25645,12 @@ static void xselinuxGetSelectionContext_Reply(tvbuff_t *tvb, packet_info *pinfo,
 
 static void xselinuxGetSelectionDataContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_selection;
-    f_selection = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_GetSelectionDataContext_selection, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xselinuxGetSelectionDataContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetSelectionDataContext");
@@ -28580,8 +25661,6 @@ static void xselinuxGetSelectionDataContext_Reply(tvbuff_t *tvb, packet_info *pi
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetSelectionDataContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28596,7 +25675,7 @@ static void xselinuxListSelections(tvbuff_t *tvb _U_, packet_info *pinfo _U_, in
 }
 static void xselinuxListSelections_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_selections_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ListSelections");
@@ -28607,27 +25686,23 @@ static void xselinuxListSelections_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-ListSelections)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_selections_len = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_ListSelections_reply_selections_len, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_ListItem(tvb, offsetp, t, byte_order, f_selections_len);
+    struct_xselinux_ListItem(tvb, offsetp, t, byte_order, f_selections_len);
 }
 
 static void xselinuxGetClientContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_resource;
-    f_resource = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xselinux_GetClientContext_resource, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xselinuxGetClientContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_context_len;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetClientContext");
@@ -28638,8 +25713,6 @@ static void xselinuxGetClientContext_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xselinux-GetClientContext)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_context_len = VALUE32(tvb, *offsetp);
@@ -28783,117 +25856,83 @@ static void dispatch_xselinux(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
 
 static void register_xselinux(void)
 {
-    set_handler("SELinux", dispatch_xselinux, xselinux_errors, xselinux_events, xselinux_replies);
+    set_handler("SELinux", dispatch_xselinux, xselinux_errors, xselinux_events, NULL, xselinux_replies);
 }
 
 static void xtestGetVersion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_major_version;
-    int f_minor_version;
-    f_major_version = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_GetVersion_major_version, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(1);
-    f_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_GetVersion_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void xtestGetVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major_version;
-    int f_minor_version;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetVersion");
 
     REPLY(reply);
-    f_major_version = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_GetVersion_reply_major_version, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xtest-GetVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor_version = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_GetVersion_reply_minor_version, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xtestCompareCursor(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    int f_cursor;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_CompareCursor_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_cursor = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_CompareCursor_cursor, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xtestCompareCursor_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_same;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-CompareCursor");
 
     REPLY(reply);
-    f_same = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_CompareCursor_reply_same, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xtest-CompareCursor)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xtestFakeInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_type;
-    int f_detail;
-    int f_time;
-    int f_root;
-    int f_rootX;
-    int f_rootY;
-    int f_deviceid;
-    f_type = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_FakeInput_type, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
-    f_detail = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_FakeInput_detail, tvb, *offsetp, 1, ENC_NA);
     *offsetp += 1;
     UNUSED(2);
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_FakeInput_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_root = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_FakeInput_root, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(8);
-    f_rootX = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_FakeInput_rootX, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_rootY = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_FakeInput_rootY, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(7);
-    f_deviceid = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_FakeInput_deviceid, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
 }
 
 static void xtestGrabControl(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_impervious;
-    f_impervious = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xtest_GrabControl_impervious, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -28943,51 +25982,43 @@ static void dispatch_xtest(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot
 
 static void register_xtest(void)
 {
-    set_handler("XTEST", dispatch_xtest, xtest_errors, xtest_events, xtest_replies);
+    set_handler("XTEST", dispatch_xtest, xtest_errors, xtest_events, NULL, xtest_replies);
 }
 
-static void struct_Rational(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xv_Rational(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_numerator;
-	int f_denominator;
 
-	item = proto_tree_add_item(root, hf_x11_struct_Rational, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xv_Rational, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_numerator = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Rational_numerator, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_Rational_numerator, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_denominator = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Rational_denominator, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_Rational_denominator, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
     }
 }
 
-static void struct_Format(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xv_Format(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_visual;
-	int f_depth;
 
-	item = proto_tree_add_item(root, hf_x11_struct_Format, tvb, *offsetp, 8, ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xv_Format, tvb, *offsetp, 8, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_visual = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Format_visual, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_Format_visual, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_depth = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_Format_depth, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_Format_depth, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(3);
     }
 }
 
-static int struct_size_AdaptorInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_xv_AdaptorInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_name_size;
@@ -28999,50 +26030,44 @@ static int struct_size_AdaptorInfo(tvbuff_t *tvb, int *offsetp, guint byte_order
     return size + 12;
 }
 
-static void struct_AdaptorInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xv_AdaptorInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_base_id;
 	int f_name_size;
-	int f_num_ports;
 	int f_num_formats;
-	int f_type;
 
-	item = proto_tree_add_item(root, hf_x11_struct_AdaptorInfo, tvb, *offsetp, struct_size_AdaptorInfo(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xv_AdaptorInfo, tvb, *offsetp, struct_size_xv_AdaptorInfo(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_base_id = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_AdaptorInfo_base_id, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_AdaptorInfo_base_id, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
 	f_name_size = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_AdaptorInfo_name_size, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_AdaptorInfo_name_size, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_num_ports = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_AdaptorInfo_num_ports, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_AdaptorInfo_num_ports, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
 	f_num_formats = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_AdaptorInfo_num_formats, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_AdaptorInfo_num_formats, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_type = VALUE8(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_AdaptorInfo_type, tvb, *offsetp, 1, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xv_AdaptorInfo_type, tvb, *offsetp, 1, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_AdaptorInfo_type_mask_InputMask, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_AdaptorInfo_type_mask_OutputMask, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_AdaptorInfo_type_mask_VideoMask, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_AdaptorInfo_type_mask_StillMask, tvb, *offsetp, 1, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_AdaptorInfo_type_mask_ImageMask, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xv_AdaptorInfo_type_mask_InputMask, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xv_AdaptorInfo_type_mask_OutputMask, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xv_AdaptorInfo_type_mask_VideoMask, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xv_AdaptorInfo_type_mask_StillMask, tvb, *offsetp, 1, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xv_AdaptorInfo_type_mask_ImageMask, tvb, *offsetp, 1, byte_order);
 	}
 	*offsetp += 1;
 	UNUSED(1);
-	listOfByte(tvb, offsetp, t, hf_x11_struct_AdaptorInfo_name, f_name_size, byte_order);
-	struct_Format(tvb, offsetp, t, byte_order, f_num_formats);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xv_AdaptorInfo_name, f_name_size, byte_order);
+	struct_xv_Format(tvb, offsetp, t, byte_order, f_num_formats);
     }
 }
 
-static int struct_size_EncodingInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_xv_EncodingInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_name_size;
@@ -29051,38 +26076,32 @@ static int struct_size_EncodingInfo(tvbuff_t *tvb, int *offsetp, guint byte_orde
     return size + 20;
 }
 
-static void struct_EncodingInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xv_EncodingInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_encoding;
 	int f_name_size;
-	int f_width;
-	int f_height;
 
-	item = proto_tree_add_item(root, hf_x11_struct_EncodingInfo, tvb, *offsetp, struct_size_EncodingInfo(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xv_EncodingInfo, tvb, *offsetp, struct_size_xv_EncodingInfo(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_encoding = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_EncodingInfo_encoding, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_EncodingInfo_encoding, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
 	f_name_size = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_EncodingInfo_name_size, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_EncodingInfo_name_size, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_width = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_EncodingInfo_width, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_EncodingInfo_width, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_height = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_EncodingInfo_height, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_EncodingInfo_height, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
 	UNUSED(2);
-	struct_Rational(tvb, offsetp, t, byte_order, 1);
-	listOfByte(tvb, offsetp, t, hf_x11_struct_EncodingInfo_name, f_name_size, byte_order);
+	struct_xv_Rational(tvb, offsetp, t, byte_order, 1);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xv_EncodingInfo_name, f_name_size, byte_order);
     }
 }
 
-static int struct_size_AttributeInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
+static int struct_size_xv_AttributeInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_)
 {
     int size = 0;
     int f_size;
@@ -29091,180 +26110,110 @@ static int struct_size_AttributeInfo(tvbuff_t *tvb, int *offsetp, guint byte_ord
     return size + 16;
 }
 
-static void struct_AttributeInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xv_AttributeInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_flags;
-	int f_min;
-	int f_max;
 	int f_size;
 
-	item = proto_tree_add_item(root, hf_x11_struct_AttributeInfo, tvb, *offsetp, struct_size_AttributeInfo(tvb, offsetp, byte_order), ENC_NA);
+	item = proto_tree_add_item(root, hf_x11_struct_xv_AttributeInfo, tvb, *offsetp, struct_size_xv_AttributeInfo(tvb, offsetp, byte_order), ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_flags = VALUE32(tvb, *offsetp);
 	{
-	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_AttributeInfo_flags, tvb, *offsetp, 4, byte_order);
+	    proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xv_AttributeInfo_flags, tvb, *offsetp, 4, byte_order);
 	    proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_AttributeInfo_flags_mask_Gettable, tvb, *offsetp, 4, byte_order);
-	    proto_tree_add_item(bitmask_tree, hf_x11_struct_AttributeInfo_flags_mask_Settable, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xv_AttributeInfo_flags_mask_Gettable, tvb, *offsetp, 4, byte_order);
+	    proto_tree_add_item(bitmask_tree, hf_x11_struct_xv_AttributeInfo_flags_mask_Settable, tvb, *offsetp, 4, byte_order);
 	}
 	*offsetp += 4;
-	f_min = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_AttributeInfo_min, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_AttributeInfo_min, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_max = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_AttributeInfo_max, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_AttributeInfo_max, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
 	f_size = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_AttributeInfo_size, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_AttributeInfo_size, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	listOfByte(tvb, offsetp, t, hf_x11_struct_AttributeInfo_name, f_size, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xv_AttributeInfo_name, f_size, byte_order);
     }
 }
 
-static void struct_ImageFormatInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xv_ImageFormatInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_id;
-	int f_type;
-	int f_byte_order;
-	int f_bpp;
-	int f_num_planes;
-	int f_depth;
-	int f_red_mask;
-	int f_green_mask;
-	int f_blue_mask;
-	int f_format;
-	int f_y_sample_bits;
-	int f_u_sample_bits;
-	int f_v_sample_bits;
-	int f_vhorz_y_period;
-	int f_vhorz_u_period;
-	int f_vhorz_v_period;
-	int f_vvert_y_period;
-	int f_vvert_u_period;
-	int f_vvert_v_period;
-	int f_vscanline_order;
-
-	item = proto_tree_add_item(root, hf_x11_struct_ImageFormatInfo, tvb, *offsetp, 82, ENC_NA);
+
+	item = proto_tree_add_item(root, hf_x11_struct_xv_ImageFormatInfo, tvb, *offsetp, 82, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_id = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_id, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_id, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_type = field8(tvb, offsetp, t, hf_x11_struct_ImageFormatInfo_type, byte_order);
-	f_byte_order = field8(tvb, offsetp, t, hf_x11_struct_ImageFormatInfo_byte_order, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xv_ImageFormatInfo_type, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xv_ImageFormatInfo_byte_order, byte_order);
 	UNUSED(2);
-	listOfByte(tvb, offsetp, t, hf_x11_struct_ImageFormatInfo_guid, 16, byte_order);
-	f_bpp = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_bpp, tvb, *offsetp, 1, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xv_ImageFormatInfo_guid, 16, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_bpp, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
-	f_num_planes = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_num_planes, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_num_planes, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(2);
-	f_depth = VALUE8(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_depth, tvb, *offsetp, 1, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_depth, tvb, *offsetp, 1, byte_order);
 	*offsetp += 1;
 	UNUSED(3);
-	f_red_mask = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_red_mask, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_red_mask, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_green_mask = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_green_mask, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_green_mask, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_blue_mask = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_blue_mask, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_blue_mask, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_format = field8(tvb, offsetp, t, hf_x11_struct_ImageFormatInfo_format, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xv_ImageFormatInfo_format, byte_order);
 	UNUSED(3);
-	f_y_sample_bits = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_y_sample_bits, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_y_sample_bits, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_u_sample_bits = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_u_sample_bits, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_u_sample_bits, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_v_sample_bits = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_v_sample_bits, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_v_sample_bits, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_vhorz_y_period = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_vhorz_y_period, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_vhorz_y_period, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_vhorz_u_period = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_vhorz_u_period, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_vhorz_u_period, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_vhorz_v_period = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_vhorz_v_period, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_vhorz_v_period, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_vvert_y_period = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_vvert_y_period, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_vvert_y_period, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_vvert_u_period = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_vvert_u_period, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_vvert_u_period, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_vvert_v_period = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_vvert_v_period, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_vvert_v_period, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	listOfByte(tvb, offsetp, t, hf_x11_struct_ImageFormatInfo_vcomp_order, 32, byte_order);
-	f_vscanline_order = field8(tvb, offsetp, t, hf_x11_struct_ImageFormatInfo_vscanline_order, byte_order);
+	listOfByte(tvb, offsetp, t, hf_x11_struct_xv_ImageFormatInfo_vcomp_order, 32, byte_order);
+	field8(tvb, offsetp, t, hf_x11_struct_xv_ImageFormatInfo_vscanline_order, byte_order);
 	UNUSED(11);
     }
 }
 
-static void xvVideoNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
-{
-    int f_reason;
-    int f_time;
-    int f_drawable;
-    int f_port;
-    f_reason = field8(tvb, offsetp, t, hf_x11_xv_VideoNotify_reason, byte_order);
-    CARD16(event_sequencenumber);
-    f_time = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xv_VideoNotify_time, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xv_VideoNotify_drawable, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-    f_port = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_xv_VideoNotify_port, tvb, *offsetp, 4, byte_order);
-    *offsetp += 4;
-}
-
 static void xvPortNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_time;
-    int f_port;
-    int f_attribute;
-    int f_value;
     UNUSED(1);
     CARD16(event_sequencenumber);
-    f_time = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PortNotify_time, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PortNotify_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_attribute = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PortNotify_attribute, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_value = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PortNotify_value, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
+
 static void xvQueryExtension(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp _U_, proto_tree *t _U_, guint byte_order _U_, int length _U_)
 {
 }
 static void xvQueryExtension_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major;
-    int f_minor;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryExtension");
 
@@ -29274,28 +26223,22 @@ static void xvQueryExtension_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xv-QueryExtension)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryExtension_reply_major, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_minor = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryExtension_reply_minor, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xvQueryAdaptors(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_window;
-    f_window = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryAdaptors_window, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xvQueryAdaptors_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_adaptors;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryAdaptors");
@@ -29306,27 +26249,23 @@ static void xvQueryAdaptors_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xv-QueryAdaptors)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_adaptors = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryAdaptors_reply_num_adaptors, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(22);
-    struct_AdaptorInfo(tvb, offsetp, t, byte_order, f_num_adaptors);
+    struct_xv_AdaptorInfo(tvb, offsetp, t, byte_order, f_num_adaptors);
 }
 
 static void xvQueryEncodings(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryEncodings_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xvQueryEncodings_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_encodings;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryEncodings");
@@ -29337,267 +26276,160 @@ static void xvQueryEncodings_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xv-QueryEncodings)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_encodings = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryEncodings_reply_num_encodings, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(22);
-    struct_EncodingInfo(tvb, offsetp, t, byte_order, f_num_encodings);
+    struct_xv_EncodingInfo(tvb, offsetp, t, byte_order, f_num_encodings);
 }
 
 static void xvGrabPort(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_time;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GrabPort_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_time = field32(tvb, offsetp, t, hf_x11_xv_GrabPort_time, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xv_GrabPort_time, byte_order);
 }
 static void xvGrabPort_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_result;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GrabPort");
 
     REPLY(reply);
-    f_result = field8(tvb, offsetp, t, hf_x11_xv_GrabPort_reply_result, byte_order);
+    field8(tvb, offsetp, t, hf_x11_xv_GrabPort_reply_result, byte_order);
     sequence_number = VALUE16(tvb, *offsetp);
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xv-GrabPort)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xvUngrabPort(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_time;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_UngrabPort_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_time = field32(tvb, offsetp, t, hf_x11_xv_UngrabPort_time, byte_order);
+    field32(tvb, offsetp, t, hf_x11_xv_UngrabPort_time, byte_order);
 }
 
 static void xvPutVideo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_drawable;
-    int f_gc;
-    int f_vid_x;
-    int f_vid_y;
-    int f_vid_w;
-    int f_vid_h;
-    int f_drw_x;
-    int f_drw_y;
-    int f_drw_w;
-    int f_drw_h;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutVideo_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutVideo_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_gc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutVideo_gc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_vid_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutVideo_vid_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutVideo_vid_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutVideo_vid_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutVideo_vid_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutVideo_drw_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutVideo_drw_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutVideo_drw_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutVideo_drw_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xvPutStill(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_drawable;
-    int f_gc;
-    int f_vid_x;
-    int f_vid_y;
-    int f_vid_w;
-    int f_vid_h;
-    int f_drw_x;
-    int f_drw_y;
-    int f_drw_w;
-    int f_drw_h;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutStill_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutStill_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_gc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutStill_gc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_vid_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutStill_vid_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutStill_vid_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutStill_vid_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutStill_vid_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutStill_drw_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutStill_drw_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutStill_drw_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutStill_drw_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xvGetVideo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_drawable;
-    int f_gc;
-    int f_vid_x;
-    int f_vid_y;
-    int f_vid_w;
-    int f_vid_h;
-    int f_drw_x;
-    int f_drw_y;
-    int f_drw_w;
-    int f_drw_h;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetVideo_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetVideo_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_gc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetVideo_gc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_vid_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetVideo_vid_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetVideo_vid_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetVideo_vid_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetVideo_vid_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetVideo_drw_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetVideo_drw_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetVideo_drw_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetVideo_drw_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xvGetStill(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_drawable;
-    int f_gc;
-    int f_vid_x;
-    int f_vid_y;
-    int f_vid_w;
-    int f_vid_h;
-    int f_drw_x;
-    int f_drw_y;
-    int f_drw_w;
-    int f_drw_h;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetStill_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetStill_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_gc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetStill_gc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_vid_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetStill_vid_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetStill_vid_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetStill_vid_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetStill_vid_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetStill_drw_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetStill_drw_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetStill_drw_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetStill_drw_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xvStopVideo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_drawable;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_StopVideo_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_StopVideo_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xvSelectVideoNotify(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_drawable;
-    int f_onoff;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_SelectVideoNotify_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_onoff = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_SelectVideoNotify_onoff, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -29605,12 +26437,8 @@ static void xvSelectVideoNotify(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
 
 static void xvSelectPortNotify(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_onoff;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_SelectPortNotify_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_onoff = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_SelectPortNotify_onoff, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -29618,37 +26446,23 @@ static void xvSelectPortNotify(tvbuff_t *tvb, packet_info *pinfo _U_, int *offse
 
 static void xvQueryBestSize(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_vid_w;
-    int f_vid_h;
-    int f_drw_w;
-    int f_drw_h;
-    int f_motion;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryBestSize_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_vid_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryBestSize_vid_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_vid_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryBestSize_vid_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryBestSize_drw_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryBestSize_drw_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_motion = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryBestSize_motion, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
 }
 static void xvQueryBestSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_actual_width;
-    int f_actual_height;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryBestSize");
 
@@ -29658,49 +26472,34 @@ static void xvQueryBestSize_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xv-QueryBestSize)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_actual_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryBestSize_reply_actual_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_actual_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryBestSize_reply_actual_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 
 static void xvSetPortAttribute(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_attribute;
-    int f_value;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_SetPortAttribute_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_attribute = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_SetPortAttribute_attribute, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_value = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_SetPortAttribute_value, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xvGetPortAttribute(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_attribute;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetPortAttribute_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_attribute = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetPortAttribute_attribute, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xvGetPortAttribute_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_value;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPortAttribute");
 
@@ -29710,27 +26509,21 @@ static void xvGetPortAttribute_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xv-GetPortAttribute)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_value = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_GetPortAttribute_reply_value, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xvQueryPortAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryPortAttributes_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xvQueryPortAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_attributes;
-    int f_text_size;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryPortAttributes");
 
@@ -29740,30 +26533,25 @@ static void xvQueryPortAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xv-QueryPortAttributes)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_attributes = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryPortAttributes_reply_num_attributes, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_text_size = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryPortAttributes_reply_text_size, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(16);
-    struct_AttributeInfo(tvb, offsetp, t, byte_order, f_num_attributes);
+    struct_xv_AttributeInfo(tvb, offsetp, t, byte_order, f_num_attributes);
 }
 
 static void xvListImageFormats(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ListImageFormats_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xvListImageFormats_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_formats;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ListImageFormats");
@@ -29774,43 +26562,30 @@ static void xvListImageFormats_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xv-ListImageFormats)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_formats = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ListImageFormats_reply_num_formats, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_ImageFormatInfo(tvb, offsetp, t, byte_order, f_num_formats);
+    struct_xv_ImageFormatInfo(tvb, offsetp, t, byte_order, f_num_formats);
 }
 
 static void xvQueryImageAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_id;
-    int f_width;
-    int f_height;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryImageAttributes_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryImageAttributes_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryImageAttributes_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryImageAttributes_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void xvQueryImageAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num_planes;
-    int f_data_size;
-    int f_width;
-    int f_height;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryImageAttributes");
 
@@ -29820,20 +26595,15 @@ static void xvQueryImageAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xv-QueryImageAttributes)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num_planes = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryImageAttributes_reply_num_planes, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_data_size = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryImageAttributes_reply_data_size, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryImageAttributes_reply_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_QueryImageAttributes_reply_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     UNUSED(12);
@@ -29843,60 +26613,32 @@ static void xvQueryImageAttributes_Reply(tvbuff_t *tvb, packet_info *pinfo, int
 
 static void xvPutImage(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_drawable;
-    int f_gc;
-    int f_id;
-    int f_src_x;
-    int f_src_y;
-    int f_src_w;
-    int f_src_h;
-    int f_drw_x;
-    int f_drw_y;
-    int f_drw_w;
-    int f_drw_h;
-    int f_width;
-    int f_height;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_gc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_gc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_src_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_src_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_src_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_src_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_src_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_drw_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_drw_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_drw_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_drw_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_PutImage_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfByte(tvb, offsetp, t, hf_x11_xv_PutImage_data, (length - 40) / 1, byte_order);
@@ -29904,72 +26646,38 @@ static void xvPutImage(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, prot
 
 static void xvShmPutImage(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port;
-    int f_drawable;
-    int f_gc;
-    int f_shmseg;
-    int f_id;
-    int f_offset;
-    int f_src_x;
-    int f_src_y;
-    int f_src_w;
-    int f_src_h;
-    int f_drw_x;
-    int f_drw_y;
-    int f_drw_w;
-    int f_drw_h;
-    int f_width;
-    int f_height;
-    int f_send_event;
-    f_port = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_port, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_drawable = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_drawable, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_gc = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_gc, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_shmseg = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_shmseg, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_offset = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_offset, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_src_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_src_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_src_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_src_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_src_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_src_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_x = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_drw_x, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_y = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_drw_y, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_w = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_drw_w, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_drw_h = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_drw_h, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_send_event = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xv_ShmPutImage_send_event, tvb, *offsetp, 1, byte_order);
     *offsetp += 1;
     UNUSED(3);
@@ -29998,7 +26706,6 @@ static const value_string xv_extension_minor[] = {
     { 0, NULL }
 };
 const x11_event_info xv_events[] = {
-    { "xv-VideoNotify", xvVideoNotify },
     { "xv-PortNotify", xvPortNotify },
     { NULL, NULL }
 };
@@ -30092,53 +26799,35 @@ static void dispatch_xv(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_t
 
 static void register_xv(void)
 {
-    set_handler("XVideo", dispatch_xv, xv_errors, xv_events, xv_replies);
+    set_handler("XVideo", dispatch_xv, xv_errors, xv_events, NULL, xv_replies);
 }
 
-static void struct_SurfaceInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
+static void struct_xvmc_SurfaceInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count)
 {
     int i;
     for (i = 0; i < count; i++) {
 	proto_item *item;
 	proto_tree *t;
-	int f_id;
-	int f_chroma_format;
-	int f_pad0;
-	int f_max_width;
-	int f_max_height;
-	int f_subpicture_max_width;
-	int f_subpicture_max_height;
-	int f_mc_type;
-	int f_flags;
-
-	item = proto_tree_add_item(root, hf_x11_struct_SurfaceInfo, tvb, *offsetp, 24, ENC_NA);
+
+	item = proto_tree_add_item(root, hf_x11_struct_xvmc_SurfaceInfo, tvb, *offsetp, 24, ENC_NA);
 	t = proto_item_add_subtree(item, ett_x11_rectangle);
-	f_id = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SurfaceInfo_id, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xvmc_SurfaceInfo_id, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_chroma_format = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SurfaceInfo_chroma_format, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xvmc_SurfaceInfo_chroma_format, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_pad0 = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SurfaceInfo_pad0, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xvmc_SurfaceInfo_pad0, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_max_width = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SurfaceInfo_max_width, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xvmc_SurfaceInfo_max_width, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_max_height = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SurfaceInfo_max_height, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xvmc_SurfaceInfo_max_height, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_subpicture_max_width = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SurfaceInfo_subpicture_max_width, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xvmc_SurfaceInfo_subpicture_max_width, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_subpicture_max_height = VALUE16(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SurfaceInfo_subpicture_max_height, tvb, *offsetp, 2, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xvmc_SurfaceInfo_subpicture_max_height, tvb, *offsetp, 2, byte_order);
 	*offsetp += 2;
-	f_mc_type = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SurfaceInfo_mc_type, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xvmc_SurfaceInfo_mc_type, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
-	f_flags = VALUE32(tvb, *offsetp);
-	proto_tree_add_item(t, hf_x11_struct_SurfaceInfo_flags, tvb, *offsetp, 4, byte_order);
+	proto_tree_add_item(t, hf_x11_struct_xvmc_SurfaceInfo_flags, tvb, *offsetp, 4, byte_order);
 	*offsetp += 4;
     }
 }
@@ -30148,9 +26837,7 @@ static void xvmcQueryVersion(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *off
 }
 static void xvmcQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_major;
-    int f_minor;
+    int sequence_number;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryVersion");
 
@@ -30160,28 +26847,22 @@ static void xvmcQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xvmc-QueryVersion)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_major = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_QueryVersion_reply_major, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_minor = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_QueryVersion_reply_minor, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xvmcListSurfaceTypes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port_id;
-    f_port_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_ListSurfaceTypes_port_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xvmcListSurfaceTypes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ListSurfaceTypes");
@@ -30192,50 +26873,34 @@ static void xvmcListSurfaceTypes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xvmc-ListSurfaceTypes)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_ListSurfaceTypes_reply_num, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_SurfaceInfo(tvb, offsetp, t, byte_order, f_num);
+    struct_xvmc_SurfaceInfo(tvb, offsetp, t, byte_order, f_num);
 }
 
 static void xvmcCreateContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_id;
-    int f_port_id;
-    int f_surface_id;
-    int f_width;
-    int f_height;
-    int f_flags;
-    f_context_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateContext_context_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_port_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateContext_port_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_surface_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateContext_surface_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateContext_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateContext_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_flags = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateContext_flags, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xvmcCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_width_actual;
-    int f_height_actual;
-    int f_flags_return;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-CreateContext");
 
@@ -30246,16 +26911,12 @@ static void xvmcCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
             "sequencenumber: %d (xvmc-CreateContext)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width_actual = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateContext_reply_width_actual, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height_actual = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateContext_reply_height_actual, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_flags_return = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateContext_reply_flags_return, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
@@ -30264,26 +26925,21 @@ static void xvmcCreateContext_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
 
 static void xvmcDestroyContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_context_id;
-    f_context_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_DestroyContext_context_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xvmcCreateSurface(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_surface_id;
-    int f_context_id;
-    f_surface_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateSurface_surface_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateSurface_context_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xvmcCreateSurface_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-CreateSurface");
 
@@ -30294,7 +26950,6 @@ static void xvmcCreateSurface_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
             "sequencenumber: %d (xvmc-CreateSurface)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(24);
@@ -30303,42 +26958,27 @@ static void xvmcCreateSurface_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offs
 
 static void xvmcDestroySurface(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_surface_id;
-    f_surface_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_DestroySurface_surface_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xvmcCreateSubpicture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_subpicture_id;
-    int f_context;
-    int f_xvimage_id;
-    int f_width;
-    int f_height;
-    f_subpicture_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateSubpicture_subpicture_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateSubpicture_context, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_xvimage_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateSubpicture_xvimage_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateSubpicture_width, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateSubpicture_height, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
 }
 static void xvmcCreateSubpicture_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
-    int f_width_actual;
-    int f_height_actual;
-    int f_num_palette_entries;
-    int f_entry_bytes;
+    int sequence_number;
+    int f_length;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-CreateSubpicture");
 
@@ -30349,19 +26989,14 @@ static void xvmcCreateSubpicture_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
             "sequencenumber: %d (xvmc-CreateSubpicture)", sequence_number);
     *offsetp += 2;
     f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_width_actual = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateSubpicture_reply_width_actual, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_height_actual = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateSubpicture_reply_height_actual, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_num_palette_entries = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateSubpicture_reply_num_palette_entries, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
-    f_entry_bytes = VALUE16(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_CreateSubpicture_reply_entry_bytes, tvb, *offsetp, 2, byte_order);
     *offsetp += 2;
     listOfByte(tvb, offsetp, t, hf_x11_xvmc_CreateSubpicture_reply_component_order, 4, byte_order);
@@ -30371,26 +27006,20 @@ static void xvmcCreateSubpicture_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o
 
 static void xvmcDestroySubpicture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_subpicture_id;
-    f_subpicture_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_DestroySubpicture_subpicture_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 
 static void xvmcListSubpictureTypes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_)
 {
-    int f_port_id;
-    int f_surface_id;
-    f_port_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_ListSubpictureTypes_port_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
-    f_surface_id = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_ListSubpictureTypes_surface_id, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
 }
 static void xvmcListSubpictureTypes_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order)
 {
-    int f_length, length, sequence_number;
+    int sequence_number;
     int f_num;
 
     col_append_fstr(pinfo->cinfo, COL_INFO, "-ListSubpictureTypes");
@@ -30401,15 +27030,13 @@ static void xvmcListSubpictureTypes_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
             "sequencenumber: %d (xvmc-ListSubpictureTypes)", sequence_number);
     *offsetp += 2;
-    f_length = VALUE32(tvb, *offsetp);
-    length = f_length * 4 + 32;
     proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     f_num = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_xvmc_ListSubpictureTypes_reply_num, tvb, *offsetp, 4, byte_order);
     *offsetp += 4;
     UNUSED(20);
-    struct_ImageFormatInfo(tvb, offsetp, t, byte_order, f_num);
+    struct_xv_ImageFormatInfo(tvb, offsetp, t, byte_order, f_num);
 }
 static const value_string xvmc_extension_minor[] = {
     { 0, "QueryVersion" },
@@ -30480,7 +27107,7 @@ static void dispatch_xvmc(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto
 
 static void register_xvmc(void)
 {
-    set_handler("XVideo-MotionCompensation", dispatch_xvmc, xvmc_errors, xvmc_events, xvmc_replies);
+    set_handler("XVideo-MotionCompensation", dispatch_xvmc, xvmc_errors, xvmc_events, NULL, xvmc_replies);
 }
 static void register_x11_extensions(void)
 {
@@ -30489,8 +27116,10 @@ static void register_x11_extensions(void)
     register_damage();
     register_dpms();
     register_dri2();
+    register_dri3();
     register_ge();
     register_glx();
+    register_present();
     register_randr();
     register_record();
     register_render();