Regenerate the X11 dissector with the latest mesa, xcb, and process-x11-xcb.pl

Change-Id: Ie05f9b780011b215ca3ad3293b3daefbcbee68ce
Reviewed-on: https://code.wireshark.org/review/3789
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
This commit is contained in:
Jeff Morriss 2014-08-21 20:06:14 -04:00
parent 331d87e303
commit 50bb930685
4 changed files with 122 additions and 111 deletions

View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It was automatically generated by ../../tools/process-x11-xcb.pl
using xcbproto version 1.10-9-g84bfd90 */
using xcbproto version 1.11-2-g8e3db42 */
/*
* Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
*

View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It was automatically generated by ../../tools/process-x11-xcb.pl
using xcbproto version 1.10-9-g84bfd90 */
using xcbproto version 1.11-2-g8e3db42 */
/*
* Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
*

View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It was automatically generated by ../../tools/process-x11-xcb.pl
using xcbproto version 1.10-9-g84bfd90 */
using xcbproto version 1.11-2-g8e3db42 */
/*
* Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
*
@ -13715,23 +13715,23 @@ static void syncCreateAlarm(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
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) {
if ((f_value_mask & (1 << 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) {
if ((f_value_mask & (1 << 1))) {
field32(tvb, offsetp, t, hf_x11_sync_CreateAlarm_ValueType_valueType, byte_order);
}
if ((f_value_mask & (1 << 2)) != 0) {
if ((f_value_mask & (1 << 2))) {
struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
}
if ((f_value_mask & (1 << 3)) != 0) {
if ((f_value_mask & (1 << 3))) {
field32(tvb, offsetp, t, hf_x11_sync_CreateAlarm_TestType_testType, byte_order);
}
if ((f_value_mask & (1 << 4)) != 0) {
if ((f_value_mask & (1 << 4))) {
struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
}
if ((f_value_mask & (1 << 5)) != 0) {
if ((f_value_mask & (1 << 5))) {
proto_tree_add_item(t, hf_x11_sync_CreateAlarm_Events_events, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
}
@ -13754,23 +13754,23 @@ static void syncChangeAlarm(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
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) {
if ((f_value_mask & (1 << 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) {
if ((f_value_mask & (1 << 1))) {
field32(tvb, offsetp, t, hf_x11_sync_ChangeAlarm_ValueType_valueType, byte_order);
}
if ((f_value_mask & (1 << 2)) != 0) {
if ((f_value_mask & (1 << 2))) {
struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
}
if ((f_value_mask & (1 << 3)) != 0) {
if ((f_value_mask & (1 << 3))) {
field32(tvb, offsetp, t, hf_x11_sync_ChangeAlarm_TestType_testType, byte_order);
}
if ((f_value_mask & (1 << 4)) != 0) {
if ((f_value_mask & (1 << 4))) {
struct_sync_INT64(tvb, offsetp, t, byte_order, 1);
}
if ((f_value_mask & (1 << 5)) != 0) {
if ((f_value_mask & (1 << 5))) {
proto_tree_add_item(t, hf_x11_sync_ChangeAlarm_Events_events, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
}
@ -17150,6 +17150,7 @@ static void xinputChangeFeedbackControl(tvbuff_t *tvb, packet_info *pinfo _U_, i
*offsetp += 1;
proto_tree_add_item(t, hf_x11_xinput_ChangeFeedbackControl_feedback_id, tvb, *offsetp, 1, byte_order);
*offsetp += 1;
UNUSED(2);
struct_xinput_FeedbackCtl(tvb, offsetp, t, byte_order, 1);
}
@ -17238,7 +17239,7 @@ static void xinputSetDeviceModifierMapping(tvbuff_t *tvb, packet_info *pinfo _U_
f_keycodes_per_modifier = VALUE8(tvb, *offsetp);
proto_tree_add_item(t, hf_x11_xinput_SetDeviceModifierMapping_keycodes_per_modifier, tvb, *offsetp, 1, byte_order);
*offsetp += 1;
UNUSED(1);
UNUSED(2);
listOfByte(tvb, offsetp, t, hf_x11_xinput_SetDeviceModifierMapping_keymaps, (f_keycodes_per_modifier * 8), byte_order);
length -= (f_keycodes_per_modifier * 8) * 1;
}
@ -17593,15 +17594,15 @@ static void xinputChangeDeviceProperty(tvbuff_t *tvb, packet_info *pinfo _U_, in
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) {
if ((f_format & (1 << 3))) {
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) {
if ((f_format & (1 << 4))) {
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) {
if ((f_format & (1 << 5))) {
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;
}
@ -17659,13 +17660,13 @@ static void xinputGetDeviceProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int
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) {
if ((f_format & (1 << 3))) {
listOfByte(tvb, offsetp, t, hf_x11_xinput_GetDeviceProperty_reply_8Bits_data8, f_num_items, byte_order);
}
if ((f_format & (1 << 4)) != 0) {
if ((f_format & (1 << 4))) {
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) {
if ((f_format & (1 << 5))) {
listOfCard32(tvb, offsetp, t, hf_x11_xinput_GetDeviceProperty_reply_32Bits_data32, hf_x11_xinput_GetDeviceProperty_reply_32Bits_data32_item, f_num_items, byte_order);
}
}
@ -17820,6 +17821,7 @@ static void xinputXIChangeHierarchy(tvbuff_t *tvb, packet_info *pinfo _U_, int *
f_num_changes = VALUE8(tvb, *offsetp);
proto_tree_add_item(t, hf_x11_xinput_XIChangeHierarchy_num_changes, tvb, *offsetp, 1, byte_order);
*offsetp += 1;
UNUSED(3);
struct_xinput_HierarchyChange(tvb, offsetp, t, byte_order, f_num_changes);
length -= f_num_changes * 0;
}
@ -18239,15 +18241,15 @@ static void xinputXIChangeProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
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) {
if ((f_format & (1 << 3))) {
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) {
if ((f_format & (1 << 4))) {
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) {
if ((f_format & (1 << 5))) {
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;
}
@ -18301,13 +18303,13 @@ static void xinputXIGetProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of
*offsetp += 4;
f_format = field8(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_reply_format, byte_order);
UNUSED(11);
if ((f_format & (1 << 3)) != 0) {
if ((f_format & (1 << 3))) {
listOfByte(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_reply_8Bits_data8, f_num_items, byte_order);
}
if ((f_format & (1 << 4)) != 0) {
if ((f_format & (1 << 4))) {
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) {
if ((f_format & (1 << 5))) {
listOfCard32(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_reply_32Bits_data32, hf_x11_xinput_XIGetProperty_reply_32Bits_data32_item, f_num_items, byte_order);
}
}
@ -20817,7 +20819,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
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) {
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 0))) {
{
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);
@ -20835,7 +20837,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
}
*offsetp += 2;
}
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 2)) != 0) {
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 2))) {
{
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);
@ -20875,7 +20877,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
}
*offsetp += 2;
}
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 3)) != 0) {
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 3))) {
{
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);
@ -20897,19 +20899,19 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
}
*offsetp += 4;
}
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 4)) != 0) {
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 4))) {
proto_tree_add_item(t, hf_x11_xkb_SelectEvents_IndicatorStateNotify_affectIndicatorState, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
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) {
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 5))) {
proto_tree_add_item(t, hf_x11_xkb_SelectEvents_IndicatorMapNotify_affectIndicatorMap, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
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) {
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 6))) {
{
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);
@ -20949,7 +20951,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
}
*offsetp += 2;
}
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 7)) != 0) {
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 7))) {
{
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);
@ -20965,19 +20967,19 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
}
*offsetp += 1;
}
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 8)) != 0) {
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 8))) {
proto_tree_add_item(t, hf_x11_xkb_SelectEvents_BellNotify_affectBell, tvb, *offsetp, 1, byte_order);
*offsetp += 1;
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) {
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 9))) {
proto_tree_add_item(t, hf_x11_xkb_SelectEvents_ActionMessage_affectMsgDetails, tvb, *offsetp, 1, byte_order);
*offsetp += 1;
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) {
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 10))) {
{
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);
@ -21003,7 +21005,7 @@ static void xkbSelectEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
}
*offsetp += 2;
}
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 11)) != 0) {
if (((f_affectWhich & ((~f_clear) & (~f_selectAll))) & (1 << 11))) {
{
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);
@ -21278,6 +21280,7 @@ static void xkbLatchLockState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset
}
*offsetp += 1;
UNUSED(1);
UNUSED(1);
proto_tree_add_item(t, hf_x11_xkb_LatchLockState_latchGroup, tvb, *offsetp, 1, byte_order);
*offsetp += 1;
proto_tree_add_item(t, hf_x11_xkb_LatchLockState_groupLatch, tvb, *offsetp, 2, byte_order);
@ -22043,41 +22046,41 @@ static void xkbGetMap_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pro
proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetMap_reply_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
}
*offsetp += 2;
if ((f_present & (1 << 0)) != 0) {
if ((f_present & (1 << 0))) {
struct_xkb_KeyType(tvb, offsetp, t, byte_order, f_nTypes);
}
if ((f_present & (1 << 1)) != 0) {
if ((f_present & (1 << 1))) {
struct_xkb_KeySymMap(tvb, offsetp, t, byte_order, f_nKeySyms);
}
if ((f_present & (1 << 4)) != 0) {
if ((f_present & (1 << 4))) {
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_KeyActions_acts_rtrn_count, f_nKeyActions, byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
struct_xkb_Action(tvb, offsetp, t, byte_order, f_totalActions);
}
if ((f_present & (1 << 5)) != 0) {
if ((f_present & (1 << 5))) {
struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
}
if ((f_present & (1 << 6)) != 0) {
if ((f_present & (1 << 6))) {
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
}
if ((f_present & (1 << 3)) != 0) {
if ((f_present & (1 << 3))) {
struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
}
if ((f_present & (1 << 2)) != 0) {
if ((f_present & (1 << 2))) {
struct_xkb_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
if (*offsetp % 4) {
UNUSED(4 - *offsetp % 4);
}
}
if ((f_present & (1 << 7)) != 0) {
if ((f_present & (1 << 7))) {
struct_xkb_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
}
}
@ -22191,37 +22194,37 @@ static void xkbSetMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto
proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetMap_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
}
*offsetp += 2;
if ((f_present & (1 << 0)) != 0) {
if ((f_present & (1 << 0))) {
struct_xkb_SetKeyType(tvb, offsetp, t, byte_order, f_nTypes);
length -= f_nTypes * 0;
}
if ((f_present & (1 << 1)) != 0) {
if ((f_present & (1 << 1))) {
struct_xkb_KeySymMap(tvb, offsetp, t, byte_order, f_nKeySyms);
length -= f_nKeySyms * 0;
}
if ((f_present & (1 << 4)) != 0) {
if ((f_present & (1 << 4))) {
listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_KeyActions_actionsCount, f_nKeyActions, byte_order);
length -= f_nKeyActions * 1;
struct_xkb_Action(tvb, offsetp, t, byte_order, f_totalActions);
length -= f_totalActions * 8;
}
if ((f_present & (1 << 5)) != 0) {
if ((f_present & (1 << 5))) {
struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
length -= f_totalKeyBehaviors * 4;
}
if ((f_present & (1 << 6)) != 0) {
if ((f_present & (1 << 6))) {
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) {
if ((f_present & (1 << 3))) {
struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
length -= f_totalKeyExplicit * 2;
}
if ((f_present & (1 << 2)) != 0) {
if ((f_present & (1 << 2))) {
struct_xkb_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
length -= f_totalModMapKeys * 2;
}
if ((f_present & (1 << 7)) != 0) {
if ((f_present & (1 << 7))) {
struct_xkb_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
length -= f_totalVModMapKeys * 4;
}
@ -22766,34 +22769,34 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
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) {
if ((f_which & (1 << 0))) {
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) {
if ((f_which & (1 << 1))) {
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) {
if ((f_which & (1 << 2))) {
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) {
if ((f_which & (1 << 3))) {
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) {
if ((f_which & (1 << 4))) {
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) {
if ((f_which & (1 << 5))) {
proto_tree_add_item(t, hf_x11_xkb_GetNames_reply_Compat_compatName, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
}
if ((f_which & (1 << 6)) != 0) {
if ((f_which & (1 << 6))) {
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) {
if ((f_which & (1 << 7))) {
int sumof_nLevelsPerType = 0;
{
int i;
@ -22805,22 +22808,22 @@ static void xkbGetNames_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
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) {
if ((f_which & (1 << 8))) {
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
}
if ((f_which & (1 << 11)) != 0) {
if ((f_which & (1 << 11))) {
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order);
}
if ((f_which & (1 << 12)) != 0) {
if ((f_which & (1 << 12))) {
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) {
if ((f_which & (1 << 9))) {
struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
}
if ((f_which & (1 << 10)) != 0) {
if ((f_which & (1 << 10))) {
struct_xkb_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
}
if ((f_which & (1 << 13)) != 0) {
if ((f_which & (1 << 13))) {
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_RGNames_radioGroupNames, hf_x11_xkb_GetNames_reply_RGNames_radioGroupNames_item, f_nRadioGroups, byte_order);
}
}
@ -22915,35 +22918,35 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
UNUSED(1);
proto_tree_add_item(t, hf_x11_xkb_SetNames_totalKTLevelNames, tvb, *offsetp, 2, byte_order);
*offsetp += 2;
if ((f_which & (1 << 0)) != 0) {
if ((f_which & (1 << 0))) {
proto_tree_add_item(t, hf_x11_xkb_SetNames_Keycodes_keycodesName, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
}
if ((f_which & (1 << 1)) != 0) {
if ((f_which & (1 << 1))) {
proto_tree_add_item(t, hf_x11_xkb_SetNames_Geometry_geometryName, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
}
if ((f_which & (1 << 2)) != 0) {
if ((f_which & (1 << 2))) {
proto_tree_add_item(t, hf_x11_xkb_SetNames_Symbols_symbolsName, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
}
if ((f_which & (1 << 3)) != 0) {
if ((f_which & (1 << 3))) {
proto_tree_add_item(t, hf_x11_xkb_SetNames_PhysSymbols_physSymbolsName, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
}
if ((f_which & (1 << 4)) != 0) {
if ((f_which & (1 << 4))) {
proto_tree_add_item(t, hf_x11_xkb_SetNames_Types_typesName, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
}
if ((f_which & (1 << 5)) != 0) {
if ((f_which & (1 << 5))) {
proto_tree_add_item(t, hf_x11_xkb_SetNames_Compat_compatName, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
}
if ((f_which & (1 << 6)) != 0) {
if ((f_which & (1 << 6))) {
listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_KeyTypeNames_typeNames, hf_x11_xkb_SetNames_KeyTypeNames_typeNames_item, f_nTypes, byte_order);
length -= f_nTypes * 4;
}
if ((f_which & (1 << 7)) != 0) {
if ((f_which & (1 << 7))) {
int sumof_nLevelsPerType = 0;
{
int i;
@ -22956,27 +22959,27 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro
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) {
if ((f_which & (1 << 8))) {
listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order);
length -= popcount(f_indicators) * 4;
}
if ((f_which & (1 << 11)) != 0) {
if ((f_which & (1 << 11))) {
listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order);
length -= popcount(f_virtualMods) * 4;
}
if ((f_which & (1 << 12)) != 0) {
if ((f_which & (1 << 12))) {
listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, popcount(f_groupNames), byte_order);
length -= popcount(f_groupNames) * 4;
}
if ((f_which & (1 << 9)) != 0) {
if ((f_which & (1 << 9))) {
struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
length -= f_nKeys * 1;
}
if ((f_which & (1 << 10)) != 0) {
if ((f_which & (1 << 10))) {
struct_xkb_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
length -= f_nKeyAliases * 2;
}
if ((f_which & (1 << 13)) != 0) {
if ((f_which & (1 << 13))) {
listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_RGNames_radioGroupNames, hf_x11_xkb_SetNames_RGNames_radioGroupNames_item, f_nRadioGroups, byte_order);
length -= f_nRadioGroups * 4;
}
@ -23279,7 +23282,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
}
*offsetp += 2;
UNUSED(16);
if ((f_reported & ((1 << 0)|(1 << 2)|(1 << 3))) != 0) {
if ((f_reported & (1 << 0)) || (f_reported & (1 << 2)) || (f_reported & (1 << 3))) {
int f_present;
int f_nTypes;
int f_nKeySyms;
@ -23390,33 +23393,33 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetKbdByName_reply_Types_virtualMods_mask_15, tvb, *offsetp, 2, byte_order);
}
*offsetp += 2;
if ((f_present & (1 << 0)) != 0) {
if ((f_present & (1 << 0))) {
struct_xkb_KeyType(tvb, offsetp, t, byte_order, f_nTypes);
}
if ((f_present & (1 << 1)) != 0) {
if ((f_present & (1 << 1))) {
struct_xkb_KeySymMap(tvb, offsetp, t, byte_order, f_nKeySyms);
}
if ((f_present & (1 << 4)) != 0) {
if ((f_present & (1 << 4))) {
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_KeyActions_acts_rtrn_count, f_nKeyActions, byte_order);
struct_xkb_Action(tvb, offsetp, t, byte_order, f_totalActions);
}
if ((f_present & (1 << 5)) != 0) {
if ((f_present & (1 << 5))) {
struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors);
}
if ((f_present & (1 << 6)) != 0) {
if ((f_present & (1 << 6))) {
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order);
}
if ((f_present & (1 << 3)) != 0) {
if ((f_present & (1 << 3))) {
struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit);
}
if ((f_present & (1 << 2)) != 0) {
if ((f_present & (1 << 2))) {
struct_xkb_KeyModMap(tvb, offsetp, t, byte_order, f_totalModMapKeys);
}
if ((f_present & (1 << 7)) != 0) {
if ((f_present & (1 << 7))) {
struct_xkb_KeyVModMap(tvb, offsetp, t, byte_order, f_totalVModMapKeys);
}
}
if ((f_reported & (1 << 1)) != 0) {
if ((f_reported & (1 << 1))) {
int f_groupsRtrn;
int f_nSIRtrn;
proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_CompatMap_compatmap_type, tvb, *offsetp, 1, byte_order);
@ -23449,7 +23452,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
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) {
if ((f_reported & (1 << 4))) {
int f_nIndicators;
proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_IndicatorMaps_indicatormap_type, tvb, *offsetp, 1, byte_order);
*offsetp += 1;
@ -23469,7 +23472,7 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
UNUSED(15);
struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, f_nIndicators);
}
if ((f_reported & ((1 << 5)|(1 << 7))) != 0) {
if ((f_reported & (1 << 5)) || (f_reported & (1 << 7))) {
int f_which;
int f_nTypes;
int f_groupNames;
@ -23562,34 +23565,34 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_nKTLevels, tvb, *offsetp, 2, byte_order);
*offsetp += 2;
UNUSED(4);
if ((f_which & (1 << 0)) != 0) {
if ((f_which & (1 << 0))) {
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) {
if ((f_which & (1 << 1))) {
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) {
if ((f_which & (1 << 2))) {
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) {
if ((f_which & (1 << 3))) {
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) {
if ((f_which & (1 << 4))) {
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) {
if ((f_which & (1 << 5))) {
proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_KeyNames_Compat_compatName, tvb, *offsetp, 4, byte_order);
*offsetp += 4;
}
if ((f_which & (1 << 6)) != 0) {
if ((f_which & (1 << 6))) {
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) {
if ((f_which & (1 << 7))) {
int sumof_nLevelsPerType = 0;
{
int i;
@ -23600,26 +23603,26 @@ static void xkbGetKbdByName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset
listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_nLevelsPerType, f_nTypes, 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) {
if ((f_which & (1 << 8))) {
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);
}
if ((f_which & (1 << 11)) != 0) {
if ((f_which & (1 << 11))) {
listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order);
}
if ((f_which & (1 << 12)) != 0) {
if ((f_which & (1 << 12))) {
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) {
if ((f_which & (1 << 9))) {
struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys);
}
if ((f_which & (1 << 10)) != 0) {
if ((f_which & (1 << 10))) {
struct_xkb_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases);
}
if ((f_which & (1 << 13)) != 0) {
if ((f_which & (1 << 13))) {
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 << 6)) != 0) {
if ((f_reported & (1 << 6))) {
proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_geometry_type, tvb, *offsetp, 1, byte_order);
*offsetp += 1;
proto_tree_add_item(t, hf_x11_xkb_GetKbdByName_reply_Geometry_geometryDeviceID, tvb, *offsetp, 1, byte_order);

View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It was automatically generated by ../../tools/process-x11-xcb.pl
using mesa version 10.2-branchpoint-592-g63117ac */
using mesa version 10.3-branchpoint-14-ge7f2f2d */
/*
* Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
*
@ -1306,6 +1306,9 @@ static const value_string mesa_enum[] = {
/* OpenGL extension GL_ARB_transform_feedback_instanced */
/* OpenGL extension GL_ARB_map_buffer_alignment */
{ 0x90BC, "MIN_MAP_BUFFER_ALIGNMENT" },
/* OpenGL extension GL_ARB_fragment_layer_viewport */
/* OpenGL extension GL_ARB_explicit_uniform_location */
{ 0x826E, "MAX_UNIFORM_LOCATIONS" },
/* OpenGL extension GL_ARB_buffer_storage */
{ 0x40, "MAP_PERSISTENT_BIT" },
{ 0x80, "MAP_COHERENT_BIT" },
@ -1314,6 +1317,11 @@ static const value_string mesa_enum[] = {
{ 0x821F, "BUFFER_IMMUTABLE_STORAGE" },
{ 0x8220, "BUFFER_STORAGE_FLAGS" },
{ 0x4000, "CLIENT_MAPPED_BUFFER_BARRIER_BIT" },
/* OpenGL extension GL_ARB_conditional_render_inverted */
{ 0x8E17, "QUERY_WAIT_INVERTED" },
{ 0x8E18, "QUERY_NO_WAIT_INVERTED" },
{ 0x8E19, "QUERY_BY_REGION_WAIT_INVERTED" },
{ 0x8E1A, "QUERY_BY_REGION_NO_WAIT_INVERTED" },
/* OpenGL extension GL_EXT_blend_color */
{ 0x8001, "CONSTANT_COLOR_EXT" },
{ 0x8002, "ONE_MINUS_CONSTANT_COLOR_EXT" },