diff options
Diffstat (limited to 'epan/dissectors/x11-extension-implementation.h')
| -rw-r--r-- | epan/dissectors/x11-extension-implementation.h | 142 |
1 files changed, 133 insertions, 9 deletions
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); |