aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2011-05-14 18:39:16 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2011-05-14 18:39:16 +0000
commit4a6e62ff5c95879a881f11a5f54d530ebc06801d (patch)
tree23257a69c857c5dca0ee447c8e87693e0b2ad7c7
parent01d1a4c99cb904423e887d60bc558421b90e248a (diff)
Rebuild the X11 dissector with the latest versions of xcbproto and mesa.
svn path=/trunk/; revision=37145
-rw-r--r--epan/dissectors/x11-declarations.h20
-rw-r--r--epan/dissectors/x11-enum.h2
-rw-r--r--epan/dissectors/x11-extension-errors.h2
-rw-r--r--epan/dissectors/x11-extension-implementation.h142
-rw-r--r--epan/dissectors/x11-glx-render-enum.h2
-rw-r--r--epan/dissectors/x11-register-info.h20
6 files changed, 174 insertions, 14 deletions
diff --git a/epan/dissectors/x11-declarations.h b/epan/dissectors/x11-declarations.h
index 39b117117c..0953f2faed 100644
--- a/epan/dissectors/x11-declarations.h
+++ b/epan/dissectors/x11-declarations.h
@@ -3219,6 +3219,16 @@ static int hf_x11_sync_SetPriority_id = -1;
static int hf_x11_sync_SetPriority_priority = -1;
static int hf_x11_sync_GetPriority_id = -1;
static int hf_x11_sync_GetPriority_reply_priority = -1;
+static int hf_x11_sync_CreateFence_drawable = -1;
+static int hf_x11_sync_CreateFence_fence = -1;
+static int hf_x11_sync_CreateFence_initially_triggered = -1;
+static int hf_x11_sync_TriggerFence_fence = -1;
+static int hf_x11_sync_ResetFence_fence = -1;
+static int hf_x11_sync_DestroyFence_fence = -1;
+static int hf_x11_sync_QueryFence_fence = -1;
+static int hf_x11_sync_QueryFence_reply_triggered = -1;
+static int hf_x11_sync_AwaitFence_fence_list = -1;
+static int hf_x11_sync_AwaitFence_fence_list_item = -1;
static int hf_x11_sync_CounterNotify_kind = -1;
static int hf_x11_sync_CounterNotify_counter = -1;
static int hf_x11_sync_CounterNotify_wait_value = -1;
@@ -3300,8 +3310,13 @@ static int hf_x11_xf86dri_GetDrawableInfo_reply_drawable_origin_Y = -1;
static int hf_x11_xf86dri_GetDrawableInfo_reply_drawable_size_W = -1;
static int hf_x11_xf86dri_GetDrawableInfo_reply_drawable_size_H = -1;
static int hf_x11_xf86dri_GetDrawableInfo_reply_num_clip_rects = -1;
+static int hf_x11_xf86dri_GetDrawableInfo_reply_back_x = -1;
+static int hf_x11_xf86dri_GetDrawableInfo_reply_back_y = -1;
+static int hf_x11_xf86dri_GetDrawableInfo_reply_num_back_clip_rects = -1;
static int hf_x11_xf86dri_GetDrawableInfo_reply_clip_rects = -1;
static int hf_x11_xf86dri_GetDrawableInfo_reply_clip_rects_item = -1;
+static int hf_x11_xf86dri_GetDrawableInfo_reply_back_clip_rects = -1;
+static int hf_x11_xf86dri_GetDrawableInfo_reply_back_clip_rects_item = -1;
static int hf_x11_xf86dri_GetDeviceInfo_screen = -1;
static int hf_x11_xf86dri_GetDeviceInfo_reply_framebuffer_handle_low = -1;
static int hf_x11_xf86dri_GetDeviceInfo_reply_framebuffer_handle_high = -1;
@@ -4072,6 +4087,7 @@ static int hf_x11_struct_CountedString16_length = -1;
static int hf_x11_struct_CountedString16_string = -1;
static int hf_x11_struct_KTMapEntry = -1;
static int hf_x11_struct_KTMapEntry_active = -1;
+static int hf_x11_struct_KTMapEntry_level = -1;
static int hf_x11_struct_KTMapEntry_mods_mask_mask_Shift = -1;
static int hf_x11_struct_KTMapEntry_mods_mask_mask_Lock = -1;
static int hf_x11_struct_KTMapEntry_mods_mask_mask_Control = -1;
@@ -4082,7 +4098,6 @@ static int hf_x11_struct_KTMapEntry_mods_mask_mask_4 = -1;
static int hf_x11_struct_KTMapEntry_mods_mask_mask_5 = -1;
static int hf_x11_struct_KTMapEntry_mods_mask_mask_Any = -1;
static int hf_x11_struct_KTMapEntry_mods_mask = -1;
-static int hf_x11_struct_KTMapEntry_level = -1;
static int hf_x11_struct_KTMapEntry_mods_mods_mask_Shift = -1;
static int hf_x11_struct_KTMapEntry_mods_mods_mask_Lock = -1;
static int hf_x11_struct_KTMapEntry_mods_mods_mask_Control = -1;
@@ -5937,7 +5952,10 @@ static int hf_x11_xkb_GetKbdByName_reply_reported_mask_KeyNames = -1;
static int hf_x11_xkb_GetKbdByName_reply_reported_mask_Geometry = -1;
static int hf_x11_xkb_GetKbdByName_reply_reported_mask_OtherNames = -1;
static int hf_x11_xkb_GetKbdByName_reply_reported = -1;
+static int hf_x11_xkb_GetKbdByName_reply_Types_getmap_type = -1;
static int hf_x11_xkb_GetKbdByName_reply_Types_typeDeviceID = -1;
+static int hf_x11_xkb_GetKbdByName_reply_Types_getmap_sequence = -1;
+static int hf_x11_xkb_GetKbdByName_reply_Types_getmap_length = -1;
static int hf_x11_xkb_GetKbdByName_reply_Types_typeMinKeyCode = -1;
static int hf_x11_xkb_GetKbdByName_reply_Types_typeMaxKeyCode = -1;
static int hf_x11_xkb_GetKbdByName_reply_Types_present = -1;
diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h
index 488c3d7b4f..889f981efa 100644
--- a/epan/dissectors/x11-enum.h
+++ b/epan/dissectors/x11-enum.h
@@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It was automatically generated by ../../tools/process-x11-xcb.pl
- using xcbproto version 1.6-8-gf91186b */
+ using xcbproto version 1.6-26-gfb2af7c */
/* $Id$ */
/*
diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h
index 7b730fe5da..6fd05e5ecb 100644
--- a/epan/dissectors/x11-extension-errors.h
+++ b/epan/dissectors/x11-extension-errors.h
@@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It was automatically generated by ../../tools/process-x11-xcb.pl
- using xcbproto version 1.6-8-gf91186b */
+ using xcbproto version 1.6-26-gfb2af7c */
/* $Id$ */
/*
diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h
index 3b04cc5754..c8ff70e01b 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.6-8-gf91186b */
+ using xcbproto version 1.6-26-gfb2af7c */
/* $Id$ */
/*
@@ -14566,6 +14566,81 @@ static void syncGetPriority_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
*offsetp += 4;
}
+static void syncCreateFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, 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, little_endian);
+ *offsetp += 4;
+ f_fence = VALUE32(tvb, *offsetp);
+ proto_tree_add_item(t, hf_x11_sync_CreateFence_fence, tvb, *offsetp, 4, little_endian);
+ *offsetp += 4;
+ f_initially_triggered = VALUE8(tvb, *offsetp);
+ proto_tree_add_item(t, hf_x11_sync_CreateFence_initially_triggered, tvb, *offsetp, 1, little_endian);
+ *offsetp += 1;
+}
+
+static void syncTriggerFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+ int f_fence;
+ f_fence = VALUE32(tvb, *offsetp);
+ proto_tree_add_item(t, hf_x11_sync_TriggerFence_fence, tvb, *offsetp, 4, little_endian);
+ *offsetp += 4;
+}
+
+static void syncResetFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+ int f_fence;
+ f_fence = VALUE32(tvb, *offsetp);
+ proto_tree_add_item(t, hf_x11_sync_ResetFence_fence, tvb, *offsetp, 4, little_endian);
+ *offsetp += 4;
+}
+
+static void syncDestroyFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+ int f_fence;
+ f_fence = VALUE32(tvb, *offsetp);
+ proto_tree_add_item(t, hf_x11_sync_DestroyFence_fence, tvb, *offsetp, 4, little_endian);
+ *offsetp += 4;
+}
+
+static void syncQueryFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+ int f_fence;
+ f_fence = VALUE32(tvb, *offsetp);
+ proto_tree_add_item(t, hf_x11_sync_QueryFence_fence, tvb, *offsetp, 4, little_endian);
+ *offsetp += 4;
+}
+static void syncQueryFence_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, int little_endian)
+{
+ int f_length, length, sequence_number;
+ int f_triggered;
+
+ col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryFence");
+
+ 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 (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, little_endian);
+ *offsetp += 4;
+ f_triggered = VALUE8(tvb, *offsetp);
+ proto_tree_add_item(t, hf_x11_sync_QueryFence_reply_triggered, tvb, *offsetp, 1, little_endian);
+ *offsetp += 1;
+ UNUSED(23);
+}
+
+static void syncAwaitFence(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+ listOfCard32(tvb, offsetp, t, hf_x11_sync_AwaitFence_fence_list, hf_x11_sync_AwaitFence_fence_list_item, (length - 4) / 4, little_endian);
+}
+
static void syncCounterNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, int little_endian)
{
int f_kind;
@@ -14630,6 +14705,12 @@ static const value_string sync_extension_minor[] = {
{ 11, "DestroyAlarm" },
{ 12, "SetPriority" },
{ 13, "GetPriority" },
+ { 14, "CreateFence" },
+ { 15, "TriggerFence" },
+ { 16, "ResetFence" },
+ { 17, "DestroyFence" },
+ { 18, "QueryFence" },
+ { 19, "AwaitFence" },
{ 0, NULL }
};
const x11_event_info sync_events[] = {
@@ -14643,6 +14724,7 @@ static x11_reply_info sync_replies[] = {
{ 5, syncQueryCounter_Reply },
{ 10, syncQueryAlarm_Reply },
{ 13, syncGetPriority_Reply },
+ { 18, syncQueryFence_Reply },
{ 0, NULL }
};
@@ -14698,6 +14780,24 @@ static void dispatch_sync(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto
case 13:
syncGetPriority(tvb, pinfo, offsetp, t, little_endian, length);
break;
+ case 14:
+ syncCreateFence(tvb, pinfo, offsetp, t, little_endian, length);
+ break;
+ case 15:
+ syncTriggerFence(tvb, pinfo, offsetp, t, little_endian, length);
+ break;
+ case 16:
+ syncResetFence(tvb, pinfo, offsetp, t, little_endian, length);
+ break;
+ case 17:
+ syncDestroyFence(tvb, pinfo, offsetp, t, little_endian, length);
+ break;
+ case 18:
+ syncQueryFence(tvb, pinfo, offsetp, t, little_endian, length);
+ break;
+ case 19:
+ syncAwaitFence(tvb, pinfo, offsetp, t, little_endian, length);
+ break;
/* No need for a default case here, since Unknown is printed above,
and UNDECODED() is taken care of by dissect_x11_request */
}
@@ -15355,6 +15455,9 @@ static void xf86driGetDrawableInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int
int f_drawable_size_W;
int f_drawable_size_H;
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");
@@ -15389,8 +15492,17 @@ static void xf86driGetDrawableInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int
f_num_clip_rects = VALUE32(tvb, *offsetp);
proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_num_clip_rects, tvb, *offsetp, 4, little_endian);
*offsetp += 4;
- UNUSED(4);
+ f_back_x = VALUE16(tvb, *offsetp);
+ proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_back_x, tvb, *offsetp, 2, little_endian);
+ *offsetp += 2;
+ f_back_y = VALUE16(tvb, *offsetp);
+ proto_tree_add_item(t, hf_x11_xf86dri_GetDrawableInfo_reply_back_y, tvb, *offsetp, 2, little_endian);
+ *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, little_endian);
+ *offsetp += 4;
struct_DrmClipRect(tvb, offsetp, t, little_endian, f_num_clip_rects);
+ struct_DrmClipRect(tvb, offsetp, t, little_endian, f_num_back_clip_rects);
}
static void xf86driGetDeviceInfo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
@@ -19434,8 +19546,8 @@ static void struct_KTMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *root, int
proto_item *item;
proto_tree *t;
int f_active;
- int f_mods_mask;
int f_level;
+ int f_mods_mask;
int f_mods_mods;
int f_mods_vmods;
@@ -19444,6 +19556,9 @@ static void struct_KTMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *root, int
f_active = VALUE8(tvb, *offsetp);
proto_tree_add_item(t, hf_x11_struct_KTMapEntry_active, tvb, *offsetp, 1, little_endian);
*offsetp += 1;
+ f_level = VALUE8(tvb, *offsetp);
+ proto_tree_add_item(t, hf_x11_struct_KTMapEntry_level, tvb, *offsetp, 1, little_endian);
+ *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, little_endian);
@@ -19459,9 +19574,6 @@ static void struct_KTMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *root, int
proto_tree_add_item(bitmask_tree, hf_x11_struct_KTMapEntry_mods_mask_mask_Any, tvb, *offsetp, 1, little_endian);
}
*offsetp += 1;
- f_level = VALUE8(tvb, *offsetp);
- proto_tree_add_item(t, hf_x11_struct_KTMapEntry_level, tvb, *offsetp, 1, little_endian);
- *offsetp += 1;
f_mods_mods = VALUE8(tvb, *offsetp);
{
proto_item *ti = proto_tree_add_item(t, hf_x11_struct_KTMapEntry_mods_mods, tvb, *offsetp, 1, little_endian);
@@ -23611,7 +23723,7 @@ 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, little_endian);
}
if ((f_which & (1 << 7)) != 0) {
- listOfByte(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_nLevelsPerType, f_nKTLevels, little_endian);
+ listOfByte(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_nLevelsPerType, f_nTypes, little_endian);
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, (length - 56) / 4, little_endian);
}
if ((f_which & (1 << 8)) != 0) {
@@ -24389,7 +24501,10 @@ 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;
int f_present;
@@ -24415,9 +24530,18 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
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, little_endian);
+ *offsetp += 1;
f_typeDeviceID = VALUE8(tvb, *offsetp);
proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_typeDeviceID, tvb, *offsetp, 1, little_endian);
*offsetp += 1;
+ f_getmap_sequence = VALUE16(tvb, *offsetp);
+ proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_getmap_sequence, tvb, *offsetp, 2, little_endian);
+ *offsetp += 2;
+ f_getmap_length = VALUE32(tvb, *offsetp);
+ proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_getmap_length, tvb, *offsetp, 4, little_endian);
+ *offsetp += 4;
UNUSED(2);
f_typeMinKeyCode = VALUE8(tvb, *offsetp);
proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Types_typeMinKeyCode, tvb, *offsetp, 1, little_endian);
@@ -25029,7 +25153,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
}
if ((f_which & (1 << 7)) != 0) {
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_nLevelsPerType, f_nKTLevels, little_endian);
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, (length - 230) / 4, little_endian);
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, (length - 237) / 4, little_endian);
}
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), little_endian);
@@ -25188,7 +25312,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
}
if ((f_which & (1 << 7)) != 0) {
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_nLevelsPerType, f_nKTLevels, little_endian);
- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames_item, (length - 279) / 4, little_endian);
+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_OtherNames_KTLevelNames_ktLevelNames_item, (length - 286) / 4, little_endian);
}
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), little_endian);
diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h
index f7dc28b814..b62572216f 100644
--- a/epan/dissectors/x11-glx-render-enum.h
+++ b/epan/dissectors/x11-glx-render-enum.h
@@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It was automatically generated by ../../tools/process-x11-xcb.pl
- using mesa version mesa_7_6_1_rc1-8582-ge0d7281 */
+ using mesa version snb-magic-3282-g51095f7 */
/* $Id$ */
/*
diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h
index 07bfd4dd31..ca881090b8 100644
--- a/epan/dissectors/x11-register-info.h
+++ b/epan/dissectors/x11-register-info.h
@@ -3219,6 +3219,16 @@
{ &hf_x11_sync_SetPriority_priority, { "priority", "x11.sync.SetPriority.priority", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_sync_GetPriority_id, { "id", "x11.sync.GetPriority.id", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_sync_GetPriority_reply_priority, { "priority", "x11.sync.GetPriority.reply.priority", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_sync_CreateFence_drawable, { "drawable", "x11.sync.CreateFence.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_sync_CreateFence_fence, { "fence", "x11.sync.CreateFence.fence", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_sync_CreateFence_initially_triggered, { "initially_triggered", "x11.sync.CreateFence.initially_triggered", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_sync_TriggerFence_fence, { "fence", "x11.sync.TriggerFence.fence", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_sync_ResetFence_fence, { "fence", "x11.sync.ResetFence.fence", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_sync_DestroyFence_fence, { "fence", "x11.sync.DestroyFence.fence", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_sync_QueryFence_fence, { "fence", "x11.sync.QueryFence.fence", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_sync_QueryFence_reply_triggered, { "triggered", "x11.sync.QueryFence.reply.triggered", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_sync_AwaitFence_fence_list, { "fence_list", "x11.sync.AwaitFence.fence_list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_sync_AwaitFence_fence_list_item, { "fence_list", "x11.sync.AwaitFence.fence_list", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_x11_sync_CounterNotify_kind, { "kind", "x11.sync.CounterNotify.kind", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_sync_CounterNotify_counter, { "counter", "x11.sync.CounterNotify.counter", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_x11_sync_CounterNotify_wait_value, { "wait_value", "x11.sync.CounterNotify.wait_value", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -3300,8 +3310,13 @@
{ &hf_x11_xf86dri_GetDrawableInfo_reply_drawable_size_W, { "drawable_size_W", "x11.xf86dri.GetDrawableInfo.reply.drawable_size_W", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xf86dri_GetDrawableInfo_reply_drawable_size_H, { "drawable_size_H", "x11.xf86dri.GetDrawableInfo.reply.drawable_size_H", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xf86dri_GetDrawableInfo_reply_num_clip_rects, { "num_clip_rects", "x11.xf86dri.GetDrawableInfo.reply.num_clip_rects", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xf86dri_GetDrawableInfo_reply_back_x, { "back_x", "x11.xf86dri.GetDrawableInfo.reply.back_x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xf86dri_GetDrawableInfo_reply_back_y, { "back_y", "x11.xf86dri.GetDrawableInfo.reply.back_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xf86dri_GetDrawableInfo_reply_num_back_clip_rects, { "num_back_clip_rects", "x11.xf86dri.GetDrawableInfo.reply.num_back_clip_rects", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xf86dri_GetDrawableInfo_reply_clip_rects, { "clip_rects", "x11.xf86dri.GetDrawableInfo.reply.clip_rects", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_x11_xf86dri_GetDrawableInfo_reply_clip_rects_item, { "clip_rects", "x11.xf86dri.GetDrawableInfo.reply.clip_rects", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xf86dri_GetDrawableInfo_reply_back_clip_rects, { "back_clip_rects", "x11.xf86dri.GetDrawableInfo.reply.back_clip_rects", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xf86dri_GetDrawableInfo_reply_back_clip_rects_item, { "back_clip_rects", "x11.xf86dri.GetDrawableInfo.reply.back_clip_rects", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_x11_xf86dri_GetDeviceInfo_screen, { "screen", "x11.xf86dri.GetDeviceInfo.screen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xf86dri_GetDeviceInfo_reply_framebuffer_handle_low, { "framebuffer_handle_low", "x11.xf86dri.GetDeviceInfo.reply.framebuffer_handle_low", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xf86dri_GetDeviceInfo_reply_framebuffer_handle_high, { "framebuffer_handle_high", "x11.xf86dri.GetDeviceInfo.reply.framebuffer_handle_high", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -4072,6 +4087,7 @@
{ &hf_x11_struct_CountedString16_string, { "string", "x11.struct.CountedString16.string", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_struct_KTMapEntry, { "KTMapEntry", "x11.struct.KTMapEntry", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_x11_struct_KTMapEntry_active, { "active", "x11.struct.KTMapEntry.active", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_KTMapEntry_level, { "level", "x11.struct.KTMapEntry.level", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_struct_KTMapEntry_mods_mask_mask_Shift, { "Shift", "x11.struct.KTMapEntry.mods_mask.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
{ &hf_x11_struct_KTMapEntry_mods_mask_mask_Lock, { "Lock", "x11.struct.KTMapEntry.mods_mask.Lock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
{ &hf_x11_struct_KTMapEntry_mods_mask_mask_Control, { "Control", "x11.struct.KTMapEntry.mods_mask.Control", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
@@ -4082,7 +4098,6 @@
{ &hf_x11_struct_KTMapEntry_mods_mask_mask_5, { "5", "x11.struct.KTMapEntry.mods_mask.5", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
{ &hf_x11_struct_KTMapEntry_mods_mask_mask_Any, { "Any", "x11.struct.KTMapEntry.mods_mask.Any", FT_BOOLEAN, 8, NULL, 1 << 15, NULL, HFILL }},
{ &hf_x11_struct_KTMapEntry_mods_mask, { "mods_mask", "x11.struct.KTMapEntry.mods_mask", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_KTMapEntry_level, { "level", "x11.struct.KTMapEntry.level", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_struct_KTMapEntry_mods_mods_mask_Shift, { "Shift", "x11.struct.KTMapEntry.mods_mods.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
{ &hf_x11_struct_KTMapEntry_mods_mods_mask_Lock, { "Lock", "x11.struct.KTMapEntry.mods_mods.Lock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
{ &hf_x11_struct_KTMapEntry_mods_mods_mask_Control, { "Control", "x11.struct.KTMapEntry.mods_mods.Control", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
@@ -5937,7 +5952,10 @@
{ &hf_x11_xkb_GetKbdByName_reply_reported_mask_Geometry, { "Geometry", "x11.xkb.GetKbdByName.reply.reported.Geometry", FT_BOOLEAN, 16, NULL, 1 << 6, NULL, HFILL }},
{ &hf_x11_xkb_GetKbdByName_reply_reported_mask_OtherNames, { "OtherNames", "x11.xkb.GetKbdByName.reply.reported.OtherNames", FT_BOOLEAN, 16, NULL, 1 << 7, NULL, HFILL }},
{ &hf_x11_xkb_GetKbdByName_reply_reported, { "reported", "x11.xkb.GetKbdByName.reply.reported", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetKbdByName_reply_Types_getmap_type, { "getmap_type", "x11.xkb.GetKbdByName.reply.Types.getmap_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xkb_GetKbdByName_reply_Types_typeDeviceID, { "typeDeviceID", "x11.xkb.GetKbdByName.reply.Types.typeDeviceID", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetKbdByName_reply_Types_getmap_sequence, { "getmap_sequence", "x11.xkb.GetKbdByName.reply.Types.getmap_sequence", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetKbdByName_reply_Types_getmap_length, { "getmap_length", "x11.xkb.GetKbdByName.reply.Types.getmap_length", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xkb_GetKbdByName_reply_Types_typeMinKeyCode, { "typeMinKeyCode", "x11.xkb.GetKbdByName.reply.Types.typeMinKeyCode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xkb_GetKbdByName_reply_Types_typeMaxKeyCode, { "typeMaxKeyCode", "x11.xkb.GetKbdByName.reply.Types.typeMaxKeyCode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xkb_GetKbdByName_reply_Types_present, { "present", "x11.xkb.GetKbdByName.reply.Types.present", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_MapPart), 0, NULL, HFILL }},