diff options
| -rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
| -rw-r--r-- | epan/dissectors/x11-declarations.h | 220 | ||||
| -rw-r--r-- | epan/dissectors/x11-enum.h | 392 | ||||
| -rw-r--r-- | epan/dissectors/x11-extension-errors.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/x11-extension-implementation.h | 812 | ||||
| -rw-r--r-- | epan/dissectors/x11-glx-render-enum.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/x11-register-info.h | 862 | ||||
| -rwxr-xr-x | tools/process-x11-xcb.pl | 140 |
8 files changed, 1737 insertions, 694 deletions
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 391112e895..7cfc5fab36 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -1243,6 +1243,7 @@ DISSECTOR_INCLUDES = \ x11-extension-implementation.h \ x11-extension-errors.h \ x11-glx-render-enum.h \ + x11-enum.h \ packet-x411.h \ packet-x420.h \ packet-x509af.h \ diff --git a/epan/dissectors/x11-declarations.h b/epan/dissectors/x11-declarations.h index ae6f3a8843..96a3b71f56 100644 --- a/epan/dissectors/x11-declarations.h +++ b/epan/dissectors/x11-declarations.h @@ -2357,6 +2357,12 @@ static int hf_x11_randr_SetScreenConfig_window = -1; static int hf_x11_randr_SetScreenConfig_timestamp = -1; static int hf_x11_randr_SetScreenConfig_config_timestamp = -1; static int hf_x11_randr_SetScreenConfig_sizeID = -1; +static int hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_0 = -1; +static int hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_90 = -1; +static int hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_180 = -1; +static int hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_270 = -1; +static int hf_x11_randr_SetScreenConfig_rotation_mask_Reflect_X = -1; +static int hf_x11_randr_SetScreenConfig_rotation_mask_Reflect_Y = -1; static int hf_x11_randr_SetScreenConfig_rotation = -1; static int hf_x11_randr_SetScreenConfig_rate = -1; static int hf_x11_randr_SetScreenConfig_reply_status = -1; @@ -2365,14 +2371,30 @@ static int hf_x11_randr_SetScreenConfig_reply_config_timestamp = -1; static int hf_x11_randr_SetScreenConfig_reply_root = -1; static int hf_x11_randr_SetScreenConfig_reply_subpixel_order = -1; static int hf_x11_randr_SelectInput_window = -1; +static int hf_x11_randr_SelectInput_enable_mask_ScreenChange = -1; +static int hf_x11_randr_SelectInput_enable_mask_CrtcChange = -1; +static int hf_x11_randr_SelectInput_enable_mask_OutputChange = -1; +static int hf_x11_randr_SelectInput_enable_mask_OutputProperty = -1; static int hf_x11_randr_SelectInput_enable = -1; static int hf_x11_randr_GetScreenInfo_window = -1; +static int hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_0 = -1; +static int hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_90 = -1; +static int hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_180 = -1; +static int hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_270 = -1; +static int hf_x11_randr_GetScreenInfo_reply_rotations_mask_Reflect_X = -1; +static int hf_x11_randr_GetScreenInfo_reply_rotations_mask_Reflect_Y = -1; static int hf_x11_randr_GetScreenInfo_reply_rotations = -1; static int hf_x11_randr_GetScreenInfo_reply_root = -1; static int hf_x11_randr_GetScreenInfo_reply_timestamp = -1; static int hf_x11_randr_GetScreenInfo_reply_config_timestamp = -1; static int hf_x11_randr_GetScreenInfo_reply_nSizes = -1; static int hf_x11_randr_GetScreenInfo_reply_sizeID = -1; +static int hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_0 = -1; +static int hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_90 = -1; +static int hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_180 = -1; +static int hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_270 = -1; +static int hf_x11_randr_GetScreenInfo_reply_rotation_mask_Reflect_X = -1; +static int hf_x11_randr_GetScreenInfo_reply_rotation_mask_Reflect_Y = -1; static int hf_x11_randr_GetScreenInfo_reply_rotation = -1; static int hf_x11_randr_GetScreenInfo_reply_rate = -1; static int hf_x11_randr_GetScreenInfo_reply_nInfo = -1; @@ -2402,6 +2424,20 @@ static int hf_x11_struct_ModeInfo_vsync_start = -1; static int hf_x11_struct_ModeInfo_vsync_end = -1; static int hf_x11_struct_ModeInfo_vtotal = -1; static int hf_x11_struct_ModeInfo_name_len = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_HsyncPositive = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_HsyncNegative = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_VsyncPositive = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_VsyncNegative = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_Interlace = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_DoubleScan = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_Csync = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_CsyncPositive = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_CsyncNegative = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_HskewPresent = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_Bcast = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_PixelMultiplex = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_DoubleClock = -1; +static int hf_x11_struct_ModeInfo_mode_flags_mask_HalveClock = -1; static int hf_x11_struct_ModeInfo_mode_flags = -1; static int hf_x11_randr_GetScreenResources_window = -1; static int hf_x11_randr_GetScreenResources_reply_timestamp = -1; @@ -2494,7 +2530,19 @@ static int hf_x11_randr_GetCrtcInfo_reply_y = -1; static int hf_x11_randr_GetCrtcInfo_reply_width = -1; static int hf_x11_randr_GetCrtcInfo_reply_height = -1; static int hf_x11_randr_GetCrtcInfo_reply_mode = -1; +static int hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_0 = -1; +static int hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_90 = -1; +static int hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_180 = -1; +static int hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_270 = -1; +static int hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Reflect_X = -1; +static int hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Reflect_Y = -1; static int hf_x11_randr_GetCrtcInfo_reply_rotation = -1; +static int hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_0 = -1; +static int hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_90 = -1; +static int hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_180 = -1; +static int hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_270 = -1; +static int hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Reflect_X = -1; +static int hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Reflect_Y = -1; static int hf_x11_randr_GetCrtcInfo_reply_rotations = -1; static int hf_x11_randr_GetCrtcInfo_reply_num_outputs = -1; static int hf_x11_randr_GetCrtcInfo_reply_num_possible_outputs = -1; @@ -2508,6 +2556,12 @@ static int hf_x11_randr_SetCrtcConfig_config_timestamp = -1; static int hf_x11_randr_SetCrtcConfig_x = -1; static int hf_x11_randr_SetCrtcConfig_y = -1; static int hf_x11_randr_SetCrtcConfig_mode = -1; +static int hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_0 = -1; +static int hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_90 = -1; +static int hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_180 = -1; +static int hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_270 = -1; +static int hf_x11_randr_SetCrtcConfig_rotation_mask_Reflect_X = -1; +static int hf_x11_randr_SetCrtcConfig_rotation_mask_Reflect_Y = -1; static int hf_x11_randr_SetCrtcConfig_rotation = -1; static int hf_x11_randr_SetCrtcConfig_outputs = -1; static int hf_x11_randr_SetCrtcConfig_outputs_item = -1; @@ -2600,6 +2654,12 @@ static int hf_x11_randr_SetOutputPrimary_window = -1; static int hf_x11_randr_SetOutputPrimary_output = -1; static int hf_x11_randr_GetOutputPrimary_window = -1; static int hf_x11_randr_GetOutputPrimary_reply_output = -1; +static int hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_0 = -1; +static int hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_90 = -1; +static int hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_180 = -1; +static int hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_270 = -1; +static int hf_x11_randr_ScreenChangeNotify_rotation_mask_Reflect_X = -1; +static int hf_x11_randr_ScreenChangeNotify_rotation_mask_Reflect_Y = -1; static int hf_x11_randr_ScreenChangeNotify_rotation = -1; static int hf_x11_randr_ScreenChangeNotify_timestamp = -1; static int hf_x11_randr_ScreenChangeNotify_config_timestamp = -1; @@ -2616,6 +2676,12 @@ static int hf_x11_struct_CrtcChange_timestamp = -1; static int hf_x11_struct_CrtcChange_window = -1; static int hf_x11_struct_CrtcChange_crtc = -1; static int hf_x11_struct_CrtcChange_mode = -1; +static int hf_x11_struct_CrtcChange_rotation_mask_Rotate_0 = -1; +static int hf_x11_struct_CrtcChange_rotation_mask_Rotate_90 = -1; +static int hf_x11_struct_CrtcChange_rotation_mask_Rotate_180 = -1; +static int hf_x11_struct_CrtcChange_rotation_mask_Rotate_270 = -1; +static int hf_x11_struct_CrtcChange_rotation_mask_Reflect_X = -1; +static int hf_x11_struct_CrtcChange_rotation_mask_Reflect_Y = -1; static int hf_x11_struct_CrtcChange_rotation = -1; static int hf_x11_struct_CrtcChange_x = -1; static int hf_x11_struct_CrtcChange_y = -1; @@ -2628,6 +2694,12 @@ static int hf_x11_struct_OutputChange_window = -1; static int hf_x11_struct_OutputChange_output = -1; static int hf_x11_struct_OutputChange_crtc = -1; static int hf_x11_struct_OutputChange_mode = -1; +static int hf_x11_struct_OutputChange_rotation_mask_Rotate_0 = -1; +static int hf_x11_struct_OutputChange_rotation_mask_Rotate_90 = -1; +static int hf_x11_struct_OutputChange_rotation_mask_Rotate_180 = -1; +static int hf_x11_struct_OutputChange_rotation_mask_Rotate_270 = -1; +static int hf_x11_struct_OutputChange_rotation_mask_Reflect_X = -1; +static int hf_x11_struct_OutputChange_rotation_mask_Reflect_Y = -1; static int hf_x11_struct_OutputChange_rotation = -1; static int hf_x11_struct_OutputChange_connection = -1; static int hf_x11_struct_OutputChange_subpixel_order = -1; @@ -3200,6 +3272,20 @@ static int hf_x11_xf86vidmode_GetModeLine_reply_vdisplay = -1; static int hf_x11_xf86vidmode_GetModeLine_reply_vsyncstart = -1; static int hf_x11_xf86vidmode_GetModeLine_reply_vsyncend = -1; static int hf_x11_xf86vidmode_GetModeLine_reply_vtotal = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HsyncPositive = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HsyncNegative = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_VsyncPositive = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_VsyncNegative = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Interlace = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_DoubleScan = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Csync = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_CsyncPositive = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_CsyncNegative = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HskewPresent = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Bcast = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_PixelMultiplex = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_DoubleClock = -1; +static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HalveClock = -1; static int hf_x11_xf86vidmode_GetModeLine_reply_flags = -1; static int hf_x11_xf86vidmode_GetModeLine_reply_privsize = -1; static int hf_x11_xf86vidmode_GetModeLine_reply_private = -1; @@ -3213,6 +3299,20 @@ static int hf_x11_xf86vidmode_ModModeLine_vdisplay = -1; static int hf_x11_xf86vidmode_ModModeLine_vsyncstart = -1; static int hf_x11_xf86vidmode_ModModeLine_vsyncend = -1; static int hf_x11_xf86vidmode_ModModeLine_vtotal = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_HsyncPositive = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_HsyncNegative = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_VsyncPositive = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_VsyncNegative = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_Interlace = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_DoubleScan = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_Csync = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_CsyncPositive = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_CsyncNegative = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_HskewPresent = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_Bcast = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_PixelMultiplex = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_DoubleClock = -1; +static int hf_x11_xf86vidmode_ModModeLine_flags_mask_HalveClock = -1; static int hf_x11_xf86vidmode_ModModeLine_flags = -1; static int hf_x11_xf86vidmode_ModModeLine_privsize = -1; static int hf_x11_xf86vidmode_ModModeLine_private = -1; @@ -3247,6 +3347,20 @@ static int hf_x11_xf86vidmode_AddModeLine_vdisplay = -1; static int hf_x11_xf86vidmode_AddModeLine_vsyncstart = -1; static int hf_x11_xf86vidmode_AddModeLine_vsyncend = -1; static int hf_x11_xf86vidmode_AddModeLine_vtotal = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_HsyncPositive = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_HsyncNegative = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_VsyncPositive = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_VsyncNegative = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_Interlace = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_DoubleScan = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_Csync = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_CsyncPositive = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_CsyncNegative = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_HskewPresent = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_Bcast = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_PixelMultiplex = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_DoubleClock = -1; +static int hf_x11_xf86vidmode_AddModeLine_flags_mask_HalveClock = -1; static int hf_x11_xf86vidmode_AddModeLine_flags = -1; static int hf_x11_xf86vidmode_AddModeLine_privsize = -1; static int hf_x11_xf86vidmode_AddModeLine_after_dotclock = -1; @@ -3259,6 +3373,20 @@ static int hf_x11_xf86vidmode_AddModeLine_after_vdisplay = -1; static int hf_x11_xf86vidmode_AddModeLine_after_vsyncstart = -1; static int hf_x11_xf86vidmode_AddModeLine_after_vsyncend = -1; static int hf_x11_xf86vidmode_AddModeLine_after_vtotal = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HsyncPositive = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HsyncNegative = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_VsyncPositive = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_VsyncNegative = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Interlace = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_DoubleScan = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Csync = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_CsyncPositive = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_CsyncNegative = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HskewPresent = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Bcast = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_PixelMultiplex = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_DoubleClock = -1; +static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HalveClock = -1; static int hf_x11_xf86vidmode_AddModeLine_after_flags = -1; static int hf_x11_xf86vidmode_AddModeLine_private = -1; static int hf_x11_xf86vidmode_DeleteModeLine_screen = -1; @@ -3272,6 +3400,20 @@ static int hf_x11_xf86vidmode_DeleteModeLine_vdisplay = -1; static int hf_x11_xf86vidmode_DeleteModeLine_vsyncstart = -1; static int hf_x11_xf86vidmode_DeleteModeLine_vsyncend = -1; static int hf_x11_xf86vidmode_DeleteModeLine_vtotal = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HsyncPositive = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HsyncNegative = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_VsyncPositive = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_VsyncNegative = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Interlace = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_DoubleScan = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Csync = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_CsyncPositive = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_CsyncNegative = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HskewPresent = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Bcast = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_PixelMultiplex = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_DoubleClock = -1; +static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HalveClock = -1; static int hf_x11_xf86vidmode_DeleteModeLine_flags = -1; static int hf_x11_xf86vidmode_DeleteModeLine_privsize = -1; static int hf_x11_xf86vidmode_DeleteModeLine_private = -1; @@ -3286,6 +3428,20 @@ static int hf_x11_xf86vidmode_ValidateModeLine_vdisplay = -1; static int hf_x11_xf86vidmode_ValidateModeLine_vsyncstart = -1; static int hf_x11_xf86vidmode_ValidateModeLine_vsyncend = -1; static int hf_x11_xf86vidmode_ValidateModeLine_vtotal = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HsyncPositive = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HsyncNegative = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_VsyncPositive = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_VsyncNegative = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Interlace = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_DoubleScan = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Csync = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_CsyncPositive = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_CsyncNegative = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HskewPresent = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Bcast = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_PixelMultiplex = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_DoubleClock = -1; +static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HalveClock = -1; static int hf_x11_xf86vidmode_ValidateModeLine_flags = -1; static int hf_x11_xf86vidmode_ValidateModeLine_privsize = -1; static int hf_x11_xf86vidmode_ValidateModeLine_private = -1; @@ -3301,6 +3457,20 @@ static int hf_x11_xf86vidmode_SwitchToMode_vdisplay = -1; static int hf_x11_xf86vidmode_SwitchToMode_vsyncstart = -1; static int hf_x11_xf86vidmode_SwitchToMode_vsyncend = -1; static int hf_x11_xf86vidmode_SwitchToMode_vtotal = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_HsyncPositive = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_HsyncNegative = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_VsyncPositive = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_VsyncNegative = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_Interlace = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_DoubleScan = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_Csync = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_CsyncPositive = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_CsyncNegative = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_HskewPresent = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_Bcast = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_PixelMultiplex = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_DoubleClock = -1; +static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_HalveClock = -1; static int hf_x11_xf86vidmode_SwitchToMode_flags = -1; static int hf_x11_xf86vidmode_SwitchToMode_privsize = -1; static int hf_x11_xf86vidmode_SwitchToMode_private = -1; @@ -3311,6 +3481,7 @@ static int hf_x11_xf86vidmode_SetViewPort_screen = -1; static int hf_x11_xf86vidmode_SetViewPort_x = -1; static int hf_x11_xf86vidmode_SetViewPort_y = -1; static int hf_x11_xf86vidmode_GetDotClocks_screen = -1; +static int hf_x11_xf86vidmode_GetDotClocks_reply_flags_mask_Programable = -1; static int hf_x11_xf86vidmode_GetDotClocks_reply_flags = -1; static int hf_x11_xf86vidmode_GetDotClocks_reply_clocks = -1; static int hf_x11_xf86vidmode_GetDotClocks_reply_maxclocks = -1; @@ -3346,6 +3517,8 @@ static int hf_x11_xf86vidmode_SetGammaRamp_blue_item = -1; static int hf_x11_xf86vidmode_GetGammaRampSize_screen = -1; static int hf_x11_xf86vidmode_GetGammaRampSize_reply_size = -1; static int hf_x11_xf86vidmode_GetPermissions_screen = -1; +static int hf_x11_xf86vidmode_GetPermissions_reply_permissions_mask_Read = -1; +static int hf_x11_xf86vidmode_GetPermissions_reply_permissions_mask_Write = -1; static int hf_x11_xf86vidmode_GetPermissions_reply_permissions = -1; static int hf_x11_xf86vidmode_extension_minor = -1; @@ -3365,6 +3538,9 @@ static int hf_x11_xfixes_SelectionNotify_timestamp = -1; static int hf_x11_xfixes_SelectionNotify_selection_timestamp = -1; static int hf_x11_xfixes_SelectSelectionInput_window = -1; static int hf_x11_xfixes_SelectSelectionInput_selection = -1; +static int hf_x11_xfixes_SelectSelectionInput_event_mask_mask_SetSelectionOwner = -1; +static int hf_x11_xfixes_SelectSelectionInput_event_mask_mask_SelectionWindowDestroy = -1; +static int hf_x11_xfixes_SelectSelectionInput_event_mask_mask_SelectionClientClose = -1; static int hf_x11_xfixes_SelectSelectionInput_event_mask = -1; static int hf_x11_xfixes_CursorNotify_subtype = -1; static int hf_x11_xfixes_CursorNotify_window = -1; @@ -3372,6 +3548,7 @@ static int hf_x11_xfixes_CursorNotify_cursor_serial = -1; static int hf_x11_xfixes_CursorNotify_timestamp = -1; static int hf_x11_xfixes_CursorNotify_name = -1; static int hf_x11_xfixes_SelectCursorInput_window = -1; +static int hf_x11_xfixes_SelectCursorInput_event_mask_mask_DisplayCursor = -1; static int hf_x11_xfixes_SelectCursorInput_event_mask = -1; static int hf_x11_xfixes_GetCursorImage_reply_x = -1; static int hf_x11_xfixes_GetCursorImage_reply_y = -1; @@ -3565,6 +3742,15 @@ static int hf_x11_xinput_UngrabDevice_time = -1; static int hf_x11_xinput_UngrabDevice_device_id = -1; static int hf_x11_xinput_GrabDeviceKey_grab_window = -1; static int hf_x11_xinput_GrabDeviceKey_num_classes = -1; +static int hf_x11_xinput_GrabDeviceKey_modifiers_mask_Shift = -1; +static int hf_x11_xinput_GrabDeviceKey_modifiers_mask_Lock = -1; +static int hf_x11_xinput_GrabDeviceKey_modifiers_mask_Control = -1; +static int hf_x11_xinput_GrabDeviceKey_modifiers_mask_1 = -1; +static int hf_x11_xinput_GrabDeviceKey_modifiers_mask_2 = -1; +static int hf_x11_xinput_GrabDeviceKey_modifiers_mask_3 = -1; +static int hf_x11_xinput_GrabDeviceKey_modifiers_mask_4 = -1; +static int hf_x11_xinput_GrabDeviceKey_modifiers_mask_5 = -1; +static int hf_x11_xinput_GrabDeviceKey_modifiers_mask_Any = -1; static int hf_x11_xinput_GrabDeviceKey_modifiers = -1; static int hf_x11_xinput_GrabDeviceKey_modifier_device = -1; static int hf_x11_xinput_GrabDeviceKey_grabbed_device = -1; @@ -3575,6 +3761,15 @@ static int hf_x11_xinput_GrabDeviceKey_owner_events = -1; static int hf_x11_xinput_GrabDeviceKey_classes = -1; static int hf_x11_xinput_GrabDeviceKey_classes_item = -1; static int hf_x11_xinput_UngrabDeviceKey_grabWindow = -1; +static int hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Shift = -1; +static int hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Lock = -1; +static int hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Control = -1; +static int hf_x11_xinput_UngrabDeviceKey_modifiers_mask_1 = -1; +static int hf_x11_xinput_UngrabDeviceKey_modifiers_mask_2 = -1; +static int hf_x11_xinput_UngrabDeviceKey_modifiers_mask_3 = -1; +static int hf_x11_xinput_UngrabDeviceKey_modifiers_mask_4 = -1; +static int hf_x11_xinput_UngrabDeviceKey_modifiers_mask_5 = -1; +static int hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Any = -1; static int hf_x11_xinput_UngrabDeviceKey_modifiers = -1; static int hf_x11_xinput_UngrabDeviceKey_modifier_device = -1; static int hf_x11_xinput_UngrabDeviceKey_key = -1; @@ -3583,6 +3778,15 @@ static int hf_x11_xinput_GrabDeviceButton_grab_window = -1; static int hf_x11_xinput_GrabDeviceButton_grabbed_device = -1; static int hf_x11_xinput_GrabDeviceButton_modifier_device = -1; static int hf_x11_xinput_GrabDeviceButton_num_classes = -1; +static int hf_x11_xinput_GrabDeviceButton_modifiers_mask_Shift = -1; +static int hf_x11_xinput_GrabDeviceButton_modifiers_mask_Lock = -1; +static int hf_x11_xinput_GrabDeviceButton_modifiers_mask_Control = -1; +static int hf_x11_xinput_GrabDeviceButton_modifiers_mask_1 = -1; +static int hf_x11_xinput_GrabDeviceButton_modifiers_mask_2 = -1; +static int hf_x11_xinput_GrabDeviceButton_modifiers_mask_3 = -1; +static int hf_x11_xinput_GrabDeviceButton_modifiers_mask_4 = -1; +static int hf_x11_xinput_GrabDeviceButton_modifiers_mask_5 = -1; +static int hf_x11_xinput_GrabDeviceButton_modifiers_mask_Any = -1; static int hf_x11_xinput_GrabDeviceButton_modifiers = -1; static int hf_x11_xinput_GrabDeviceButton_this_device_mode = -1; static int hf_x11_xinput_GrabDeviceButton_other_device_mode = -1; @@ -3591,6 +3795,15 @@ static int hf_x11_xinput_GrabDeviceButton_owner_events = -1; static int hf_x11_xinput_GrabDeviceButton_classes = -1; static int hf_x11_xinput_GrabDeviceButton_classes_item = -1; static int hf_x11_xinput_UngrabDeviceButton_grab_window = -1; +static int hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Shift = -1; +static int hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Lock = -1; +static int hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Control = -1; +static int hf_x11_xinput_UngrabDeviceButton_modifiers_mask_1 = -1; +static int hf_x11_xinput_UngrabDeviceButton_modifiers_mask_2 = -1; +static int hf_x11_xinput_UngrabDeviceButton_modifiers_mask_3 = -1; +static int hf_x11_xinput_UngrabDeviceButton_modifiers_mask_4 = -1; +static int hf_x11_xinput_UngrabDeviceButton_modifiers_mask_5 = -1; +static int hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Any = -1; static int hf_x11_xinput_UngrabDeviceButton_modifiers = -1; static int hf_x11_xinput_UngrabDeviceButton_modifier_device = -1; static int hf_x11_xinput_UngrabDeviceButton_button = -1; @@ -3884,6 +4097,11 @@ static int hf_x11_struct_AdaptorInfo_base_id = -1; static int hf_x11_struct_AdaptorInfo_name_size = -1; static int hf_x11_struct_AdaptorInfo_num_ports = -1; static int hf_x11_struct_AdaptorInfo_num_formats = -1; +static int hf_x11_struct_AdaptorInfo_type_mask_InputMask = -1; +static int hf_x11_struct_AdaptorInfo_type_mask_OutputMask = -1; +static int hf_x11_struct_AdaptorInfo_type_mask_VideoMask = -1; +static int hf_x11_struct_AdaptorInfo_type_mask_StillMask = -1; +static int hf_x11_struct_AdaptorInfo_type_mask_ImageMask = -1; static int hf_x11_struct_AdaptorInfo_type = -1; static int hf_x11_struct_AdaptorInfo_name = -1; static int hf_x11_struct_AdaptorInfo_formats = -1; @@ -3896,6 +4114,8 @@ static int hf_x11_struct_EncodingInfo_height = -1; static int hf_x11_struct_EncodingInfo_rate = -1; static int hf_x11_struct_EncodingInfo_name = -1; static int hf_x11_struct_AttributeInfo = -1; +static int hf_x11_struct_AttributeInfo_flags_mask_Gettable = -1; +static int hf_x11_struct_AttributeInfo_flags_mask_Settable = -1; static int hf_x11_struct_AttributeInfo_flags = -1; static int hf_x11_struct_AttributeInfo_min = -1; static int hf_x11_struct_AttributeInfo_max = -1; diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h new file mode 100644 index 0000000000..c8f9e59b23 --- /dev/null +++ b/epan/dissectors/x11-enum.h @@ -0,0 +1,392 @@ +/* Do not modify this file. */ +/* It was automatically generated by ../../tools/process-x11-xcb.pl + using xcbproto version 1.5-5-g4f4d43e */ +/* $Id$ */ + +/* + * Copyright 2008, 2009 Open Text Corporation <pharris[AT]opentext.com> + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald[AT]wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +static const value_string x11_enum_PictType[] = { + { 0, "Indexed" }, + { 1, "Direct" }, + { 0, NULL }, +}; + +static const value_string x11_enum_Redirect[] = { + { 0, "Automatic" }, + { 1, "Manual" }, + { 0, NULL }, +}; + +static const value_string x11_enum_ReportLevel[] = { + { 0, "RawRectangles" }, + { 1, "DeltaRectangles" }, + { 2, "BoundingBox" }, + { 3, "NonEmpty" }, + { 0, NULL }, +}; + +static const value_string x11_enum_Region[] = { + { 0, "None" }, + { 0, NULL }, +}; + +static const value_string x11_enum_DPMSMode[] = { + { 0, "On" }, + { 1, "Standby" }, + { 2, "Suspend" }, + { 3, "Off" }, + { 0, NULL }, +}; + +static const value_string x11_enum_SetConfig[] = { + { 0, "Success" }, + { 1, "InvalidConfigTime" }, + { 2, "InvalidTime" }, + { 3, "Failed" }, + { 0, NULL }, +}; + +static const value_string x11_enum_SubPixel[] = { + { 0, "Unknown" }, + { 1, "HorizontalRGB" }, + { 2, "HorizontalBGR" }, + { 3, "VerticalRGB" }, + { 4, "VerticalBGR" }, + { 5, "None" }, + { 0, NULL }, +}; + +static const value_string x11_enum_Connection[] = { + { 0, "Connected" }, + { 1, "Disconnected" }, + { 2, "Unknown" }, + { 0, NULL }, +}; + +static const value_string x11_enum_PropMode[] = { + { 0, "Replace" }, + { 1, "Prepend" }, + { 2, "Append" }, + { 0, NULL }, +}; + +static const value_string x11_enum_GetPropertyType[] = { + { 0, "Any" }, + { 0, NULL }, +}; + +static const value_string x11_enum_Atom[] = { + { 0, "None" }, + { 0, NULL }, +}; + +static const value_string x11_enum_Property[] = { + { 0, "NewValue" }, + { 1, "Delete" }, + { 0, NULL }, +}; + +static const value_string x11_enum_Notify[] = { + { 0, "CrtcChange" }, + { 1, "OutputChange" }, + { 2, "OutputProperty" }, + { 0, NULL }, +}; + +static const value_string x11_enum_PictOp[] = { + { 0, "Clear" }, + { 1, "Src" }, + { 2, "Dst" }, + { 3, "Over" }, + { 4, "OverReverse" }, + { 5, "In" }, + { 6, "InReverse" }, + { 7, "Out" }, + { 8, "OutReverse" }, + { 9, "Atop" }, + { 10, "AtopReverse" }, + { 11, "Xor" }, + { 12, "Add" }, + { 13, "Saturate" }, + { 16, "DisjointClear" }, + { 17, "DisjointSrc" }, + { 18, "DisjointDst" }, + { 19, "DisjointOver" }, + { 20, "DisjointOverReverse" }, + { 21, "DisjointIn" }, + { 22, "DisjointInReverse" }, + { 23, "DisjointOut" }, + { 24, "DisjointOutReverse" }, + { 25, "DisjointAtop" }, + { 26, "DisjointAtopReverse" }, + { 27, "DisjointXor" }, + { 32, "ConjointClear" }, + { 33, "ConjointSrc" }, + { 34, "ConjointDst" }, + { 35, "ConjointOver" }, + { 36, "ConjointOverReverse" }, + { 37, "ConjointIn" }, + { 38, "ConjointInReverse" }, + { 39, "ConjointOut" }, + { 40, "ConjointOutReverse" }, + { 41, "ConjointAtop" }, + { 42, "ConjointAtopReverse" }, + { 43, "ConjointXor" }, + { 0, NULL }, +}; + +static const value_string x11_enum_Picture[] = { + { 0, "None" }, + { 0, NULL }, +}; + +static const value_string x11_enum_SK[] = { + { 0, "Bounding" }, + { 1, "Clip" }, + { 2, "Input" }, + { 0, NULL }, +}; + +static const value_string x11_enum_SO[] = { + { 0, "Set" }, + { 1, "Union" }, + { 2, "Intersect" }, + { 3, "Subtract" }, + { 4, "Invert" }, + { 0, NULL }, +}; + +static const value_string x11_enum_ClipOrdering[] = { + { 0, "Unsorted" }, + { 1, "YSorted" }, + { 2, "YXSorted" }, + { 3, "YXBanded" }, + { 0, NULL }, +}; + +static const value_string x11_enum_Pixmap[] = { + { 0, "None" }, + { 0, NULL }, +}; + +static const value_string x11_enum_VALUETYPE[] = { + { 0, "Absolute" }, + { 1, "Relative" }, + { 0, NULL }, +}; + +static const value_string x11_enum_TESTTYPE[] = { + { 0, "PositiveTransition" }, + { 1, "NegativeTransition" }, + { 2, "PositiveComparison" }, + { 3, "NegativeComparison" }, + { 0, NULL }, +}; + +static const value_string x11_enum_ALARMSTATE[] = { + { 0, "Active" }, + { 1, "Inactive" }, + { 2, "Destroyed" }, + { 0, NULL }, +}; + +static const value_string x11_enum_SaveSetMode[] = { + { 0, "Insert" }, + { 1, "Delete" }, + { 0, NULL }, +}; + +static const value_string x11_enum_SaveSetTarget[] = { + { 0, "Nearest" }, + { 1, "Root" }, + { 0, NULL }, +}; + +static const value_string x11_enum_SaveSetMapping[] = { + { 0, "Map" }, + { 1, "Unmap" }, + { 0, NULL }, +}; + +static const value_string x11_enum_SelectionEvent[] = { + { 0, "SetSelectionOwner" }, + { 1, "SelectionWindowDestroy" }, + { 2, "SelectionClientClose" }, + { 0, NULL }, +}; + +static const value_string x11_enum_CursorNotify[] = { + { 0, "DisplayCursor" }, + { 0, NULL }, +}; + +static const value_string x11_enum_DeviceUse[] = { + { 0, "IsXPointer" }, + { 1, "IsXKeyboard" }, + { 2, "IsXExtensionDevice" }, + { 3, "IsXExtensionKeyboard" }, + { 4, "IsXExtensionPointer" }, + { 0, NULL }, +}; + +static const value_string x11_enum_InputClass[] = { + { 0, "Key" }, + { 1, "Button" }, + { 2, "Valuator" }, + { 3, "Feedback" }, + { 4, "Proximity" }, + { 5, "Focus" }, + { 6, "Other" }, + { 0, NULL }, +}; + +static const value_string x11_enum_ValuatorMode[] = { + { 0, "Relative" }, + { 1, "Absolute" }, + { 0, NULL }, +}; + +static const value_string x11_enum_GrabStatus[] = { + { 0, "Success" }, + { 1, "AlreadyGrabbed" }, + { 2, "InvalidTime" }, + { 3, "NotViewable" }, + { 4, "Frozen" }, + { 0, NULL }, +}; + +static const value_string x11_enum_PropagateMode[] = { + { 0, "AddToList" }, + { 1, "DeleteFromList" }, + { 0, NULL }, +}; + +static const value_string x11_enum_Time[] = { + { 0, "CurrentTime" }, + { 0, NULL }, +}; + +static const value_string x11_enum_GrabMode[] = { + { 0, "Sync" }, + { 1, "Async" }, + { 0, NULL }, +}; + +static const value_string x11_enum_Grab[] = { + { 0, "Any" }, + { 0, NULL }, +}; + +static const value_string x11_enum_DeviceInputMode[] = { + { 0, "AsyncThisDevice" }, + { 1, "SyncThisDevice" }, + { 2, "ReplayThisDevice" }, + { 3, "AsyncOtherDevices" }, + { 4, "AsyncAll" }, + { 5, "SyncAll" }, + { 0, NULL }, +}; + +static const value_string x11_enum_InputFocus[] = { + { 0, "None" }, + { 1, "PointerRoot" }, + { 2, "Parent" }, + { 3, "FollowKeyboard" }, + { 0, NULL }, +}; + +static const value_string x11_enum_MappingStatus[] = { + { 0, "Success" }, + { 1, "Busy" }, + { 2, "Failure" }, + { 0, NULL }, +}; + +static const value_string x11_enum_Window[] = { + { 0, "None" }, + { 0, NULL }, +}; + +static const value_string x11_enum_NotifyDetail[] = { + { 0, "Ancestor" }, + { 1, "Virtual" }, + { 2, "Inferior" }, + { 3, "Nonlinear" }, + { 4, "NonlinearVirtual" }, + { 5, "Pointer" }, + { 6, "PointerRoot" }, + { 7, "None" }, + { 0, NULL }, +}; + +static const value_string x11_enum_NotifyMode[] = { + { 0, "Normal" }, + { 1, "Grab" }, + { 2, "Ungrab" }, + { 3, "WhileGrabbed" }, + { 0, NULL }, +}; + +static const value_string x11_enum_ImageFormatInfoType[] = { + { 0, "RGB" }, + { 1, "YUV" }, + { 0, NULL }, +}; + +static const value_string x11_enum_ImageOrder[] = { + { 0, "LSBFirst" }, + { 1, "MSBFirst" }, + { 0, NULL }, +}; + +static const value_string x11_enum_ImageFormatInfoFormat[] = { + { 0, "Packed" }, + { 1, "Planar" }, + { 0, NULL }, +}; + +static const value_string x11_enum_ScanlineOrder[] = { + { 0, "TopToBottom" }, + { 1, "BottomToTop" }, + { 0, NULL }, +}; + +static const value_string x11_enum_VideoNotifyReason[] = { + { 0, "Started" }, + { 1, "Stopped" }, + { 2, "Busy" }, + { 3, "Preempted" }, + { 4, "HardError" }, + { 0, NULL }, +}; + +static const value_string x11_enum_GrabPortStatus[] = { + { 0, "Success" }, + { 1, "BadExtension" }, + { 2, "AlreadyGrabbed" }, + { 3, "InvalidTime" }, + { 4, "BadReply" }, + { 5, "BadAlloc" }, + { 0, NULL }, +}; + diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h index 2cd8459662..5cfdf81ad5 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.5-4-ga507629 */ + using xcbproto version 1.5-5-g4f4d43e */ /* $Id$ */ /* diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h index 05e44ac168..813dbb3d2c 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.5-4-ga507629 */ + using xcbproto version 1.5-5-g4f4d43e */ /* $Id$ */ /* @@ -4820,6 +4820,8 @@ static void dispatch_glx_render(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, length -= (len + 4); } } +#include "x11-enum.h" + static void bigreqEnable(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp _U_, proto_tree *t _U_, int little_endian _U_, int length _U_) { @@ -4994,9 +4996,7 @@ static void struct_PICTFORMINFO(tvbuff_t *tvb, int *offsetp, proto_tree *root, i f_id = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_PICTFORMINFO_id, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_type = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_PICTFORMINFO_type, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_type = field8(tvb, offsetp, t, hf_x11_struct_PICTFORMINFO_type, little_endian); f_depth = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_PICTFORMINFO_depth, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -5412,9 +5412,7 @@ static void compositeRedirectWindow(tvbuff_t *tvb, packet_info *pinfo _U_, int * f_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_composite_RedirectWindow_window, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_update = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_composite_RedirectWindow_update, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_update = field8(tvb, offsetp, t, hf_x11_composite_RedirectWindow_update, little_endian); UNUSED(3); } @@ -5425,9 +5423,7 @@ static void compositeRedirectSubwindows(tvbuff_t *tvb, packet_info *pinfo _U_, i f_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_composite_RedirectSubwindows_window, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_update = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_composite_RedirectSubwindows_update, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_update = field8(tvb, offsetp, t, hf_x11_composite_RedirectSubwindows_update, little_endian); UNUSED(3); } @@ -5438,9 +5434,7 @@ static void compositeUnredirectWindow(tvbuff_t *tvb, packet_info *pinfo _U_, int f_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_composite_UnredirectWindow_window, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_update = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_composite_UnredirectWindow_update, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_update = field8(tvb, offsetp, t, hf_x11_composite_UnredirectWindow_update, little_endian); UNUSED(3); } @@ -5451,9 +5445,7 @@ static void compositeUnredirectSubwindows(tvbuff_t *tvb, packet_info *pinfo _U_, f_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_composite_UnredirectSubwindows_window, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_update = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_composite_UnredirectSubwindows_update, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_update = field8(tvb, offsetp, t, hf_x11_composite_UnredirectSubwindows_update, little_endian); UNUSED(3); } @@ -5635,9 +5627,7 @@ static void damageCreate(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pr f_drawable = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_damage_Create_drawable, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_level = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_damage_Create_level, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_level = field8(tvb, offsetp, t, hf_x11_damage_Create_level, little_endian); UNUSED(3); } @@ -5657,12 +5647,8 @@ static void damageSubtract(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, f_damage = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_damage_Subtract_damage, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_repair = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_damage_Subtract_repair, tvb, *offsetp, 4, little_endian); - *offsetp += 4; - f_parts = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_damage_Subtract_parts, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_repair = field32(tvb, offsetp, t, hf_x11_damage_Subtract_repair, little_endian); + f_parts = field32(tvb, offsetp, t, hf_x11_damage_Subtract_parts, little_endian); } static void damageAdd(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) @@ -5683,9 +5669,7 @@ static void damageNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, int little_ int f_drawable; int f_damage; int f_timestamp; - f_level = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_damage_Notify_level, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_level = field8(tvb, offsetp, t, hf_x11_damage_Notify_level, little_endian); CARD16(event_sequencenumber); f_drawable = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_damage_Notify_drawable, tvb, *offsetp, 4, little_endian); @@ -5875,9 +5859,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, int little_endian, int length _U_) { int f_power_level; - f_power_level = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_dpms_ForceLevel_power_level, tvb, *offsetp, 2, little_endian); - *offsetp += 2; + f_power_level = field16(tvb, offsetp, t, hf_x11_dpms_ForceLevel_power_level, little_endian); } static void dpmsInfo(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp _U_, proto_tree *t _U_, int little_endian _U_, int length _U_) @@ -5901,9 +5883,7 @@ static void dpmsInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot length = f_length * 4 + 32; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_power_level = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_dpms_Info_reply_power_level, tvb, *offsetp, 2, little_endian); - *offsetp += 2; + f_power_level = field16(tvb, offsetp, t, hf_x11_dpms_Info_reply_power_level, little_endian); f_state = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_dpms_Info_reply_state, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -9865,7 +9845,16 @@ static void randrSetScreenConfig(tvbuff_t *tvb, packet_info *pinfo _U_, int *off proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_sizeID, tvb, *offsetp, 2, little_endian); *offsetp += 2; f_rotation = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_rotation, tvb, *offsetp, 2, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_rotation, tvb, *offsetp, 2, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_0, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_90, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_180, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_270, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SetScreenConfig_rotation_mask_Reflect_X, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SetScreenConfig_rotation_mask_Reflect_Y, tvb, *offsetp, 2, little_endian); + } *offsetp += 2; f_rate = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_rate, tvb, *offsetp, 2, little_endian); @@ -9884,9 +9873,7 @@ static void randrSetScreenConfig_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o col_append_fstr(pinfo->cinfo, COL_INFO, "-SetScreenConfig"); REPLY(reply); - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_randr_SetScreenConfig_reply_status, little_endian); 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); @@ -9904,9 +9891,7 @@ static void randrSetScreenConfig_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o f_root = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_reply_root, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_subpixel_order = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_SetScreenConfig_reply_subpixel_order, tvb, *offsetp, 2, little_endian); - *offsetp += 2; + f_subpixel_order = field16(tvb, offsetp, t, hf_x11_randr_SetScreenConfig_reply_subpixel_order, little_endian); UNUSED(10); } @@ -9918,7 +9903,14 @@ static void randrSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp proto_tree_add_item(t, hf_x11_randr_SelectInput_window, tvb, *offsetp, 4, little_endian); *offsetp += 4; f_enable = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_SelectInput_enable, tvb, *offsetp, 2, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_randr_SelectInput_enable, tvb, *offsetp, 2, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SelectInput_enable_mask_ScreenChange, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SelectInput_enable_mask_CrtcChange, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SelectInput_enable_mask_OutputChange, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SelectInput_enable_mask_OutputProperty, tvb, *offsetp, 2, little_endian); + } *offsetp += 2; UNUSED(2); } @@ -9947,7 +9939,16 @@ static void randrGetScreenInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off REPLY(reply); f_rotations = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_rotations, tvb, *offsetp, 1, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_rotations, tvb, *offsetp, 1, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_0, tvb, *offsetp, 1, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_90, tvb, *offsetp, 1, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_180, tvb, *offsetp, 1, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_270, tvb, *offsetp, 1, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotations_mask_Reflect_X, tvb, *offsetp, 1, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotations_mask_Reflect_Y, tvb, *offsetp, 1, little_endian); + } *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, @@ -9973,7 +9974,16 @@ static void randrGetScreenInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_sizeID, tvb, *offsetp, 2, little_endian); *offsetp += 2; f_rotation = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_rotation, tvb, *offsetp, 2, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_rotation, tvb, *offsetp, 2, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_0, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_90, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_180, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_270, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotation_mask_Reflect_X, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetScreenInfo_reply_rotation_mask_Reflect_Y, tvb, *offsetp, 2, little_endian); + } *offsetp += 2; f_rate = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_GetScreenInfo_reply_rate, tvb, *offsetp, 2, little_endian); @@ -10111,7 +10121,24 @@ static void struct_ModeInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, int l proto_tree_add_item(t, hf_x11_struct_ModeInfo_name_len, tvb, *offsetp, 2, little_endian); *offsetp += 2; f_mode_flags = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_ModeInfo_mode_flags, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_struct_ModeInfo_mode_flags, tvb, *offsetp, 4, little_endian); + 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, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_HsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_VsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_VsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_Interlace, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_DoubleScan, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_Csync, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_CsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_CsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_HskewPresent, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_Bcast, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_PixelMultiplex, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_DoubleClock, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_ModeInfo_mode_flags_mask_HalveClock, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; } } @@ -10200,9 +10227,7 @@ static void randrGetOutputInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off col_append_fstr(pinfo->cinfo, COL_INFO, "-GetOutputInfo"); REPLY(reply); - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_status, little_endian); 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); @@ -10223,12 +10248,8 @@ static void randrGetOutputInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off f_mm_height = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_mm_height, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_connection = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_connection, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_subpixel_order = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_subpixel_order, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_connection = field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_connection, little_endian); + f_subpixel_order = field8(tvb, offsetp, t, hf_x11_randr_GetOutputInfo_reply_subpixel_order, little_endian); f_num_crtcs = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_GetOutputInfo_reply_num_crtcs, tvb, *offsetp, 2, little_endian); *offsetp += 2; @@ -10366,9 +10387,7 @@ static void randrChangeOutputProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int f_format = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_ChangeOutputProperty_format, tvb, *offsetp, 1, little_endian); *offsetp += 1; - f_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_ChangeOutputProperty_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_mode = field8(tvb, offsetp, t, hf_x11_randr_ChangeOutputProperty_mode, little_endian); UNUSED(2); f_num_units = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_ChangeOutputProperty_num_units, tvb, *offsetp, 4, little_endian); @@ -10404,9 +10423,7 @@ static void randrGetOutputProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *o f_property = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_property, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_type = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_type, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_type = field32(tvb, offsetp, t, hf_x11_randr_GetOutputProperty_type, little_endian); f_long_offset = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_long_offset, tvb, *offsetp, 4, little_endian); *offsetp += 4; @@ -10443,9 +10460,7 @@ static void randrGetOutputProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int length = f_length * 4 + 32; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_type = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_reply_type, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_type = field32(tvb, offsetp, t, hf_x11_randr_GetOutputProperty_reply_type, little_endian); f_bytes_after = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_GetOutputProperty_reply_bytes_after, tvb, *offsetp, 4, little_endian); *offsetp += 4; @@ -10549,9 +10564,7 @@ static void randrGetCrtcInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse col_append_fstr(pinfo->cinfo, COL_INFO, "-GetCrtcInfo"); REPLY(reply); - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_randr_GetCrtcInfo_reply_status, little_endian); 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); @@ -10579,10 +10592,28 @@ static void randrGetCrtcInfo_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_mode, tvb, *offsetp, 4, little_endian); *offsetp += 4; f_rotation = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_rotation, tvb, *offsetp, 2, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_rotation, tvb, *offsetp, 2, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_0, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_90, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_180, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_270, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Reflect_X, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Reflect_Y, tvb, *offsetp, 2, little_endian); + } *offsetp += 2; f_rotations = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_rotations, tvb, *offsetp, 2, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_rotations, tvb, *offsetp, 2, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_0, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_90, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_180, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_270, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Reflect_X, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Reflect_Y, tvb, *offsetp, 2, little_endian); + } *offsetp += 2; f_num_outputs = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_GetCrtcInfo_reply_num_outputs, tvb, *offsetp, 2, little_endian); @@ -10622,7 +10653,16 @@ static void randrSetCrtcConfig(tvbuff_t *tvb, packet_info *pinfo _U_, int *offse proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_mode, tvb, *offsetp, 4, little_endian); *offsetp += 4; f_rotation = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_rotation, tvb, *offsetp, 2, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_rotation, tvb, *offsetp, 2, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_0, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_90, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_180, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_270, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SetCrtcConfig_rotation_mask_Reflect_X, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_SetCrtcConfig_rotation_mask_Reflect_Y, tvb, *offsetp, 2, little_endian); + } *offsetp += 2; UNUSED(2); listOfCard32(tvb, offsetp, t, hf_x11_randr_SetCrtcConfig_outputs, hf_x11_randr_SetCrtcConfig_outputs_item, (length - 28) / 4, little_endian); @@ -10636,9 +10676,7 @@ static void randrSetCrtcConfig_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off col_append_fstr(pinfo->cinfo, COL_INFO, "-SetCrtcConfig"); REPLY(reply); - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_SetCrtcConfig_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_randr_SetCrtcConfig_reply_status, little_endian); 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); @@ -10887,9 +10925,7 @@ static void randrGetPanning_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset col_append_fstr(pinfo->cinfo, COL_INFO, "-GetPanning"); REPLY(reply); - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_GetPanning_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_randr_GetPanning_reply_status, little_endian); 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); @@ -11007,9 +11043,7 @@ static void randrSetPanning_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offset col_append_fstr(pinfo->cinfo, COL_INFO, "-SetPanning"); REPLY(reply); - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_SetPanning_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_randr_SetPanning_reply_status, little_endian); 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); @@ -11078,7 +11112,16 @@ static void randrScreenChangeNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, int f_mwidth; int f_mheight; f_rotation = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_rotation, tvb, *offsetp, 1, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_rotation, tvb, *offsetp, 1, little_endian); + 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, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_90, tvb, *offsetp, 1, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_180, tvb, *offsetp, 1, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_270, tvb, *offsetp, 1, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_ScreenChangeNotify_rotation_mask_Reflect_X, tvb, *offsetp, 1, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_randr_ScreenChangeNotify_rotation_mask_Reflect_Y, tvb, *offsetp, 1, little_endian); + } *offsetp += 1; CARD16(event_sequencenumber); f_timestamp = VALUE32(tvb, *offsetp); @@ -11096,9 +11139,7 @@ static void randrScreenChangeNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, f_sizeID = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_sizeID, tvb, *offsetp, 2, little_endian); *offsetp += 2; - f_subpixel_order = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_subpixel_order, tvb, *offsetp, 2, little_endian); - *offsetp += 2; + f_subpixel_order = field16(tvb, offsetp, t, hf_x11_randr_ScreenChangeNotify_subpixel_order, little_endian); f_width = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_randr_ScreenChangeNotify_width, tvb, *offsetp, 2, little_endian); *offsetp += 2; @@ -11144,7 +11185,16 @@ static void struct_CrtcChange(tvbuff_t *tvb, int *offsetp, proto_tree *root, int proto_tree_add_item(t, hf_x11_struct_CrtcChange_mode, tvb, *offsetp, 4, little_endian); *offsetp += 4; f_rotation = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_CrtcChange_rotation, tvb, *offsetp, 2, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_struct_CrtcChange_rotation, tvb, *offsetp, 2, little_endian); + 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, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_CrtcChange_rotation_mask_Rotate_90, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_CrtcChange_rotation_mask_Rotate_180, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_CrtcChange_rotation_mask_Rotate_270, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_CrtcChange_rotation_mask_Reflect_X, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_CrtcChange_rotation_mask_Reflect_Y, tvb, *offsetp, 2, little_endian); + } *offsetp += 2; UNUSED(2); f_x = VALUE16(tvb, *offsetp); @@ -11199,14 +11249,19 @@ static void struct_OutputChange(tvbuff_t *tvb, int *offsetp, proto_tree *root, i proto_tree_add_item(t, hf_x11_struct_OutputChange_mode, tvb, *offsetp, 4, little_endian); *offsetp += 4; f_rotation = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_OutputChange_rotation, tvb, *offsetp, 2, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_struct_OutputChange_rotation, tvb, *offsetp, 2, little_endian); + 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, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_OutputChange_rotation_mask_Rotate_90, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_OutputChange_rotation_mask_Rotate_180, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_OutputChange_rotation_mask_Rotate_270, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_OutputChange_rotation_mask_Reflect_X, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_OutputChange_rotation_mask_Reflect_Y, tvb, *offsetp, 2, little_endian); + } *offsetp += 2; - f_connection = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_OutputChange_connection, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_subpixel_order = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_OutputChange_subpixel_order, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_connection = field8(tvb, offsetp, t, hf_x11_struct_OutputChange_connection, little_endian); + f_subpixel_order = field8(tvb, offsetp, t, hf_x11_struct_OutputChange_subpixel_order, little_endian); } } @@ -11236,9 +11291,7 @@ static void struct_OutputProperty(tvbuff_t *tvb, int *offsetp, proto_tree *root, f_timestamp = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_OutputProperty_timestamp, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_OutputProperty_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_struct_OutputProperty_status, little_endian); UNUSED(11); } } @@ -11268,9 +11321,7 @@ static void struct_NotifyData(tvbuff_t *tvb, int *offsetp, proto_tree *root, int static void randrNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, int little_endian) { int f_subCode; - f_subCode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_randr_Notify_subCode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_subCode = field8(tvb, offsetp, t, hf_x11_randr_Notify_subCode, little_endian); CARD16(event_sequencenumber); struct_NotifyData(tvb, offsetp, t, little_endian, 1); } @@ -12004,16 +12055,12 @@ static void renderComposite(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, int f_dst_y; int f_width; int f_height; - f_op = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_render_Composite_op, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_op = field8(tvb, offsetp, t, hf_x11_render_Composite_op, little_endian); UNUSED(3); f_src = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_render_Composite_src, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_mask = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_render_Composite_mask, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_mask = field32(tvb, offsetp, t, hf_x11_render_Composite_mask, little_endian); f_dst = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_render_Composite_dst, tvb, *offsetp, 4, little_endian); *offsetp += 4; @@ -12051,9 +12098,7 @@ static void renderTrapezoids(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp int f_mask_format; int f_src_x; int f_src_y; - f_op = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_render_Trapezoids_op, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_op = field8(tvb, offsetp, t, hf_x11_render_Trapezoids_op, little_endian); UNUSED(3); f_src = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_render_Trapezoids_src, tvb, *offsetp, 4, little_endian); @@ -12081,9 +12126,7 @@ static void renderTriangles(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, int f_mask_format; int f_src_x; int f_src_y; - f_op = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_render_Triangles_op, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_op = field8(tvb, offsetp, t, hf_x11_render_Triangles_op, little_endian); UNUSED(3); f_src = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_render_Triangles_src, tvb, *offsetp, 4, little_endian); @@ -12111,9 +12154,7 @@ static void renderTriStrip(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, int f_mask_format; int f_src_x; int f_src_y; - f_op = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_render_TriStrip_op, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_op = field8(tvb, offsetp, t, hf_x11_render_TriStrip_op, little_endian); UNUSED(3); f_src = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_render_TriStrip_src, tvb, *offsetp, 4, little_endian); @@ -12141,9 +12182,7 @@ static void renderTriFan(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pr int f_mask_format; int f_src_x; int f_src_y; - f_op = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_render_TriFan_op, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_op = field8(tvb, offsetp, t, hf_x11_render_TriFan_op, little_endian); UNUSED(3); f_src = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_render_TriFan_src, tvb, *offsetp, 4, little_endian); @@ -12230,9 +12269,7 @@ static void renderCompositeGlyphs8(tvbuff_t *tvb, packet_info *pinfo _U_, int *o int f_glyphset; int f_src_x; int f_src_y; - f_op = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_render_CompositeGlyphs8_op, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_op = field8(tvb, offsetp, t, hf_x11_render_CompositeGlyphs8_op, little_endian); UNUSED(3); f_src = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_render_CompositeGlyphs8_src, tvb, *offsetp, 4, little_endian); @@ -12264,9 +12301,7 @@ static void renderCompositeGlyphs16(tvbuff_t *tvb, packet_info *pinfo _U_, int * int f_glyphset; int f_src_x; int f_src_y; - f_op = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_render_CompositeGlyphs16_op, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_op = field8(tvb, offsetp, t, hf_x11_render_CompositeGlyphs16_op, little_endian); UNUSED(3); f_src = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_render_CompositeGlyphs16_src, tvb, *offsetp, 4, little_endian); @@ -12298,9 +12333,7 @@ static void renderCompositeGlyphs32(tvbuff_t *tvb, packet_info *pinfo _U_, int * int f_glyphset; int f_src_x; int f_src_y; - f_op = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_render_CompositeGlyphs32_op, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_op = field8(tvb, offsetp, t, hf_x11_render_CompositeGlyphs32_op, little_endian); UNUSED(3); f_src = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_render_CompositeGlyphs32_src, tvb, *offsetp, 4, little_endian); @@ -12327,9 +12360,7 @@ static void renderFillRectangles(tvbuff_t *tvb, packet_info *pinfo _U_, int *off { int f_op; int f_dst; - f_op = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_render_FillRectangles_op, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_op = field8(tvb, offsetp, t, hf_x11_render_FillRectangles_op, little_endian); UNUSED(3); f_dst = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_render_FillRectangles_dst, tvb, *offsetp, 4, little_endian); @@ -13155,9 +13186,7 @@ static void shapeNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, int little_e int f_extents_height; int f_server_time; int f_shaped; - f_shape_kind = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_Notify_shape_kind, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_shape_kind = field8(tvb, offsetp, t, hf_x11_shape_Notify_shape_kind, little_endian); CARD16(event_sequencenumber); f_affected_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_shape_Notify_affected_window, tvb, *offsetp, 4, little_endian); @@ -13220,15 +13249,9 @@ static void shapeRectangles(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, int f_destination_window; int f_x_offset; int f_y_offset; - f_operation = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_Rectangles_operation, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_destination_kind = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_Rectangles_destination_kind, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_ordering = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_Rectangles_ordering, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_operation = field8(tvb, offsetp, t, hf_x11_shape_Rectangles_operation, little_endian); + f_destination_kind = field8(tvb, offsetp, t, hf_x11_shape_Rectangles_destination_kind, little_endian); + f_ordering = field8(tvb, offsetp, t, hf_x11_shape_Rectangles_ordering, little_endian); UNUSED(1); f_destination_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_shape_Rectangles_destination_window, tvb, *offsetp, 4, little_endian); @@ -13250,12 +13273,8 @@ static void shapeMask(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto int f_x_offset; int f_y_offset; int f_source_bitmap; - f_operation = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_Mask_operation, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_destination_kind = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_Mask_destination_kind, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_operation = field8(tvb, offsetp, t, hf_x11_shape_Mask_operation, little_endian); + f_destination_kind = field8(tvb, offsetp, t, hf_x11_shape_Mask_destination_kind, little_endian); UNUSED(2); f_destination_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_shape_Mask_destination_window, tvb, *offsetp, 4, little_endian); @@ -13266,9 +13285,7 @@ static void shapeMask(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto f_y_offset = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_shape_Mask_y_offset, tvb, *offsetp, 2, little_endian); *offsetp += 2; - f_source_bitmap = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_Mask_source_bitmap, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_source_bitmap = field32(tvb, offsetp, t, hf_x11_shape_Mask_source_bitmap, little_endian); } static void shapeCombine(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) @@ -13280,15 +13297,9 @@ static void shapeCombine(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pr int f_x_offset; int f_y_offset; int f_source_window; - f_operation = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_Combine_operation, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_destination_kind = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_Combine_destination_kind, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_source_kind = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_Combine_source_kind, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_operation = field8(tvb, offsetp, t, hf_x11_shape_Combine_operation, little_endian); + f_destination_kind = field8(tvb, offsetp, t, hf_x11_shape_Combine_destination_kind, little_endian); + f_source_kind = field8(tvb, offsetp, t, hf_x11_shape_Combine_source_kind, little_endian); UNUSED(1); f_destination_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_shape_Combine_destination_window, tvb, *offsetp, 4, little_endian); @@ -13310,9 +13321,7 @@ static void shapeOffset(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro int f_destination_window; int f_x_offset; int f_y_offset; - f_destination_kind = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_Offset_destination_kind, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_destination_kind = field8(tvb, offsetp, t, hf_x11_shape_Offset_destination_kind, little_endian); UNUSED(3); f_destination_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_shape_Offset_destination_window, tvb, *offsetp, 4, little_endian); @@ -13439,9 +13448,7 @@ static void shapeGetRectangles(tvbuff_t *tvb, packet_info *pinfo _U_, int *offse f_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_shape_GetRectangles_window, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_source_kind = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_GetRectangles_source_kind, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_source_kind = field8(tvb, offsetp, t, hf_x11_shape_GetRectangles_source_kind, little_endian); UNUSED(3); } static void shapeGetRectangles_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, int little_endian) @@ -13453,9 +13460,7 @@ static void shapeGetRectangles_Reply(tvbuff_t *tvb, packet_info *pinfo, int *off col_append_fstr(pinfo->cinfo, COL_INFO, "-GetRectangles"); REPLY(reply); - f_ordering = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_shape_GetRectangles_reply_ordering, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_ordering = field8(tvb, offsetp, t, hf_x11_shape_GetRectangles_reply_ordering, little_endian); 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); @@ -13927,13 +13932,9 @@ static void struct_TRIGGER(tvbuff_t *tvb, int *offsetp, proto_tree *root, int li f_counter = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_TRIGGER_counter, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_wait_type = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_TRIGGER_wait_type, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_wait_type = field32(tvb, offsetp, t, hf_x11_struct_TRIGGER_wait_type, little_endian); struct_INT64(tvb, offsetp, t, little_endian, 1); - f_test_type = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_TRIGGER_test_type, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_test_type = field32(tvb, offsetp, t, hf_x11_struct_TRIGGER_test_type, little_endian); } } @@ -14136,9 +14137,7 @@ static void syncQueryAlarm_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp f_events = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_sync_QueryAlarm_reply_events, tvb, *offsetp, 1, little_endian); *offsetp += 1; - f_state = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_sync_QueryAlarm_reply_state, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_state = field8(tvb, offsetp, t, hf_x11_sync_QueryAlarm_reply_state, little_endian); UNUSED(2); } @@ -14229,9 +14228,7 @@ static void syncAlarmNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, int litt f_timestamp = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_sync_AlarmNotify_timestamp, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_state = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_sync_AlarmNotify_state, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_state = field8(tvb, offsetp, t, hf_x11_sync_AlarmNotify_state, little_endian); UNUSED(3); } static const value_string sync_extension_minor[] = { @@ -15286,7 +15283,24 @@ static void xf86vidmodeGetModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp += 2; UNUSED(2); f_flags = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_flags, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_GetModeLine_reply_flags, tvb, *offsetp, 4, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_VsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_VsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Interlace, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_DoubleScan, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Csync, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_CsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_CsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HskewPresent, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Bcast, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_PixelMultiplex, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_DoubleClock, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HalveClock, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; UNUSED(12); f_privsize = VALUE32(tvb, *offsetp); @@ -15341,7 +15355,24 @@ static void xf86vidmodeModModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o *offsetp += 2; UNUSED(2); f_flags = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_flags, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_ModModeLine_flags, tvb, *offsetp, 4, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_HsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_HsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_VsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_VsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Interlace, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_DoubleScan, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Csync, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_CsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_CsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_HskewPresent, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Bcast, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_PixelMultiplex, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_DoubleClock, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_HalveClock, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; UNUSED(12); f_privsize = VALUE32(tvb, *offsetp); @@ -15516,7 +15547,24 @@ static void xf86vidmodeAddModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o *offsetp += 2; UNUSED(2); f_flags = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_flags, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_flags, tvb, *offsetp, 4, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_HsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_HsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_VsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_VsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Interlace, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_DoubleScan, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Csync, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_CsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_CsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_HskewPresent, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Bcast, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_PixelMultiplex, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_DoubleClock, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_HalveClock, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; UNUSED(12); f_privsize = VALUE32(tvb, *offsetp); @@ -15554,7 +15602,24 @@ static void xf86vidmodeAddModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o *offsetp += 2; UNUSED(2); f_after_flags = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_flags, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_AddModeLine_after_flags, tvb, *offsetp, 4, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_VsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_VsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Interlace, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_DoubleScan, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Csync, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_CsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_CsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HskewPresent, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Bcast, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_PixelMultiplex, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_DoubleClock, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HalveClock, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; UNUSED(12); listOfByte(tvb, offsetp, t, hf_x11_xf86vidmode_AddModeLine_private, f_privsize, little_endian); @@ -15611,7 +15676,24 @@ static void xf86vidmodeDeleteModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp += 2; UNUSED(2); f_flags = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_flags, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_DeleteModeLine_flags, tvb, *offsetp, 4, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_VsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_VsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Interlace, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_DoubleScan, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Csync, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_CsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_CsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HskewPresent, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Bcast, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_PixelMultiplex, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_DoubleClock, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HalveClock, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; UNUSED(12); f_privsize = VALUE32(tvb, *offsetp); @@ -15671,7 +15753,24 @@ static void xf86vidmodeValidateModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, i *offsetp += 2; UNUSED(2); f_flags = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_flags, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_ValidateModeLine_flags, tvb, *offsetp, 4, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_VsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_VsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Interlace, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_DoubleScan, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Csync, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_CsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_CsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HskewPresent, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Bcast, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_PixelMultiplex, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_DoubleClock, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HalveClock, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; UNUSED(12); f_privsize = VALUE32(tvb, *offsetp); @@ -15753,7 +15852,24 @@ static void xf86vidmodeSwitchToMode(tvbuff_t *tvb, packet_info *pinfo _U_, int * *offsetp += 2; UNUSED(2); f_flags = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_flags, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_SwitchToMode_flags, tvb, *offsetp, 4, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_HsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_HsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_VsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_VsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Interlace, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_DoubleScan, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Csync, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_CsyncPositive, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_CsyncNegative, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_HskewPresent, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Bcast, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_PixelMultiplex, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_DoubleClock, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_HalveClock, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; UNUSED(12); f_privsize = VALUE32(tvb, *offsetp); @@ -15843,7 +15959,11 @@ static void xf86vidmodeGetDotClocks_Reply(tvbuff_t *tvb, packet_info *pinfo, int proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; f_flags = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xf86vidmode_GetDotClocks_reply_flags, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_GetDotClocks_reply_flags, tvb, *offsetp, 4, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetDotClocks_reply_flags_mask_Programable, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; f_clocks = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xf86vidmode_GetDotClocks_reply_clocks, tvb, *offsetp, 4, little_endian); @@ -16040,7 +16160,12 @@ static void xf86vidmodeGetPermissions_Reply(tvbuff_t *tvb, packet_info *pinfo, i proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; f_permissions = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xf86vidmode_GetPermissions_reply_permissions, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xf86vidmode_GetPermissions_reply_permissions, tvb, *offsetp, 4, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetPermissions_reply_permissions_mask_Read, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetPermissions_reply_permissions_mask_Write, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; UNUSED(20); } @@ -16213,15 +16338,9 @@ static void xfixesChangeSaveSet(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs int f_target; int f_map; int f_window; - f_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_ChangeSaveSet_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_target = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_ChangeSaveSet_target, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_map = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_ChangeSaveSet_map, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_mode = field8(tvb, offsetp, t, hf_x11_xfixes_ChangeSaveSet_mode, little_endian); + f_target = field8(tvb, offsetp, t, hf_x11_xfixes_ChangeSaveSet_target, little_endian); + f_map = field8(tvb, offsetp, t, hf_x11_xfixes_ChangeSaveSet_map, little_endian); UNUSED(1); f_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_ChangeSaveSet_window, tvb, *offsetp, 4, little_endian); @@ -16236,9 +16355,7 @@ static void xfixesSelectionNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, in int f_selection; int f_timestamp; int f_selection_timestamp; - f_subtype = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_SelectionNotify_subtype, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_subtype = field8(tvb, offsetp, t, hf_x11_xfixes_SelectionNotify_subtype, little_endian); CARD16(event_sequencenumber); f_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_SelectionNotify_window, tvb, *offsetp, 4, little_endian); @@ -16270,7 +16387,13 @@ static void xfixesSelectSelectionInput(tvbuff_t *tvb, packet_info *pinfo _U_, in proto_tree_add_item(t, hf_x11_xfixes_SelectSelectionInput_selection, tvb, *offsetp, 4, little_endian); *offsetp += 4; f_event_mask = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_SelectSelectionInput_event_mask, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xfixes_SelectSelectionInput_event_mask, tvb, *offsetp, 4, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xfixes_SelectSelectionInput_event_mask_mask_SetSelectionOwner, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xfixes_SelectSelectionInput_event_mask_mask_SelectionWindowDestroy, tvb, *offsetp, 4, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xfixes_SelectSelectionInput_event_mask_mask_SelectionClientClose, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; } @@ -16281,9 +16404,7 @@ static void xfixesCursorNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, int l int f_cursor_serial; int f_timestamp; int f_name; - f_subtype = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_CursorNotify_subtype, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_subtype = field8(tvb, offsetp, t, hf_x11_xfixes_CursorNotify_subtype, little_endian); CARD16(event_sequencenumber); f_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_CursorNotify_window, tvb, *offsetp, 4, little_endian); @@ -16294,9 +16415,7 @@ static void xfixesCursorNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, int l f_timestamp = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_CursorNotify_timestamp, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_name = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_CursorNotify_name, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_name = field32(tvb, offsetp, t, hf_x11_xfixes_CursorNotify_name, little_endian); UNUSED(12); } @@ -16308,7 +16427,11 @@ static void xfixesSelectCursorInput(tvbuff_t *tvb, packet_info *pinfo _U_, int * proto_tree_add_item(t, hf_x11_xfixes_SelectCursorInput_window, tvb, *offsetp, 4, little_endian); *offsetp += 4; f_event_mask = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_SelectCursorInput_event_mask, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xfixes_SelectCursorInput_event_mask, tvb, *offsetp, 4, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xfixes_SelectCursorInput_event_mask_mask_DisplayCursor, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; } @@ -16395,9 +16518,7 @@ static void xfixesCreateRegionFromWindow(tvbuff_t *tvb, packet_info *pinfo _U_, f_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_CreateRegionFromWindow_window, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_kind = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_CreateRegionFromWindow_kind, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_kind = field8(tvb, offsetp, t, hf_x11_xfixes_CreateRegionFromWindow_kind, little_endian); UNUSED(3); } @@ -16580,9 +16701,7 @@ static void xfixesSetGCClipRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *of f_gc = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_SetGCClipRegion_gc, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_region = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_SetGCClipRegion_region, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_region = field32(tvb, offsetp, t, hf_x11_xfixes_SetGCClipRegion_region, little_endian); f_x_origin = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_SetGCClipRegion_x_origin, tvb, *offsetp, 2, little_endian); *offsetp += 2; @@ -16601,9 +16720,7 @@ static void xfixesSetWindowShapeRegion(tvbuff_t *tvb, packet_info *pinfo _U_, in f_dest = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_SetWindowShapeRegion_dest, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_dest_kind = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_SetWindowShapeRegion_dest_kind, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_dest_kind = field8(tvb, offsetp, t, hf_x11_xfixes_SetWindowShapeRegion_dest_kind, little_endian); UNUSED(3); f_x_offset = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_SetWindowShapeRegion_x_offset, tvb, *offsetp, 2, little_endian); @@ -16611,9 +16728,7 @@ static void xfixesSetWindowShapeRegion(tvbuff_t *tvb, packet_info *pinfo _U_, in f_y_offset = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_SetWindowShapeRegion_y_offset, tvb, *offsetp, 2, little_endian); *offsetp += 2; - f_region = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_SetWindowShapeRegion_region, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_region = field32(tvb, offsetp, t, hf_x11_xfixes_SetWindowShapeRegion_region, little_endian); } static void xfixesSetPictureClipRegion(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) @@ -16625,9 +16740,7 @@ static void xfixesSetPictureClipRegion(tvbuff_t *tvb, packet_info *pinfo _U_, in f_picture = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_SetPictureClipRegion_picture, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_region = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_SetPictureClipRegion_region, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_region = field32(tvb, offsetp, t, hf_x11_xfixes_SetPictureClipRegion_region, little_endian); f_x_origin = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_SetPictureClipRegion_x_origin, tvb, *offsetp, 2, little_endian); *offsetp += 2; @@ -16676,9 +16789,7 @@ static void xfixesGetCursorName_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of length = f_length * 4 + 32; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_atom = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_GetCursorName_reply_atom, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_atom = field32(tvb, offsetp, t, hf_x11_xfixes_GetCursorName_reply_atom, little_endian); f_nbytes = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_GetCursorName_reply_nbytes, tvb, *offsetp, 2, little_endian); *offsetp += 2; @@ -16735,9 +16846,7 @@ static void xfixesGetCursorImageAndName_Reply(tvbuff_t *tvb, packet_info *pinfo, f_cursor_serial = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_cursor_serial, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_cursor_atom = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_cursor_atom, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_cursor_atom = field32(tvb, offsetp, t, hf_x11_xfixes_GetCursorImageAndName_reply_cursor_atom, little_endian); f_nbytes = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_nbytes, tvb, *offsetp, 2, little_endian); *offsetp += 2; @@ -17325,9 +17434,7 @@ static void struct_DeviceInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, int f_num_class_info = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_DeviceInfo_num_class_info, tvb, *offsetp, 1, little_endian); *offsetp += 1; - f_device_use = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_DeviceInfo_device_use, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_device_use = field8(tvb, offsetp, t, hf_x11_struct_DeviceInfo_device_use, little_endian); UNUSED(1); } } @@ -17370,9 +17477,7 @@ static void struct_InputClassInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, item = proto_tree_add_item(root, hf_x11_struct_InputClassInfo, tvb, *offsetp, 2, little_endian); t = proto_item_add_subtree(item, ett_x11_rectangle); - f_class_id = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_InputClassInfo_class_id, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_class_id = field8(tvb, offsetp, t, hf_x11_struct_InputClassInfo_class_id, little_endian); f_event_type_base = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_InputClassInfo_event_type_base, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -17427,9 +17532,7 @@ static void xinputSetDeviceMode(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs f_device_id = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_SetDeviceMode_device_id, tvb, *offsetp, 1, little_endian); *offsetp += 1; - f_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_SetDeviceMode_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_mode = field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceMode_mode, little_endian); UNUSED(2); } static void xinputSetDeviceMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, int little_endian) @@ -17449,9 +17552,7 @@ static void xinputSetDeviceMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of length = f_length * 4 + 32; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_SetDeviceMode_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceMode_reply_status, little_endian); UNUSED(23); } @@ -17517,9 +17618,7 @@ static void xinputChangeDeviceDontPropagateList(tvbuff_t *tvb, packet_info *pinf f_num_classes = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceDontPropagateList_num_classes, tvb, *offsetp, 2, little_endian); *offsetp += 2; - f_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceDontPropagateList_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_mode = field8(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceDontPropagateList_mode, little_endian); UNUSED(1); listOfCard32(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceDontPropagateList_classes, hf_x11_xinput_ChangeDeviceDontPropagateList_classes_item, f_num_classes, little_endian); length -= f_num_classes * 4; @@ -17564,9 +17663,7 @@ static void xinputGetDeviceMotionEvents(tvbuff_t *tvb, packet_info *pinfo _U_, i f_start = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_start, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_stop = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_stop, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_stop = field32(tvb, offsetp, t, hf_x11_xinput_GetDeviceMotionEvents_stop, little_endian); f_device_id = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_device_id, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -17596,9 +17693,7 @@ static void xinputGetDeviceMotionEvents_Reply(tvbuff_t *tvb, packet_info *pinfo, f_num_axes = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_reply_num_axes, tvb, *offsetp, 1, little_endian); *offsetp += 1; - f_device_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_reply_device_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceMotionEvents_reply_device_mode, little_endian); UNUSED(18); } @@ -17627,9 +17722,7 @@ static void xinputChangeKeyboardDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, length = f_length * 4 + 32; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_ChangeKeyboardDevice_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_xinput_ChangeKeyboardDevice_reply_status, little_endian); UNUSED(23); } @@ -17666,9 +17759,7 @@ static void xinputChangePointerDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, i length = f_length * 4 + 32; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_ChangePointerDevice_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_xinput_ChangePointerDevice_reply_status, little_endian); UNUSED(23); } @@ -17684,18 +17775,12 @@ static void xinputGrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp f_grab_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GrabDevice_grab_window, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_time = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GrabDevice_time, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_time = field32(tvb, offsetp, t, hf_x11_xinput_GrabDevice_time, little_endian); f_num_classes = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GrabDevice_num_classes, tvb, *offsetp, 2, little_endian); *offsetp += 2; - f_this_device_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GrabDevice_this_device_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_other_device_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GrabDevice_other_device_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_this_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GrabDevice_this_device_mode, little_endian); + f_other_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GrabDevice_other_device_mode, little_endian); f_owner_events = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GrabDevice_owner_events, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -17723,9 +17808,7 @@ static void xinputGrabDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse length = f_length * 4 + 32; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GrabDevice_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_xinput_GrabDevice_reply_status, little_endian); UNUSED(23); } @@ -17733,9 +17816,7 @@ static void xinputUngrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offse { int f_time; int f_device_id; - f_time = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_UngrabDevice_time, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_time = field32(tvb, offsetp, t, hf_x11_xinput_UngrabDevice_time, little_endian); f_device_id = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_UngrabDevice_device_id, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -17759,7 +17840,19 @@ static void xinputGrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_num_classes, tvb, *offsetp, 2, little_endian); *offsetp += 2; f_modifiers = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_modifiers, tvb, *offsetp, 2, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_modifiers, tvb, *offsetp, 2, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceKey_modifiers_mask_Shift, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceKey_modifiers_mask_Lock, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceKey_modifiers_mask_Control, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceKey_modifiers_mask_1, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceKey_modifiers_mask_2, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceKey_modifiers_mask_3, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceKey_modifiers_mask_4, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceKey_modifiers_mask_5, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceKey_modifiers_mask_Any, tvb, *offsetp, 2, little_endian); + } *offsetp += 2; f_modifier_device = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_modifier_device, tvb, *offsetp, 1, little_endian); @@ -17767,15 +17860,9 @@ static void xinputGrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs f_grabbed_device = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_grabbed_device, tvb, *offsetp, 1, little_endian); *offsetp += 1; - f_key = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_key, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_this_device_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_this_device_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_other_device_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_other_device_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_key = field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceKey_key, little_endian); + f_this_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceKey_this_device_mode, little_endian); + f_other_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceKey_other_device_mode, little_endian); f_owner_events = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_owner_events, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -17795,14 +17882,24 @@ static void xinputUngrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *of proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_grabWindow, tvb, *offsetp, 4, little_endian); *offsetp += 4; f_modifiers = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_modifiers, tvb, *offsetp, 2, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_modifiers, tvb, *offsetp, 2, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Shift, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Lock, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Control, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceKey_modifiers_mask_1, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceKey_modifiers_mask_2, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceKey_modifiers_mask_3, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceKey_modifiers_mask_4, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceKey_modifiers_mask_5, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Any, tvb, *offsetp, 2, little_endian); + } *offsetp += 2; f_modifier_device = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_modifier_device, tvb, *offsetp, 1, little_endian); *offsetp += 1; - f_key = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_key, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_key = field8(tvb, offsetp, t, hf_x11_xinput_UngrabDeviceKey_key, little_endian); f_grabbed_device = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_grabbed_device, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -17832,17 +17929,23 @@ static void xinputGrabDeviceButton(tvbuff_t *tvb, packet_info *pinfo _U_, int *o proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_num_classes, tvb, *offsetp, 2, little_endian); *offsetp += 2; f_modifiers = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_modifiers, tvb, *offsetp, 2, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_modifiers, tvb, *offsetp, 2, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceButton_modifiers_mask_Shift, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceButton_modifiers_mask_Lock, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceButton_modifiers_mask_Control, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceButton_modifiers_mask_1, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceButton_modifiers_mask_2, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceButton_modifiers_mask_3, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceButton_modifiers_mask_4, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceButton_modifiers_mask_5, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceButton_modifiers_mask_Any, tvb, *offsetp, 2, little_endian); + } *offsetp += 2; - f_this_device_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_this_device_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_other_device_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_other_device_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_button = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_button, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_this_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceButton_this_device_mode, little_endian); + f_other_device_mode = field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceButton_other_device_mode, little_endian); + f_button = field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceButton_button, little_endian); f_owner_events = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_owner_events, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -17862,14 +17965,24 @@ static void xinputUngrabDeviceButton(tvbuff_t *tvb, packet_info *pinfo _U_, int proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_grab_window, tvb, *offsetp, 4, little_endian); *offsetp += 4; f_modifiers = VALUE16(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_modifiers, tvb, *offsetp, 2, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_modifiers, tvb, *offsetp, 2, little_endian); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Shift, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Lock, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Control, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceButton_modifiers_mask_1, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceButton_modifiers_mask_2, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceButton_modifiers_mask_3, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceButton_modifiers_mask_4, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceButton_modifiers_mask_5, tvb, *offsetp, 2, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Any, tvb, *offsetp, 2, little_endian); + } *offsetp += 2; f_modifier_device = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_modifier_device, tvb, *offsetp, 1, little_endian); *offsetp += 1; - f_button = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_button, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_button = field8(tvb, offsetp, t, hf_x11_xinput_UngrabDeviceButton_button, little_endian); f_grabbed_device = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_grabbed_device, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -17880,12 +17993,8 @@ static void xinputAllowDeviceEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int * int f_time; int f_mode; int f_device_id; - f_time = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_AllowDeviceEvents_time, tvb, *offsetp, 4, little_endian); - *offsetp += 4; - f_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_AllowDeviceEvents_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_time = field32(tvb, offsetp, t, hf_x11_xinput_AllowDeviceEvents_time, little_endian); + f_mode = field8(tvb, offsetp, t, hf_x11_xinput_AllowDeviceEvents_mode, little_endian); f_device_id = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_AllowDeviceEvents_device_id, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -17918,15 +18027,11 @@ static void xinputGetDeviceFocus_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o length = f_length * 4 + 32; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_focus = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GetDeviceFocus_reply_focus, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_focus = field32(tvb, offsetp, t, hf_x11_xinput_GetDeviceFocus_reply_focus, little_endian); f_time = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GetDeviceFocus_reply_time, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_revert_to = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GetDeviceFocus_reply_revert_to, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_revert_to = field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceFocus_reply_revert_to, little_endian); UNUSED(15); } @@ -17936,15 +18041,9 @@ static void xinputSetDeviceFocus(tvbuff_t *tvb, packet_info *pinfo _U_, int *off int f_time; int f_revert_to; int f_device_id; - f_focus = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_SetDeviceFocus_focus, tvb, *offsetp, 4, little_endian); - *offsetp += 4; - f_time = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_SetDeviceFocus_time, tvb, *offsetp, 4, little_endian); - *offsetp += 4; - f_revert_to = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_SetDeviceFocus_revert_to, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_focus = field32(tvb, offsetp, t, hf_x11_xinput_SetDeviceFocus_focus, little_endian); + f_time = field32(tvb, offsetp, t, hf_x11_xinput_SetDeviceFocus_time, little_endian); + f_revert_to = field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceFocus_revert_to, little_endian); f_device_id = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_SetDeviceFocus_device_id, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -18105,9 +18204,7 @@ static void xinputSetDeviceModifierMapping_Reply(tvbuff_t *tvb, packet_info *pin length = f_length * 4 + 32; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_SetDeviceModifierMapping_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceModifierMapping_reply_status, little_endian); UNUSED(23); } @@ -18174,9 +18271,7 @@ static void xinputSetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo length = f_length * 4 + 32; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_SetDeviceButtonMapping_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceButtonMapping_reply_status, little_endian); UNUSED(23); } @@ -18295,9 +18390,7 @@ static void xinputSetDeviceValuators_Reply(tvbuff_t *tvb, packet_info *pinfo, in length = f_length * 4 + 32; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_SetDeviceValuators_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceValuators_reply_status, little_endian); UNUSED(23); } @@ -18330,9 +18423,7 @@ static void xinputGetDeviceControl_Reply(tvbuff_t *tvb, packet_info *pinfo, int length = f_length * 4 + 32; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_status = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_GetDeviceControl_reply_status, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_status = field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceControl_reply_status, little_endian); UNUSED(23); } @@ -18385,9 +18476,7 @@ static void xinputDeviceKeyPress(tvbuff_t *tvb, int *offsetp, proto_tree *t, int f_event = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_event, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_child = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_child, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_child = field32(tvb, offsetp, t, hf_x11_xinput_DeviceKeyPress_child, little_endian); f_root_x = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_root_x, tvb, *offsetp, 2, little_endian); *offsetp += 2; @@ -18418,9 +18507,7 @@ static void xinputFocusIn(tvbuff_t *tvb, int *offsetp, proto_tree *t, int little int f_window; int f_mode; int f_device_id; - f_detail = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_FocusIn_detail, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_detail = field8(tvb, offsetp, t, hf_x11_xinput_FocusIn_detail, little_endian); CARD16(event_sequencenumber); f_time = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_FocusIn_time, tvb, *offsetp, 4, little_endian); @@ -18428,9 +18515,7 @@ static void xinputFocusIn(tvbuff_t *tvb, int *offsetp, proto_tree *t, int little f_window = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_FocusIn_window, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_mode = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xinput_FocusIn_mode, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_mode = field8(tvb, offsetp, t, hf_x11_xinput_FocusIn_mode, little_endian); f_device_id = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_FocusIn_device_id, tvb, *offsetp, 1, little_endian); *offsetp += 1; @@ -20476,7 +20561,15 @@ static void struct_AdaptorInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, in proto_tree_add_item(t, hf_x11_struct_AdaptorInfo_num_formats, tvb, *offsetp, 2, little_endian); *offsetp += 2; f_type = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_AdaptorInfo_type, tvb, *offsetp, 1, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_struct_AdaptorInfo_type, tvb, *offsetp, 1, little_endian); + 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, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_AdaptorInfo_type_mask_OutputMask, tvb, *offsetp, 1, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_AdaptorInfo_type_mask_VideoMask, tvb, *offsetp, 1, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_AdaptorInfo_type_mask_StillMask, tvb, *offsetp, 1, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_AdaptorInfo_type_mask_ImageMask, tvb, *offsetp, 1, little_endian); + } *offsetp += 1; UNUSED(1); listOfByte(tvb, offsetp, t, hf_x11_struct_AdaptorInfo_name, f_name_size, little_endian); @@ -20547,7 +20640,12 @@ static void struct_AttributeInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, item = proto_tree_add_item(root, hf_x11_struct_AttributeInfo, tvb, *offsetp, struct_size_AttributeInfo(tvb, offsetp, little_endian), little_endian); t = proto_item_add_subtree(item, ett_x11_rectangle); f_flags = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_AttributeInfo_flags, tvb, *offsetp, 4, little_endian); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_struct_AttributeInfo_flags, tvb, *offsetp, 4, little_endian); + 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, little_endian); + proto_tree_add_item(bitmask_tree, hf_x11_struct_AttributeInfo_flags_mask_Settable, tvb, *offsetp, 4, little_endian); + } *offsetp += 4; f_min = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_AttributeInfo_min, tvb, *offsetp, 4, little_endian); @@ -20594,12 +20692,8 @@ static void struct_ImageFormatInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root f_id = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_id, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_type = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_type, tvb, *offsetp, 1, little_endian); - *offsetp += 1; - f_byte_order = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_byte_order, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_type = field8(tvb, offsetp, t, hf_x11_struct_ImageFormatInfo_type, little_endian); + f_byte_order = field8(tvb, offsetp, t, hf_x11_struct_ImageFormatInfo_byte_order, little_endian); UNUSED(2); listOfByte(tvb, offsetp, t, hf_x11_struct_ImageFormatInfo_guid, 16, little_endian); f_bpp = VALUE8(tvb, *offsetp); @@ -20622,9 +20716,7 @@ static void struct_ImageFormatInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root f_blue_mask = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_blue_mask, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_format = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_format, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_format = field8(tvb, offsetp, t, hf_x11_struct_ImageFormatInfo_format, little_endian); UNUSED(3); f_y_sample_bits = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_y_sample_bits, tvb, *offsetp, 4, little_endian); @@ -20654,9 +20746,7 @@ static void struct_ImageFormatInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_vvert_v_period, tvb, *offsetp, 4, little_endian); *offsetp += 4; listOfByte(tvb, offsetp, t, hf_x11_struct_ImageFormatInfo_vcomp_order, 32, little_endian); - f_vscanline_order = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_struct_ImageFormatInfo_vscanline_order, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_vscanline_order = field8(tvb, offsetp, t, hf_x11_struct_ImageFormatInfo_vscanline_order, little_endian); UNUSED(11); } } @@ -20667,9 +20757,7 @@ static void xvVideoNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, int little int f_time; int f_drawable; int f_port; - f_reason = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xv_VideoNotify_reason, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_reason = field8(tvb, offsetp, t, hf_x11_xv_VideoNotify_reason, little_endian); CARD16(event_sequencenumber); f_time = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xv_VideoNotify_time, tvb, *offsetp, 4, little_endian); @@ -20802,9 +20890,7 @@ static void xvGrabPort(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, prot f_port = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xv_GrabPort_port, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_time = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xv_GrabPort_time, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_time = field32(tvb, offsetp, t, hf_x11_xv_GrabPort_time, little_endian); } static void xvGrabPort_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, int little_endian) { @@ -20814,9 +20900,7 @@ static void xvGrabPort_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, pr col_append_fstr(pinfo->cinfo, COL_INFO, "-GrabPort"); REPLY(reply); - f_result = VALUE8(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xv_GrabPort_reply_result, tvb, *offsetp, 1, little_endian); - *offsetp += 1; + f_result = field8(tvb, offsetp, t, hf_x11_xv_GrabPort_reply_result, little_endian); 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); @@ -20834,9 +20918,7 @@ static void xvUngrabPort(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pr f_port = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xv_UngrabPort_port, tvb, *offsetp, 4, little_endian); *offsetp += 4; - f_time = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xv_UngrabPort_time, tvb, *offsetp, 4, little_endian); - *offsetp += 4; + f_time = field32(tvb, offsetp, t, hf_x11_xv_UngrabPort_time, little_endian); } static void xvPutVideo(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_) diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h index 57abb205d1..892365b540 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_5_1-3181-gd9dc4cb */ + using mesa version mesa_7_5_1-3829-gbe16aca */ /* $Id$ */ /* diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h index c4c77fd635..505ae99a68 100644 --- a/epan/dissectors/x11-register-info.h +++ b/epan/dissectors/x11-register-info.h @@ -484,7 +484,7 @@ { &hf_x11_glx_render_CallList_list, { "list", "x11.glx.render.CallList.list", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CallLists_n, { "n", "x11.glx.render.CallLists.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CallLists_type, { "type", "x11.glx.render.CallLists.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_CallLists_lists, { "lists", "x11.glx.render.CallLists.lists", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_CallLists_lists, { "lists", "x11.glx.render.CallLists.lists", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ListBase_base, { "base", "x11.glx.render.ListBase.base", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Begin_mode, { "mode", "x11.glx.render.Begin.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_Bitmap_width, { "width", "x11.glx.render.Bitmap.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -493,14 +493,14 @@ { &hf_x11_glx_render_Bitmap_yorig, { "yorig", "x11.glx.render.Bitmap.yorig", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Bitmap_xmove, { "xmove", "x11.glx.render.Bitmap.xmove", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Bitmap_ymove, { "ymove", "x11.glx.render.Bitmap.ymove", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_Bitmap_bitmap, { "bitmap", "x11.glx.render.Bitmap.bitmap", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_Bitmap_bitmap, { "bitmap", "x11.glx.render.Bitmap.bitmap", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Bitmap_swapbytes, { "swap bytes", "x11.glx.render.Bitmap.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Bitmap_lsbfirst, { "lsb first", "x11.glx.render.Bitmap.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Bitmap_rowlength, { "row length", "x11.glx.render.Bitmap.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Bitmap_skiprows, { "skip rows", "x11.glx.render.Bitmap.skiprows", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Bitmap_skippixels, { "skip pixels", "x11.glx.render.Bitmap.skippixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Bitmap_alignment, { "alignment", "x11.glx.render.Bitmap.alignment", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_Color3bv_v, { "v", "x11.glx.render.Color3bv.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_Color3bv_v, { "v", "x11.glx.render.Color3bv.v", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color3dv_v, { "v", "x11.glx.render.Color3dv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color3dv_v_item, { "v", "x11.glx.render.Color3dv.v", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color3fv_v, { "v", "x11.glx.render.Color3fv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -509,12 +509,12 @@ { &hf_x11_glx_render_Color3iv_v_item, { "v", "x11.glx.render.Color3iv.v", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color3sv_v, { "v", "x11.glx.render.Color3sv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color3sv_v_item, { "v", "x11.glx.render.Color3sv.v", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_Color3ubv_v, { "v", "x11.glx.render.Color3ubv.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_Color3ubv_v, { "v", "x11.glx.render.Color3ubv.v", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color3uiv_v, { "v", "x11.glx.render.Color3uiv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color3uiv_v_item, { "v", "x11.glx.render.Color3uiv.v", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color3usv_v, { "v", "x11.glx.render.Color3usv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color3usv_v_item, { "v", "x11.glx.render.Color3usv.v", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_Color4bv_v, { "v", "x11.glx.render.Color4bv.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_Color4bv_v, { "v", "x11.glx.render.Color4bv.v", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color4dv_v, { "v", "x11.glx.render.Color4dv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color4dv_v_item, { "v", "x11.glx.render.Color4dv.v", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color4fv_v, { "v", "x11.glx.render.Color4fv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -523,12 +523,12 @@ { &hf_x11_glx_render_Color4iv_v_item, { "v", "x11.glx.render.Color4iv.v", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color4sv_v, { "v", "x11.glx.render.Color4sv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color4sv_v_item, { "v", "x11.glx.render.Color4sv.v", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_Color4ubv_v, { "v", "x11.glx.render.Color4ubv.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_Color4ubv_v, { "v", "x11.glx.render.Color4ubv.v", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color4uiv_v, { "v", "x11.glx.render.Color4uiv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color4uiv_v_item, { "v", "x11.glx.render.Color4uiv.v", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color4usv_v, { "v", "x11.glx.render.Color4usv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Color4usv_v_item, { "v", "x11.glx.render.Color4usv.v", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_EdgeFlagv_flag, { "flag", "x11.glx.render.EdgeFlagv.flag", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_EdgeFlagv_flag, { "flag", "x11.glx.render.EdgeFlagv.flag", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Indexdv_c, { "c", "x11.glx.render.Indexdv.c", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Indexdv_c_item, { "c", "x11.glx.render.Indexdv.c", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Indexfv_c, { "c", "x11.glx.render.Indexfv.c", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -537,7 +537,7 @@ { &hf_x11_glx_render_Indexiv_c_item, { "c", "x11.glx.render.Indexiv.c", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Indexsv_c, { "c", "x11.glx.render.Indexsv.c", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Indexsv_c_item, { "c", "x11.glx.render.Indexsv.c", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_Normal3bv_v, { "v", "x11.glx.render.Normal3bv.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_Normal3bv_v, { "v", "x11.glx.render.Normal3bv.v", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Normal3dv_v, { "v", "x11.glx.render.Normal3dv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Normal3dv_v_item, { "v", "x11.glx.render.Normal3dv.v", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Normal3fv_v, { "v", "x11.glx.render.Normal3fv.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -705,7 +705,7 @@ { &hf_x11_glx_render_PointSize_size, { "size", "x11.glx.render.PointSize.size", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_PolygonMode_face, { "face", "x11.glx.render.PolygonMode.face", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_PolygonMode_mode, { "mode", "x11.glx.render.PolygonMode.mode", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_PolygonStipple_mask, { "mask", "x11.glx.render.PolygonStipple.mask", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_PolygonStipple_mask, { "mask", "x11.glx.render.PolygonStipple.mask", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_PolygonStipple_swapbytes, { "swap bytes", "x11.glx.render.PolygonStipple.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_PolygonStipple_lsbfirst, { "lsb first", "x11.glx.render.PolygonStipple.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_PolygonStipple_rowlength, { "row length", "x11.glx.render.PolygonStipple.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -738,7 +738,7 @@ { &hf_x11_glx_render_TexImage1D_border, { "border", "x11.glx.render.TexImage1D.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage1D_format, { "format", "x11.glx.render.TexImage1D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage1D_type, { "type", "x11.glx.render.TexImage1D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_TexImage1D_pixels, { "pixels", "x11.glx.render.TexImage1D.pixels", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_TexImage1D_pixels, { "pixels", "x11.glx.render.TexImage1D.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage1D_swapbytes, { "swap bytes", "x11.glx.render.TexImage1D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage1D_lsbfirst, { "lsb first", "x11.glx.render.TexImage1D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage1D_rowlength, { "row length", "x11.glx.render.TexImage1D.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -753,7 +753,7 @@ { &hf_x11_glx_render_TexImage2D_border, { "border", "x11.glx.render.TexImage2D.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage2D_format, { "format", "x11.glx.render.TexImage2D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage2D_type, { "type", "x11.glx.render.TexImage2D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_TexImage2D_pixels, { "pixels", "x11.glx.render.TexImage2D.pixels", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_TexImage2D_pixels, { "pixels", "x11.glx.render.TexImage2D.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage2D_swapbytes, { "swap bytes", "x11.glx.render.TexImage2D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage2D_lsbfirst, { "lsb first", "x11.glx.render.TexImage2D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage2D_rowlength, { "row length", "x11.glx.render.TexImage2D.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -812,11 +812,11 @@ { &hf_x11_glx_render_ClearStencil_s, { "s", "x11.glx.render.ClearStencil.s", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ClearDepth_depth, { "depth", "x11.glx.render.ClearDepth.depth", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_StencilMask_mask, { "mask", "x11.glx.render.StencilMask.mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_ColorMask_red, { "red", "x11.glx.render.ColorMask.red", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_ColorMask_green, { "green", "x11.glx.render.ColorMask.green", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_ColorMask_blue, { "blue", "x11.glx.render.ColorMask.blue", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_ColorMask_alpha, { "alpha", "x11.glx.render.ColorMask.alpha", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_DepthMask_flag, { "flag", "x11.glx.render.DepthMask.flag", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_ColorMask_red, { "red", "x11.glx.render.ColorMask.red", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_ColorMask_green, { "green", "x11.glx.render.ColorMask.green", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_ColorMask_blue, { "blue", "x11.glx.render.ColorMask.blue", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_ColorMask_alpha, { "alpha", "x11.glx.render.ColorMask.alpha", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_DepthMask_flag, { "flag", "x11.glx.render.DepthMask.flag", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_IndexMask_mask, { "mask", "x11.glx.render.IndexMask.mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Accum_op, { "op", "x11.glx.render.Accum.op", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_Accum_value, { "value", "x11.glx.render.Accum.value", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -936,7 +936,7 @@ { &hf_x11_glx_render_DrawPixels_height, { "height", "x11.glx.render.DrawPixels.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_DrawPixels_format, { "format", "x11.glx.render.DrawPixels.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_DrawPixels_type, { "type", "x11.glx.render.DrawPixels.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_DrawPixels_pixels, { "pixels", "x11.glx.render.DrawPixels.pixels", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_DrawPixels_pixels, { "pixels", "x11.glx.render.DrawPixels.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_DrawPixels_swapbytes, { "swap bytes", "x11.glx.render.DrawPixels.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_DrawPixels_lsbfirst, { "lsb first", "x11.glx.render.DrawPixels.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_DrawPixels_rowlength, { "row length", "x11.glx.render.DrawPixels.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1031,7 +1031,7 @@ { &hf_x11_glx_render_TexSubImage1D_format, { "format", "x11.glx.render.TexSubImage1D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage1D_type, { "type", "x11.glx.render.TexSubImage1D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage1D_UNUSED, { "UNUSED", "x11.glx.render.TexSubImage1D.UNUSED", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_TexSubImage1D_pixels, { "pixels", "x11.glx.render.TexSubImage1D.pixels", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_TexSubImage1D_pixels, { "pixels", "x11.glx.render.TexSubImage1D.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage1D_swapbytes, { "swap bytes", "x11.glx.render.TexSubImage1D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage1D_lsbfirst, { "lsb first", "x11.glx.render.TexSubImage1D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage1D_rowlength, { "row length", "x11.glx.render.TexSubImage1D.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1047,7 +1047,7 @@ { &hf_x11_glx_render_TexSubImage2D_format, { "format", "x11.glx.render.TexSubImage2D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage2D_type, { "type", "x11.glx.render.TexSubImage2D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage2D_UNUSED, { "UNUSED", "x11.glx.render.TexSubImage2D.UNUSED", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_TexSubImage2D_pixels, { "pixels", "x11.glx.render.TexSubImage2D.pixels", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_TexSubImage2D_pixels, { "pixels", "x11.glx.render.TexSubImage2D.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage2D_swapbytes, { "swap bytes", "x11.glx.render.TexSubImage2D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage2D_lsbfirst, { "lsb first", "x11.glx.render.TexSubImage2D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage2D_rowlength, { "row length", "x11.glx.render.TexSubImage2D.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1061,7 +1061,7 @@ { &hf_x11_glx_render_PrioritizeTextures_textures_item, { "textures", "x11.glx.render.PrioritizeTextures.textures", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_PrioritizeTextures_priorities, { "priorities", "x11.glx.render.PrioritizeTextures.priorities", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_PrioritizeTextures_priorities_item, { "priorities", "x11.glx.render.PrioritizeTextures.priorities", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_Indexubv_c, { "c", "x11.glx.render.Indexubv.c", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_Indexubv_c, { "c", "x11.glx.render.Indexubv.c", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_BlendColor_red, { "red", "x11.glx.render.BlendColor.red", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_BlendColor_green, { "green", "x11.glx.render.BlendColor.green", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_BlendColor_blue, { "blue", "x11.glx.render.BlendColor.blue", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1072,7 +1072,7 @@ { &hf_x11_glx_render_ColorTable_width, { "width", "x11.glx.render.ColorTable.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ColorTable_format, { "format", "x11.glx.render.ColorTable.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_ColorTable_type, { "type", "x11.glx.render.ColorTable.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_ColorTable_table, { "table", "x11.glx.render.ColorTable.table", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_ColorTable_table, { "table", "x11.glx.render.ColorTable.table", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ColorTable_swapbytes, { "swap bytes", "x11.glx.render.ColorTable.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ColorTable_lsbfirst, { "lsb first", "x11.glx.render.ColorTable.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ColorTable_rowlength, { "row length", "x11.glx.render.ColorTable.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1097,7 +1097,7 @@ { &hf_x11_glx_render_ColorSubTable_count, { "count", "x11.glx.render.ColorSubTable.count", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ColorSubTable_format, { "format", "x11.glx.render.ColorSubTable.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_ColorSubTable_type, { "type", "x11.glx.render.ColorSubTable.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_ColorSubTable_data, { "data", "x11.glx.render.ColorSubTable.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_ColorSubTable_data, { "data", "x11.glx.render.ColorSubTable.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ColorSubTable_swapbytes, { "swap bytes", "x11.glx.render.ColorSubTable.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ColorSubTable_lsbfirst, { "lsb first", "x11.glx.render.ColorSubTable.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ColorSubTable_rowlength, { "row length", "x11.glx.render.ColorSubTable.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1114,7 +1114,7 @@ { &hf_x11_glx_render_ConvolutionFilter1D_width, { "width", "x11.glx.render.ConvolutionFilter1D.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ConvolutionFilter1D_format, { "format", "x11.glx.render.ConvolutionFilter1D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_ConvolutionFilter1D_type, { "type", "x11.glx.render.ConvolutionFilter1D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_ConvolutionFilter1D_image, { "image", "x11.glx.render.ConvolutionFilter1D.image", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_ConvolutionFilter1D_image, { "image", "x11.glx.render.ConvolutionFilter1D.image", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ConvolutionFilter1D_swapbytes, { "swap bytes", "x11.glx.render.ConvolutionFilter1D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ConvolutionFilter1D_lsbfirst, { "lsb first", "x11.glx.render.ConvolutionFilter1D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ConvolutionFilter1D_rowlength, { "row length", "x11.glx.render.ConvolutionFilter1D.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1127,7 +1127,7 @@ { &hf_x11_glx_render_ConvolutionFilter2D_height, { "height", "x11.glx.render.ConvolutionFilter2D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ConvolutionFilter2D_format, { "format", "x11.glx.render.ConvolutionFilter2D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_ConvolutionFilter2D_type, { "type", "x11.glx.render.ConvolutionFilter2D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_ConvolutionFilter2D_image, { "image", "x11.glx.render.ConvolutionFilter2D.image", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_ConvolutionFilter2D_image, { "image", "x11.glx.render.ConvolutionFilter2D.image", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ConvolutionFilter2D_swapbytes, { "swap bytes", "x11.glx.render.ConvolutionFilter2D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ConvolutionFilter2D_lsbfirst, { "lsb first", "x11.glx.render.ConvolutionFilter2D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ConvolutionFilter2D_rowlength, { "row length", "x11.glx.render.ConvolutionFilter2D.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1165,15 +1165,15 @@ { &hf_x11_glx_render_SeparableFilter2D_height, { "height", "x11.glx.render.SeparableFilter2D.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SeparableFilter2D_format, { "format", "x11.glx.render.SeparableFilter2D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_SeparableFilter2D_type, { "type", "x11.glx.render.SeparableFilter2D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_SeparableFilter2D_row, { "row", "x11.glx.render.SeparableFilter2D.row", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_SeparableFilter2D_column, { "column", "x11.glx.render.SeparableFilter2D.column", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_SeparableFilter2D_row, { "row", "x11.glx.render.SeparableFilter2D.row", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_SeparableFilter2D_column, { "column", "x11.glx.render.SeparableFilter2D.column", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Histogram_target, { "target", "x11.glx.render.Histogram.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_Histogram_width, { "width", "x11.glx.render.Histogram.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Histogram_internalformat, { "internalformat", "x11.glx.render.Histogram.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_Histogram_sink, { "sink", "x11.glx.render.Histogram.sink", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_Histogram_sink, { "sink", "x11.glx.render.Histogram.sink", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_Minmax_target, { "target", "x11.glx.render.Minmax.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_Minmax_internalformat, { "internalformat", "x11.glx.render.Minmax.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_Minmax_sink, { "sink", "x11.glx.render.Minmax.sink", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_Minmax_sink, { "sink", "x11.glx.render.Minmax.sink", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ResetHistogram_target, { "target", "x11.glx.render.ResetHistogram.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_ResetMinmax_target, { "target", "x11.glx.render.ResetMinmax.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage3D_target, { "target", "x11.glx.render.TexImage3D.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, @@ -1185,7 +1185,7 @@ { &hf_x11_glx_render_TexImage3D_border, { "border", "x11.glx.render.TexImage3D.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage3D_format, { "format", "x11.glx.render.TexImage3D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage3D_type, { "type", "x11.glx.render.TexImage3D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_TexImage3D_pixels, { "pixels", "x11.glx.render.TexImage3D.pixels", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_TexImage3D_pixels, { "pixels", "x11.glx.render.TexImage3D.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage3D_swapbytes, { "swap bytes", "x11.glx.render.TexImage3D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage3D_lsbfirst, { "lsb first", "x11.glx.render.TexImage3D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage3D_rowlength, { "row length", "x11.glx.render.TexImage3D.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1203,7 +1203,7 @@ { &hf_x11_glx_render_TexSubImage3D_format, { "format", "x11.glx.render.TexSubImage3D.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage3D_type, { "type", "x11.glx.render.TexSubImage3D.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage3D_UNUSED, { "UNUSED", "x11.glx.render.TexSubImage3D.UNUSED", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_TexSubImage3D_pixels, { "pixels", "x11.glx.render.TexSubImage3D.pixels", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_TexSubImage3D_pixels, { "pixels", "x11.glx.render.TexSubImage3D.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage3D_swapbytes, { "swap bytes", "x11.glx.render.TexSubImage3D.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage3D_lsbfirst, { "lsb first", "x11.glx.render.TexSubImage3D.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage3D_rowlength, { "row length", "x11.glx.render.TexSubImage3D.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1269,7 +1269,7 @@ { &hf_x11_glx_render_MultiTexCoord4svARB_v, { "v", "x11.glx.render.MultiTexCoord4svARB.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_MultiTexCoord4svARB_v_item, { "v", "x11.glx.render.MultiTexCoord4svARB.v", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SampleCoverageARB_value, { "value", "x11.glx.render.SampleCoverageARB.value", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_SampleCoverageARB_invert, { "invert", "x11.glx.render.SampleCoverageARB.invert", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_SampleCoverageARB_invert, { "invert", "x11.glx.render.SampleCoverageARB.invert", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage3DARB_target, { "target", "x11.glx.render.CompressedTexImage3DARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage3DARB_level, { "level", "x11.glx.render.CompressedTexImage3DARB.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage3DARB_internalformat, { "internalformat", "x11.glx.render.CompressedTexImage3DARB.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, @@ -1278,7 +1278,7 @@ { &hf_x11_glx_render_CompressedTexImage3DARB_depth, { "depth", "x11.glx.render.CompressedTexImage3DARB.depth", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage3DARB_border, { "border", "x11.glx.render.CompressedTexImage3DARB.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage3DARB_imageSize, { "imageSize", "x11.glx.render.CompressedTexImage3DARB.imageSize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_CompressedTexImage3DARB_data, { "data", "x11.glx.render.CompressedTexImage3DARB.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_CompressedTexImage3DARB_data, { "data", "x11.glx.render.CompressedTexImage3DARB.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage2DARB_target, { "target", "x11.glx.render.CompressedTexImage2DARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage2DARB_level, { "level", "x11.glx.render.CompressedTexImage2DARB.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage2DARB_internalformat, { "internalformat", "x11.glx.render.CompressedTexImage2DARB.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, @@ -1286,14 +1286,14 @@ { &hf_x11_glx_render_CompressedTexImage2DARB_height, { "height", "x11.glx.render.CompressedTexImage2DARB.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage2DARB_border, { "border", "x11.glx.render.CompressedTexImage2DARB.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage2DARB_imageSize, { "imageSize", "x11.glx.render.CompressedTexImage2DARB.imageSize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_CompressedTexImage2DARB_data, { "data", "x11.glx.render.CompressedTexImage2DARB.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_CompressedTexImage2DARB_data, { "data", "x11.glx.render.CompressedTexImage2DARB.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage1DARB_target, { "target", "x11.glx.render.CompressedTexImage1DARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage1DARB_level, { "level", "x11.glx.render.CompressedTexImage1DARB.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage1DARB_internalformat, { "internalformat", "x11.glx.render.CompressedTexImage1DARB.internalformat", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage1DARB_width, { "width", "x11.glx.render.CompressedTexImage1DARB.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage1DARB_border, { "border", "x11.glx.render.CompressedTexImage1DARB.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexImage1DARB_imageSize, { "imageSize", "x11.glx.render.CompressedTexImage1DARB.imageSize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_CompressedTexImage1DARB_data, { "data", "x11.glx.render.CompressedTexImage1DARB.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_CompressedTexImage1DARB_data, { "data", "x11.glx.render.CompressedTexImage1DARB.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage3DARB_target, { "target", "x11.glx.render.CompressedTexSubImage3DARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage3DARB_level, { "level", "x11.glx.render.CompressedTexSubImage3DARB.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage3DARB_xoffset, { "xoffset", "x11.glx.render.CompressedTexSubImage3DARB.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -1304,7 +1304,7 @@ { &hf_x11_glx_render_CompressedTexSubImage3DARB_depth, { "depth", "x11.glx.render.CompressedTexSubImage3DARB.depth", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage3DARB_format, { "format", "x11.glx.render.CompressedTexSubImage3DARB.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage3DARB_imageSize, { "imageSize", "x11.glx.render.CompressedTexSubImage3DARB.imageSize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_CompressedTexSubImage3DARB_data, { "data", "x11.glx.render.CompressedTexSubImage3DARB.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_CompressedTexSubImage3DARB_data, { "data", "x11.glx.render.CompressedTexSubImage3DARB.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage2DARB_target, { "target", "x11.glx.render.CompressedTexSubImage2DARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage2DARB_level, { "level", "x11.glx.render.CompressedTexSubImage2DARB.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage2DARB_xoffset, { "xoffset", "x11.glx.render.CompressedTexSubImage2DARB.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -1313,17 +1313,17 @@ { &hf_x11_glx_render_CompressedTexSubImage2DARB_height, { "height", "x11.glx.render.CompressedTexSubImage2DARB.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage2DARB_format, { "format", "x11.glx.render.CompressedTexSubImage2DARB.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage2DARB_imageSize, { "imageSize", "x11.glx.render.CompressedTexSubImage2DARB.imageSize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_CompressedTexSubImage2DARB_data, { "data", "x11.glx.render.CompressedTexSubImage2DARB.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_CompressedTexSubImage2DARB_data, { "data", "x11.glx.render.CompressedTexSubImage2DARB.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage1DARB_target, { "target", "x11.glx.render.CompressedTexSubImage1DARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage1DARB_level, { "level", "x11.glx.render.CompressedTexSubImage1DARB.level", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage1DARB_xoffset, { "xoffset", "x11.glx.render.CompressedTexSubImage1DARB.xoffset", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage1DARB_width, { "width", "x11.glx.render.CompressedTexSubImage1DARB.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage1DARB_format, { "format", "x11.glx.render.CompressedTexSubImage1DARB.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_CompressedTexSubImage1DARB_imageSize, { "imageSize", "x11.glx.render.CompressedTexSubImage1DARB.imageSize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_CompressedTexSubImage1DARB_data, { "data", "x11.glx.render.CompressedTexSubImage1DARB.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_CompressedTexSubImage1DARB_data, { "data", "x11.glx.render.CompressedTexSubImage1DARB.data", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_CurrentPaletteMatrixARB_index, { "index", "x11.glx.render.CurrentPaletteMatrixARB.index", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_MatrixIndexubvARB_size, { "size", "x11.glx.render.MatrixIndexubvARB.size", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_MatrixIndexubvARB_indices, { "indices", "x11.glx.render.MatrixIndexubvARB.indices", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_MatrixIndexubvARB_indices, { "indices", "x11.glx.render.MatrixIndexubvARB.indices", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_MatrixIndexusvARB_size, { "size", "x11.glx.render.MatrixIndexusvARB.size", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_MatrixIndexusvARB_indices, { "indices", "x11.glx.render.MatrixIndexusvARB.indices", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_MatrixIndexusvARB_indices_item, { "indices", "x11.glx.render.MatrixIndexusvARB.indices", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1367,14 +1367,14 @@ { &hf_x11_glx_render_VertexAttrib4svARB_v, { "v", "x11.glx.render.VertexAttrib4svARB.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4svARB_v_item, { "v", "x11.glx.render.VertexAttrib4svARB.v", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4NubvARB_index, { "index", "x11.glx.render.VertexAttrib4NubvARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_VertexAttrib4NubvARB_v, { "v", "x11.glx.render.VertexAttrib4NubvARB.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_VertexAttrib4NubvARB_v, { "v", "x11.glx.render.VertexAttrib4NubvARB.v", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4bvARB_index, { "index", "x11.glx.render.VertexAttrib4bvARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_VertexAttrib4bvARB_v, { "v", "x11.glx.render.VertexAttrib4bvARB.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_VertexAttrib4bvARB_v, { "v", "x11.glx.render.VertexAttrib4bvARB.v", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4ivARB_index, { "index", "x11.glx.render.VertexAttrib4ivARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4ivARB_v, { "v", "x11.glx.render.VertexAttrib4ivARB.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4ivARB_v_item, { "v", "x11.glx.render.VertexAttrib4ivARB.v", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4ubvARB_index, { "index", "x11.glx.render.VertexAttrib4ubvARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_VertexAttrib4ubvARB_v, { "v", "x11.glx.render.VertexAttrib4ubvARB.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_VertexAttrib4ubvARB_v, { "v", "x11.glx.render.VertexAttrib4ubvARB.v", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4usvARB_index, { "index", "x11.glx.render.VertexAttrib4usvARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4usvARB_v, { "v", "x11.glx.render.VertexAttrib4usvARB.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4usvARB_v_item, { "v", "x11.glx.render.VertexAttrib4usvARB.v", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1382,7 +1382,7 @@ { &hf_x11_glx_render_VertexAttrib4uivARB_v, { "v", "x11.glx.render.VertexAttrib4uivARB.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4uivARB_v_item, { "v", "x11.glx.render.VertexAttrib4uivARB.v", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4NbvARB_index, { "index", "x11.glx.render.VertexAttrib4NbvARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_VertexAttrib4NbvARB_v, { "v", "x11.glx.render.VertexAttrib4NbvARB.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_VertexAttrib4NbvARB_v, { "v", "x11.glx.render.VertexAttrib4NbvARB.v", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4NsvARB_index, { "index", "x11.glx.render.VertexAttrib4NsvARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4NsvARB_v, { "v", "x11.glx.render.VertexAttrib4NsvARB.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4NsvARB_v_item, { "v", "x11.glx.render.VertexAttrib4NsvARB.v", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -1398,7 +1398,7 @@ { &hf_x11_glx_render_ProgramStringARB_target, { "target", "x11.glx.render.ProgramStringARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramStringARB_format, { "format", "x11.glx.render.ProgramStringARB.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramStringARB_len, { "len", "x11.glx.render.ProgramStringARB.len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_ProgramStringARB_string, { "string", "x11.glx.render.ProgramStringARB.string", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_ProgramStringARB_string, { "string", "x11.glx.render.ProgramStringARB.string", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramEnvParameter4dvARB_target, { "target", "x11.glx.render.ProgramEnvParameter4dvARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramEnvParameter4dvARB_index, { "index", "x11.glx.render.ProgramEnvParameter4dvARB.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramEnvParameter4dvARB_params, { "params", "x11.glx.render.ProgramEnvParameter4dvARB.params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1438,7 +1438,7 @@ { &hf_x11_glx_render_TexImage4DSGIS_border, { "border", "x11.glx.render.TexImage4DSGIS.border", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage4DSGIS_format, { "format", "x11.glx.render.TexImage4DSGIS.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage4DSGIS_type, { "type", "x11.glx.render.TexImage4DSGIS.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_TexImage4DSGIS_pixels, { "pixels", "x11.glx.render.TexImage4DSGIS.pixels", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_TexImage4DSGIS_pixels, { "pixels", "x11.glx.render.TexImage4DSGIS.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage4DSGIS_swapbytes, { "swap bytes", "x11.glx.render.TexImage4DSGIS.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage4DSGIS_lsbfirst, { "lsb first", "x11.glx.render.TexImage4DSGIS.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexImage4DSGIS_rowlength, { "row length", "x11.glx.render.TexImage4DSGIS.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1458,7 +1458,7 @@ { &hf_x11_glx_render_TexSubImage4DSGIS_format, { "format", "x11.glx.render.TexSubImage4DSGIS.format", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage4DSGIS_type, { "type", "x11.glx.render.TexSubImage4DSGIS.type", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage4DSGIS_UNUSED, { "UNUSED", "x11.glx.render.TexSubImage4DSGIS.UNUSED", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_TexSubImage4DSGIS_pixels, { "pixels", "x11.glx.render.TexSubImage4DSGIS.pixels", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_TexSubImage4DSGIS_pixels, { "pixels", "x11.glx.render.TexSubImage4DSGIS.pixels", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage4DSGIS_swapbytes, { "swap bytes", "x11.glx.render.TexSubImage4DSGIS.swapbytes", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage4DSGIS_lsbfirst, { "lsb first", "x11.glx.render.TexSubImage4DSGIS.lsbfirst", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_TexSubImage4DSGIS_rowlength, { "row length", "x11.glx.render.TexSubImage4DSGIS.rowlength", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1474,7 +1474,7 @@ { &hf_x11_glx_render_SharpenTexFuncSGIS_points, { "points", "x11.glx.render.SharpenTexFuncSGIS.points", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SharpenTexFuncSGIS_points_item, { "points", "x11.glx.render.SharpenTexFuncSGIS.points", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SampleMaskSGIS_value, { "value", "x11.glx.render.SampleMaskSGIS.value", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_SampleMaskSGIS_invert, { "invert", "x11.glx.render.SampleMaskSGIS.invert", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_SampleMaskSGIS_invert, { "invert", "x11.glx.render.SampleMaskSGIS.invert", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SamplePatternSGIS_pattern, { "pattern", "x11.glx.render.SamplePatternSGIS.pattern", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_PointParameterfEXT_pname, { "pname", "x11.glx.render.PointParameterfEXT.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_PointParameterfEXT_param, { "param", "x11.glx.render.PointParameterfEXT.param", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1487,7 +1487,7 @@ { &hf_x11_glx_render_FogFuncSGIS_n, { "n", "x11.glx.render.FogFuncSGIS.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_FogFuncSGIS_points, { "points", "x11.glx.render.FogFuncSGIS.points", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_FogFuncSGIS_points_item, { "points", "x11.glx.render.FogFuncSGIS.points", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_SecondaryColor3bvEXT_v, { "v", "x11.glx.render.SecondaryColor3bvEXT.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_SecondaryColor3bvEXT_v, { "v", "x11.glx.render.SecondaryColor3bvEXT.v", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SecondaryColor3dvEXT_v, { "v", "x11.glx.render.SecondaryColor3dvEXT.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SecondaryColor3dvEXT_v_item, { "v", "x11.glx.render.SecondaryColor3dvEXT.v", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SecondaryColor3fvEXT_v, { "v", "x11.glx.render.SecondaryColor3fvEXT.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1496,7 +1496,7 @@ { &hf_x11_glx_render_SecondaryColor3ivEXT_v_item, { "v", "x11.glx.render.SecondaryColor3ivEXT.v", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SecondaryColor3svEXT_v, { "v", "x11.glx.render.SecondaryColor3svEXT.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SecondaryColor3svEXT_v_item, { "v", "x11.glx.render.SecondaryColor3svEXT.v", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_SecondaryColor3ubvEXT_v, { "v", "x11.glx.render.SecondaryColor3ubvEXT.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_SecondaryColor3ubvEXT_v, { "v", "x11.glx.render.SecondaryColor3ubvEXT.v", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SecondaryColor3uivEXT_v, { "v", "x11.glx.render.SecondaryColor3uivEXT.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SecondaryColor3uivEXT_v_item, { "v", "x11.glx.render.SecondaryColor3uivEXT.v", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_SecondaryColor3usvEXT_v, { "v", "x11.glx.render.SecondaryColor3usvEXT.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1535,19 +1535,19 @@ { &hf_x11_glx_render_CombinerOutputNV_sumOutput, { "sumOutput", "x11.glx.render.CombinerOutputNV.sumOutput", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_CombinerOutputNV_scale, { "scale", "x11.glx.render.CombinerOutputNV.scale", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_CombinerOutputNV_bias, { "bias", "x11.glx.render.CombinerOutputNV.bias", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, -{ &hf_x11_glx_render_CombinerOutputNV_abDotProduct, { "abDotProduct", "x11.glx.render.CombinerOutputNV.abDotProduct", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_CombinerOutputNV_cdDotProduct, { "cdDotProduct", "x11.glx.render.CombinerOutputNV.cdDotProduct", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_CombinerOutputNV_muxSum, { "muxSum", "x11.glx.render.CombinerOutputNV.muxSum", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_CombinerOutputNV_abDotProduct, { "abDotProduct", "x11.glx.render.CombinerOutputNV.abDotProduct", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_CombinerOutputNV_cdDotProduct, { "cdDotProduct", "x11.glx.render.CombinerOutputNV.cdDotProduct", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_CombinerOutputNV_muxSum, { "muxSum", "x11.glx.render.CombinerOutputNV.muxSum", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_FinalCombinerInputNV_variable, { "variable", "x11.glx.render.FinalCombinerInputNV.variable", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_FinalCombinerInputNV_input, { "input", "x11.glx.render.FinalCombinerInputNV.input", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_FinalCombinerInputNV_mapping, { "mapping", "x11.glx.render.FinalCombinerInputNV.mapping", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_FinalCombinerInputNV_componentUsage, { "componentUsage", "x11.glx.render.FinalCombinerInputNV.componentUsage", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_WindowPos3fvMESA_v, { "v", "x11.glx.render.WindowPos3fvMESA.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_WindowPos3fvMESA_v_item, { "v", "x11.glx.render.WindowPos3fvMESA.v", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_TextureColorMaskSGIS_red, { "red", "x11.glx.render.TextureColorMaskSGIS.red", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_TextureColorMaskSGIS_green, { "green", "x11.glx.render.TextureColorMaskSGIS.green", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_TextureColorMaskSGIS_blue, { "blue", "x11.glx.render.TextureColorMaskSGIS.blue", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_TextureColorMaskSGIS_alpha, { "alpha", "x11.glx.render.TextureColorMaskSGIS.alpha", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_TextureColorMaskSGIS_red, { "red", "x11.glx.render.TextureColorMaskSGIS.red", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_TextureColorMaskSGIS_green, { "green", "x11.glx.render.TextureColorMaskSGIS.green", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_TextureColorMaskSGIS_blue, { "blue", "x11.glx.render.TextureColorMaskSGIS.blue", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_TextureColorMaskSGIS_alpha, { "alpha", "x11.glx.render.TextureColorMaskSGIS.alpha", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_BindProgramNV_target, { "target", "x11.glx.render.BindProgramNV.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_BindProgramNV_program, { "program", "x11.glx.render.BindProgramNV.program", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ExecuteProgramNV_target, { "target", "x11.glx.render.ExecuteProgramNV.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, @@ -1557,7 +1557,7 @@ { &hf_x11_glx_render_LoadProgramNV_target, { "target", "x11.glx.render.LoadProgramNV.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_LoadProgramNV_id, { "id", "x11.glx.render.LoadProgramNV.id", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_LoadProgramNV_len, { "len", "x11.glx.render.LoadProgramNV.len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_LoadProgramNV_program, { "program", "x11.glx.render.LoadProgramNV.program", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_LoadProgramNV_program, { "program", "x11.glx.render.LoadProgramNV.program", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramParameters4dvNV_target, { "target", "x11.glx.render.ProgramParameters4dvNV.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramParameters4dvNV_index, { "index", "x11.glx.render.ProgramParameters4dvNV.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramParameters4dvNV_num, { "num", "x11.glx.render.ProgramParameters4dvNV.num", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1612,7 +1612,7 @@ { &hf_x11_glx_render_VertexAttrib4dvNV_v, { "v", "x11.glx.render.VertexAttrib4dvNV.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4dvNV_v_item, { "v", "x11.glx.render.VertexAttrib4dvNV.v", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttrib4ubvNV_index, { "index", "x11.glx.render.VertexAttrib4ubvNV.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_VertexAttrib4ubvNV_v, { "v", "x11.glx.render.VertexAttrib4ubvNV.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_VertexAttrib4ubvNV_v, { "v", "x11.glx.render.VertexAttrib4ubvNV.v", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttribs1svNV_index, { "index", "x11.glx.render.VertexAttribs1svNV.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttribs1svNV_n, { "n", "x11.glx.render.VertexAttribs1svNV.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttribs1svNV_v, { "v", "x11.glx.render.VertexAttribs1svNV.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1663,7 +1663,7 @@ { &hf_x11_glx_render_VertexAttribs4dvNV_v_item, { "v", "x11.glx.render.VertexAttribs4dvNV.v", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttribs4ubvNV_index, { "index", "x11.glx.render.VertexAttribs4ubvNV.index", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_VertexAttribs4ubvNV_n, { "n", "x11.glx.render.VertexAttribs4ubvNV.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_VertexAttribs4ubvNV_v, { "v", "x11.glx.render.VertexAttribs4ubvNV.v", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_VertexAttribs4ubvNV_v, { "v", "x11.glx.render.VertexAttribs4ubvNV.v", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_PointParameteriNV_pname, { "pname", "x11.glx.render.PointParameteriNV.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_PointParameteriNV_param, { "param", "x11.glx.render.PointParameteriNV.param", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_PointParameterivNV_pname, { "pname", "x11.glx.render.PointParameterivNV.pname", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, @@ -1672,12 +1672,12 @@ { &hf_x11_glx_render_ActiveStencilFaceEXT_face, { "face", "x11.glx.render.ActiveStencilFaceEXT.face", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramNamedParameter4fvNV_id, { "id", "x11.glx.render.ProgramNamedParameter4fvNV.id", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramNamedParameter4fvNV_len, { "len", "x11.glx.render.ProgramNamedParameter4fvNV.len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_ProgramNamedParameter4fvNV_name, { "name", "x11.glx.render.ProgramNamedParameter4fvNV.name", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_ProgramNamedParameter4fvNV_name, { "name", "x11.glx.render.ProgramNamedParameter4fvNV.name", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramNamedParameter4fvNV_v, { "v", "x11.glx.render.ProgramNamedParameter4fvNV.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramNamedParameter4fvNV_v_item, { "v", "x11.glx.render.ProgramNamedParameter4fvNV.v", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramNamedParameter4dvNV_id, { "id", "x11.glx.render.ProgramNamedParameter4dvNV.id", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramNamedParameter4dvNV_len, { "len", "x11.glx.render.ProgramNamedParameter4dvNV.len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_render_ProgramNamedParameter4dvNV_name, { "name", "x11.glx.render.ProgramNamedParameter4dvNV.name", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_render_ProgramNamedParameter4dvNV_name, { "name", "x11.glx.render.ProgramNamedParameter4dvNV.name", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramNamedParameter4dvNV_v, { "v", "x11.glx.render.ProgramNamedParameter4dvNV.v", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_ProgramNamedParameter4dvNV_v_item, { "v", "x11.glx.render.ProgramNamedParameter4dvNV.v", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_render_DepthBoundsEXT_zmin, { "zmin", "x11.glx.render.DepthBoundsEXT.zmin", FT_DOUBLE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1695,7 +1695,7 @@ { &hf_x11_struct_RECTANGLE_width, { "width", "x11.struct.RECTANGLE.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_RECTANGLE_height, { "height", "x11.struct.RECTANGLE.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_STR, { "STR", "x11.struct.STR", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_STR_name_len, { "name_len", "x11.struct.STR.name_len", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_STR_name_len, { "name_len", "x11.struct.STR.name_len", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_STR_name, { "name", "x11.struct.STR.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_DIRECTFORMAT, { "DIRECTFORMAT", "x11.struct.DIRECTFORMAT", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_DIRECTFORMAT_red_shift, { "red_shift", "x11.struct.DIRECTFORMAT.red_shift", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1708,15 +1708,15 @@ { &hf_x11_struct_DIRECTFORMAT_alpha_mask, { "alpha_mask", "x11.struct.DIRECTFORMAT.alpha_mask", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_PICTFORMINFO, { "PICTFORMINFO", "x11.struct.PICTFORMINFO", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_PICTFORMINFO_id, { "id", "x11.struct.PICTFORMINFO.id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_PICTFORMINFO_type, { "type", "x11.struct.PICTFORMINFO.type", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_PICTFORMINFO_depth, { "depth", "x11.struct.PICTFORMINFO.depth", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_PICTFORMINFO_type, { "type", "x11.struct.PICTFORMINFO.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictType), 0, NULL, HFILL }}, +{ &hf_x11_struct_PICTFORMINFO_depth, { "depth", "x11.struct.PICTFORMINFO.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_PICTFORMINFO_direct, { "direct", "x11.struct.PICTFORMINFO.direct", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_PICTFORMINFO_colormap, { "colormap", "x11.struct.PICTFORMINFO.colormap", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_PICTVISUAL, { "PICTVISUAL", "x11.struct.PICTVISUAL", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_PICTVISUAL_visual, { "visual", "x11.struct.PICTVISUAL.visual", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_PICTVISUAL_format, { "format", "x11.struct.PICTVISUAL.format", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_PICTDEPTH, { "PICTDEPTH", "x11.struct.PICTDEPTH", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_PICTDEPTH_depth, { "depth", "x11.struct.PICTDEPTH.depth", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_PICTDEPTH_depth, { "depth", "x11.struct.PICTDEPTH.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_PICTDEPTH_num_visuals, { "num_visuals", "x11.struct.PICTDEPTH.num_visuals", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_PICTDEPTH_visuals, { "visuals", "x11.struct.PICTDEPTH.visuals", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_PICTDEPTH_visuals_item, { "visuals", "x11.struct.PICTDEPTH.visuals", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1782,13 +1782,13 @@ { &hf_x11_composite_QueryVersion_reply_major_version, { "major_version", "x11.composite.QueryVersion.reply.major_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_composite_QueryVersion_reply_minor_version, { "minor_version", "x11.composite.QueryVersion.reply.minor_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_composite_RedirectWindow_window, { "window", "x11.composite.RedirectWindow.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_composite_RedirectWindow_update, { "update", "x11.composite.RedirectWindow.update", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_composite_RedirectWindow_update, { "update", "x11.composite.RedirectWindow.update", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Redirect), 0, NULL, HFILL }}, { &hf_x11_composite_RedirectSubwindows_window, { "window", "x11.composite.RedirectSubwindows.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_composite_RedirectSubwindows_update, { "update", "x11.composite.RedirectSubwindows.update", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_composite_RedirectSubwindows_update, { "update", "x11.composite.RedirectSubwindows.update", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Redirect), 0, NULL, HFILL }}, { &hf_x11_composite_UnredirectWindow_window, { "window", "x11.composite.UnredirectWindow.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_composite_UnredirectWindow_update, { "update", "x11.composite.UnredirectWindow.update", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_composite_UnredirectWindow_update, { "update", "x11.composite.UnredirectWindow.update", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Redirect), 0, NULL, HFILL }}, { &hf_x11_composite_UnredirectSubwindows_window, { "window", "x11.composite.UnredirectSubwindows.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_composite_UnredirectSubwindows_update, { "update", "x11.composite.UnredirectSubwindows.update", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_composite_UnredirectSubwindows_update, { "update", "x11.composite.UnredirectSubwindows.update", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Redirect), 0, NULL, HFILL }}, { &hf_x11_composite_CreateRegionFromBorderClip_region, { "region", "x11.composite.CreateRegionFromBorderClip.region", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_composite_CreateRegionFromBorderClip_window, { "window", "x11.composite.CreateRegionFromBorderClip.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_composite_NameWindowPixmap_window, { "window", "x11.composite.NameWindowPixmap.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -1804,14 +1804,14 @@ { &hf_x11_damage_QueryVersion_reply_minor_version, { "minor_version", "x11.damage.QueryVersion.reply.minor_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_damage_Create_damage, { "damage", "x11.damage.Create.damage", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_damage_Create_drawable, { "drawable", "x11.damage.Create.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_damage_Create_level, { "level", "x11.damage.Create.level", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_damage_Create_level, { "level", "x11.damage.Create.level", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_ReportLevel), 0, NULL, HFILL }}, { &hf_x11_damage_Destroy_damage, { "damage", "x11.damage.Destroy.damage", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_damage_Subtract_damage, { "damage", "x11.damage.Subtract.damage", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_damage_Subtract_repair, { "repair", "x11.damage.Subtract.repair", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_damage_Subtract_parts, { "parts", "x11.damage.Subtract.parts", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_damage_Subtract_repair, { "repair", "x11.damage.Subtract.repair", FT_UINT32, BASE_HEX, VALS(x11_enum_Region), 0, NULL, HFILL }}, +{ &hf_x11_damage_Subtract_parts, { "parts", "x11.damage.Subtract.parts", FT_UINT32, BASE_HEX, VALS(x11_enum_Region), 0, NULL, HFILL }}, { &hf_x11_damage_Add_drawable, { "drawable", "x11.damage.Add.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_damage_Add_region, { "region", "x11.damage.Add.region", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_damage_Notify_level, { "level", "x11.damage.Notify.level", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_damage_Notify_level, { "level", "x11.damage.Notify.level", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_ReportLevel), 0, NULL, HFILL }}, { &hf_x11_damage_Notify_drawable, { "drawable", "x11.damage.Notify.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_damage_Notify_damage, { "damage", "x11.damage.Notify.damage", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_damage_Notify_timestamp, { "timestamp", "x11.damage.Notify.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -1830,8 +1830,8 @@ { &hf_x11_dpms_SetTimeouts_standby_timeout, { "standby_timeout", "x11.dpms.SetTimeouts.standby_timeout", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_dpms_SetTimeouts_suspend_timeout, { "suspend_timeout", "x11.dpms.SetTimeouts.suspend_timeout", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_dpms_SetTimeouts_off_timeout, { "off_timeout", "x11.dpms.SetTimeouts.off_timeout", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_dpms_ForceLevel_power_level, { "power_level", "x11.dpms.ForceLevel.power_level", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_dpms_Info_reply_power_level, { "power_level", "x11.dpms.Info.reply.power_level", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_dpms_ForceLevel_power_level, { "power_level", "x11.dpms.ForceLevel.power_level", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_DPMSMode), 0, NULL, HFILL }}, +{ &hf_x11_dpms_Info_reply_power_level, { "power_level", "x11.dpms.Info.reply.power_level", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_DPMSMode), 0, NULL, HFILL }}, { &hf_x11_dpms_Info_reply_state, { "state", "x11.dpms.Info.reply.state", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_dpms_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(dpms_extension_minor), 0, "minor opcode", HFILL }}, @@ -1935,7 +1935,7 @@ { &hf_x11_glx_CreateNewContext_render_type, { "render_type", "x11.glx.CreateNewContext.render_type", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_CreateNewContext_share_list, { "share_list", "x11.glx.CreateNewContext.share_list", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_CreateNewContext_is_direct, { "is_direct", "x11.glx.CreateNewContext.is_direct", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_glx_CreateNewContext_reserved1, { "reserved1", "x11.glx.CreateNewContext.reserved1", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_CreateNewContext_reserved1, { "reserved1", "x11.glx.CreateNewContext.reserved1", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_CreateNewContext_reserved2, { "reserved2", "x11.glx.CreateNewContext.reserved2", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_QueryContext_context, { "context", "x11.glx.QueryContext.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_QueryContext_reply_num_attribs, { "num_attribs", "x11.glx.QueryContext.reply.num_attribs", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2357,22 +2357,44 @@ { &hf_x11_randr_SetScreenConfig_timestamp, { "timestamp", "x11.randr.SetScreenConfig.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetScreenConfig_config_timestamp, { "config_timestamp", "x11.randr.SetScreenConfig.config_timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetScreenConfig_sizeID, { "sizeID", "x11.randr.SetScreenConfig.sizeID", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_0, { "Rotate_0", "x11.randr.SetScreenConfig.rotation.Rotate_0", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_90, { "Rotate_90", "x11.randr.SetScreenConfig.rotation.Rotate_90", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_180, { "Rotate_180", "x11.randr.SetScreenConfig.rotation.Rotate_180", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_randr_SetScreenConfig_rotation_mask_Rotate_270, { "Rotate_270", "x11.randr.SetScreenConfig.rotation.Rotate_270", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_randr_SetScreenConfig_rotation_mask_Reflect_X, { "Reflect_X", "x11.randr.SetScreenConfig.rotation.Reflect_X", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_randr_SetScreenConfig_rotation_mask_Reflect_Y, { "Reflect_Y", "x11.randr.SetScreenConfig.rotation.Reflect_Y", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }}, { &hf_x11_randr_SetScreenConfig_rotation, { "rotation", "x11.randr.SetScreenConfig.rotation", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetScreenConfig_rate, { "rate", "x11.randr.SetScreenConfig.rate", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_SetScreenConfig_reply_status, { "status", "x11.randr.SetScreenConfig.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_SetScreenConfig_reply_status, { "status", "x11.randr.SetScreenConfig.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetConfig), 0, NULL, HFILL }}, { &hf_x11_randr_SetScreenConfig_reply_new_timestamp, { "new_timestamp", "x11.randr.SetScreenConfig.reply.new_timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetScreenConfig_reply_config_timestamp, { "config_timestamp", "x11.randr.SetScreenConfig.reply.config_timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetScreenConfig_reply_root, { "root", "x11.randr.SetScreenConfig.reply.root", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_SetScreenConfig_reply_subpixel_order, { "subpixel_order", "x11.randr.SetScreenConfig.reply.subpixel_order", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_SetScreenConfig_reply_subpixel_order, { "subpixel_order", "x11.randr.SetScreenConfig.reply.subpixel_order", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_SubPixel), 0, NULL, HFILL }}, { &hf_x11_randr_SelectInput_window, { "window", "x11.randr.SelectInput.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_SelectInput_enable_mask_ScreenChange, { "ScreenChange", "x11.randr.SelectInput.enable.ScreenChange", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_randr_SelectInput_enable_mask_CrtcChange, { "CrtcChange", "x11.randr.SelectInput.enable.CrtcChange", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_randr_SelectInput_enable_mask_OutputChange, { "OutputChange", "x11.randr.SelectInput.enable.OutputChange", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_randr_SelectInput_enable_mask_OutputProperty, { "OutputProperty", "x11.randr.SelectInput.enable.OutputProperty", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }}, { &hf_x11_randr_SelectInput_enable, { "enable", "x11.randr.SelectInput.enable", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetScreenInfo_window, { "window", "x11.randr.GetScreenInfo.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_GetScreenInfo_reply_rotations, { "rotations", "x11.randr.GetScreenInfo.reply.rotations", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_0, { "Rotate_0", "x11.randr.GetScreenInfo.reply.rotations.Rotate_0", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_90, { "Rotate_90", "x11.randr.GetScreenInfo.reply.rotations.Rotate_90", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_180, { "Rotate_180", "x11.randr.GetScreenInfo.reply.rotations.Rotate_180", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotations_mask_Rotate_270, { "Rotate_270", "x11.randr.GetScreenInfo.reply.rotations.Rotate_270", FT_BOOLEAN, 8, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotations_mask_Reflect_X, { "Reflect_X", "x11.randr.GetScreenInfo.reply.rotations.Reflect_X", FT_BOOLEAN, 8, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotations_mask_Reflect_Y, { "Reflect_Y", "x11.randr.GetScreenInfo.reply.rotations.Reflect_Y", FT_BOOLEAN, 8, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotations, { "rotations", "x11.randr.GetScreenInfo.reply.rotations", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetScreenInfo_reply_root, { "root", "x11.randr.GetScreenInfo.reply.root", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetScreenInfo_reply_timestamp, { "timestamp", "x11.randr.GetScreenInfo.reply.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetScreenInfo_reply_config_timestamp, { "config_timestamp", "x11.randr.GetScreenInfo.reply.config_timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetScreenInfo_reply_nSizes, { "nSizes", "x11.randr.GetScreenInfo.reply.nSizes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetScreenInfo_reply_sizeID, { "sizeID", "x11.randr.GetScreenInfo.reply.sizeID", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_0, { "Rotate_0", "x11.randr.GetScreenInfo.reply.rotation.Rotate_0", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_90, { "Rotate_90", "x11.randr.GetScreenInfo.reply.rotation.Rotate_90", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_180, { "Rotate_180", "x11.randr.GetScreenInfo.reply.rotation.Rotate_180", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotation_mask_Rotate_270, { "Rotate_270", "x11.randr.GetScreenInfo.reply.rotation.Rotate_270", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotation_mask_Reflect_X, { "Reflect_X", "x11.randr.GetScreenInfo.reply.rotation.Reflect_X", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_randr_GetScreenInfo_reply_rotation_mask_Reflect_Y, { "Reflect_Y", "x11.randr.GetScreenInfo.reply.rotation.Reflect_Y", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }}, { &hf_x11_randr_GetScreenInfo_reply_rotation, { "rotation", "x11.randr.GetScreenInfo.reply.rotation", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetScreenInfo_reply_rate, { "rate", "x11.randr.GetScreenInfo.reply.rate", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetScreenInfo_reply_nInfo, { "nInfo", "x11.randr.GetScreenInfo.reply.nInfo", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2402,6 +2424,20 @@ { &hf_x11_struct_ModeInfo_vsync_end, { "vsync_end", "x11.struct.ModeInfo.vsync_end", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ModeInfo_vtotal, { "vtotal", "x11.struct.ModeInfo.vtotal", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ModeInfo_name_len, { "name_len", "x11.struct.ModeInfo.name_len", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_HsyncPositive, { "HsyncPositive", "x11.struct.ModeInfo.mode_flags.HsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_HsyncNegative, { "HsyncNegative", "x11.struct.ModeInfo.mode_flags.HsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_VsyncPositive, { "VsyncPositive", "x11.struct.ModeInfo.mode_flags.VsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_VsyncNegative, { "VsyncNegative", "x11.struct.ModeInfo.mode_flags.VsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_Interlace, { "Interlace", "x11.struct.ModeInfo.mode_flags.Interlace", FT_BOOLEAN, 32, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_DoubleScan, { "DoubleScan", "x11.struct.ModeInfo.mode_flags.DoubleScan", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_Csync, { "Csync", "x11.struct.ModeInfo.mode_flags.Csync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_CsyncPositive, { "CsyncPositive", "x11.struct.ModeInfo.mode_flags.CsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_CsyncNegative, { "CsyncNegative", "x11.struct.ModeInfo.mode_flags.CsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_HskewPresent, { "HskewPresent", "x11.struct.ModeInfo.mode_flags.HskewPresent", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_Bcast, { "Bcast", "x11.struct.ModeInfo.mode_flags.Bcast", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_PixelMultiplex, { "PixelMultiplex", "x11.struct.ModeInfo.mode_flags.PixelMultiplex", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_DoubleClock, { "DoubleClock", "x11.struct.ModeInfo.mode_flags.DoubleClock", FT_BOOLEAN, 32, NULL, 1 << 12, NULL, HFILL }}, +{ &hf_x11_struct_ModeInfo_mode_flags_mask_HalveClock, { "HalveClock", "x11.struct.ModeInfo.mode_flags.HalveClock", FT_BOOLEAN, 32, NULL, 1 << 13, NULL, HFILL }}, { &hf_x11_struct_ModeInfo_mode_flags, { "mode_flags", "x11.struct.ModeInfo.mode_flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetScreenResources_window, { "window", "x11.randr.GetScreenResources.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetScreenResources_reply_timestamp, { "timestamp", "x11.randr.GetScreenResources.reply.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2419,13 +2455,13 @@ { &hf_x11_randr_GetScreenResources_reply_names, { "names", "x11.randr.GetScreenResources.reply.names", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputInfo_output, { "output", "x11.randr.GetOutputInfo.output", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputInfo_config_timestamp, { "config_timestamp", "x11.randr.GetOutputInfo.config_timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_GetOutputInfo_reply_status, { "status", "x11.randr.GetOutputInfo.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetOutputInfo_reply_status, { "status", "x11.randr.GetOutputInfo.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetConfig), 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputInfo_reply_timestamp, { "timestamp", "x11.randr.GetOutputInfo.reply.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputInfo_reply_crtc, { "crtc", "x11.randr.GetOutputInfo.reply.crtc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputInfo_reply_mm_width, { "mm_width", "x11.randr.GetOutputInfo.reply.mm_width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputInfo_reply_mm_height, { "mm_height", "x11.randr.GetOutputInfo.reply.mm_height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_GetOutputInfo_reply_connection, { "connection", "x11.randr.GetOutputInfo.reply.connection", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_GetOutputInfo_reply_subpixel_order, { "subpixel_order", "x11.randr.GetOutputInfo.reply.subpixel_order", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetOutputInfo_reply_connection, { "connection", "x11.randr.GetOutputInfo.reply.connection", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Connection), 0, NULL, HFILL }}, +{ &hf_x11_randr_GetOutputInfo_reply_subpixel_order, { "subpixel_order", "x11.randr.GetOutputInfo.reply.subpixel_order", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SubPixel), 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputInfo_reply_num_crtcs, { "num_crtcs", "x11.randr.GetOutputInfo.reply.num_crtcs", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputInfo_reply_num_modes, { "num_modes", "x11.randr.GetOutputInfo.reply.num_modes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputInfo_reply_num_preferred, { "num_preferred", "x11.randr.GetOutputInfo.reply.num_preferred", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2458,21 +2494,21 @@ { &hf_x11_randr_ChangeOutputProperty_output, { "output", "x11.randr.ChangeOutputProperty.output", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_ChangeOutputProperty_property, { "property", "x11.randr.ChangeOutputProperty.property", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_ChangeOutputProperty_type, { "type", "x11.randr.ChangeOutputProperty.type", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_ChangeOutputProperty_format, { "format", "x11.randr.ChangeOutputProperty.format", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_ChangeOutputProperty_mode, { "mode", "x11.randr.ChangeOutputProperty.mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_ChangeOutputProperty_format, { "format", "x11.randr.ChangeOutputProperty.format", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_ChangeOutputProperty_mode, { "mode", "x11.randr.ChangeOutputProperty.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_PropMode), 0, NULL, HFILL }}, { &hf_x11_randr_ChangeOutputProperty_num_units, { "num_units", "x11.randr.ChangeOutputProperty.num_units", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_ChangeOutputProperty_data, { "data", "x11.randr.ChangeOutputProperty.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_DeleteOutputProperty_output, { "output", "x11.randr.DeleteOutputProperty.output", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_DeleteOutputProperty_property, { "property", "x11.randr.DeleteOutputProperty.property", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputProperty_output, { "output", "x11.randr.GetOutputProperty.output", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputProperty_property, { "property", "x11.randr.GetOutputProperty.property", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_GetOutputProperty_type, { "type", "x11.randr.GetOutputProperty.type", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetOutputProperty_type, { "type", "x11.randr.GetOutputProperty.type", FT_UINT32, BASE_HEX, VALS(x11_enum_GetPropertyType), 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputProperty_long_offset, { "long_offset", "x11.randr.GetOutputProperty.long_offset", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputProperty_long_length, { "long_length", "x11.randr.GetOutputProperty.long_length", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputProperty_delete, { "delete", "x11.randr.GetOutputProperty.delete", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputProperty_pending, { "pending", "x11.randr.GetOutputProperty.pending", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_GetOutputProperty_reply_format, { "format", "x11.randr.GetOutputProperty.reply.format", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_GetOutputProperty_reply_type, { "type", "x11.randr.GetOutputProperty.reply.type", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetOutputProperty_reply_format, { "format", "x11.randr.GetOutputProperty.reply.format", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetOutputProperty_reply_type, { "type", "x11.randr.GetOutputProperty.reply.type", FT_UINT32, BASE_HEX, VALS(x11_enum_Atom), 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputProperty_reply_bytes_after, { "bytes_after", "x11.randr.GetOutputProperty.reply.bytes_after", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputProperty_reply_num_items, { "num_items", "x11.randr.GetOutputProperty.reply.num_items", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputProperty_reply_data, { "data", "x11.randr.GetOutputProperty.reply.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -2487,14 +2523,26 @@ { &hf_x11_randr_DeleteOutputMode_mode, { "mode", "x11.randr.DeleteOutputMode.mode", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcInfo_crtc, { "crtc", "x11.randr.GetCrtcInfo.crtc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcInfo_config_timestamp, { "config_timestamp", "x11.randr.GetCrtcInfo.config_timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_GetCrtcInfo_reply_status, { "status", "x11.randr.GetCrtcInfo.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_status, { "status", "x11.randr.GetCrtcInfo.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetConfig), 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcInfo_reply_timestamp, { "timestamp", "x11.randr.GetCrtcInfo.reply.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcInfo_reply_x, { "x", "x11.randr.GetCrtcInfo.reply.x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcInfo_reply_y, { "y", "x11.randr.GetCrtcInfo.reply.y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcInfo_reply_width, { "width", "x11.randr.GetCrtcInfo.reply.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcInfo_reply_height, { "height", "x11.randr.GetCrtcInfo.reply.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcInfo_reply_mode, { "mode", "x11.randr.GetCrtcInfo.reply.mode", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_0, { "Rotate_0", "x11.randr.GetCrtcInfo.reply.rotation.Rotate_0", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_90, { "Rotate_90", "x11.randr.GetCrtcInfo.reply.rotation.Rotate_90", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_180, { "Rotate_180", "x11.randr.GetCrtcInfo.reply.rotation.Rotate_180", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Rotate_270, { "Rotate_270", "x11.randr.GetCrtcInfo.reply.rotation.Rotate_270", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Reflect_X, { "Reflect_X", "x11.randr.GetCrtcInfo.reply.rotation.Reflect_X", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_rotation_mask_Reflect_Y, { "Reflect_Y", "x11.randr.GetCrtcInfo.reply.rotation.Reflect_Y", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }}, { &hf_x11_randr_GetCrtcInfo_reply_rotation, { "rotation", "x11.randr.GetCrtcInfo.reply.rotation", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_0, { "Rotate_0", "x11.randr.GetCrtcInfo.reply.rotations.Rotate_0", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_90, { "Rotate_90", "x11.randr.GetCrtcInfo.reply.rotations.Rotate_90", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_180, { "Rotate_180", "x11.randr.GetCrtcInfo.reply.rotations.Rotate_180", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Rotate_270, { "Rotate_270", "x11.randr.GetCrtcInfo.reply.rotations.Rotate_270", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Reflect_X, { "Reflect_X", "x11.randr.GetCrtcInfo.reply.rotations.Reflect_X", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_randr_GetCrtcInfo_reply_rotations_mask_Reflect_Y, { "Reflect_Y", "x11.randr.GetCrtcInfo.reply.rotations.Reflect_Y", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }}, { &hf_x11_randr_GetCrtcInfo_reply_rotations, { "rotations", "x11.randr.GetCrtcInfo.reply.rotations", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcInfo_reply_num_outputs, { "num_outputs", "x11.randr.GetCrtcInfo.reply.num_outputs", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcInfo_reply_num_possible_outputs, { "num_possible_outputs", "x11.randr.GetCrtcInfo.reply.num_possible_outputs", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2508,10 +2556,16 @@ { &hf_x11_randr_SetCrtcConfig_x, { "x", "x11.randr.SetCrtcConfig.x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetCrtcConfig_y, { "y", "x11.randr.SetCrtcConfig.y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetCrtcConfig_mode, { "mode", "x11.randr.SetCrtcConfig.mode", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_0, { "Rotate_0", "x11.randr.SetCrtcConfig.rotation.Rotate_0", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_90, { "Rotate_90", "x11.randr.SetCrtcConfig.rotation.Rotate_90", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_180, { "Rotate_180", "x11.randr.SetCrtcConfig.rotation.Rotate_180", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_randr_SetCrtcConfig_rotation_mask_Rotate_270, { "Rotate_270", "x11.randr.SetCrtcConfig.rotation.Rotate_270", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_randr_SetCrtcConfig_rotation_mask_Reflect_X, { "Reflect_X", "x11.randr.SetCrtcConfig.rotation.Reflect_X", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_randr_SetCrtcConfig_rotation_mask_Reflect_Y, { "Reflect_Y", "x11.randr.SetCrtcConfig.rotation.Reflect_Y", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }}, { &hf_x11_randr_SetCrtcConfig_rotation, { "rotation", "x11.randr.SetCrtcConfig.rotation", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetCrtcConfig_outputs, { "outputs", "x11.randr.SetCrtcConfig.outputs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetCrtcConfig_outputs_item, { "outputs", "x11.randr.SetCrtcConfig.outputs", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_SetCrtcConfig_reply_status, { "status", "x11.randr.SetCrtcConfig.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_SetCrtcConfig_reply_status, { "status", "x11.randr.SetCrtcConfig.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetConfig), 0, NULL, HFILL }}, { &hf_x11_randr_SetCrtcConfig_reply_timestamp, { "timestamp", "x11.randr.SetCrtcConfig.reply.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcGammaSize_crtc, { "crtc", "x11.randr.GetCrtcGammaSize.crtc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcGammaSize_reply_size, { "size", "x11.randr.GetCrtcGammaSize.reply.size", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2566,7 +2620,7 @@ { &hf_x11_randr_GetCrtcTransform_reply_current_params, { "current_params", "x11.randr.GetCrtcTransform.reply.current_params", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetCrtcTransform_reply_current_params_item, { "current_params", "x11.randr.GetCrtcTransform.reply.current_params", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetPanning_crtc, { "crtc", "x11.randr.GetPanning.crtc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_GetPanning_reply_status, { "status", "x11.randr.GetPanning.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetPanning_reply_status, { "status", "x11.randr.GetPanning.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetConfig), 0, NULL, HFILL }}, { &hf_x11_randr_GetPanning_reply_timestamp, { "timestamp", "x11.randr.GetPanning.reply.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetPanning_reply_left, { "left", "x11.randr.GetPanning.reply.left", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetPanning_reply_top, { "top", "x11.randr.GetPanning.reply.top", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2594,19 +2648,25 @@ { &hf_x11_randr_SetPanning_border_top, { "border_top", "x11.randr.SetPanning.border_top", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetPanning_border_right, { "border_right", "x11.randr.SetPanning.border_right", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetPanning_border_bottom, { "border_bottom", "x11.randr.SetPanning.border_bottom", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_SetPanning_reply_status, { "status", "x11.randr.SetPanning.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_SetPanning_reply_status, { "status", "x11.randr.SetPanning.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetConfig), 0, NULL, HFILL }}, { &hf_x11_randr_SetPanning_reply_timestamp, { "timestamp", "x11.randr.SetPanning.reply.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetOutputPrimary_window, { "window", "x11.randr.SetOutputPrimary.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_SetOutputPrimary_output, { "output", "x11.randr.SetOutputPrimary.output", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputPrimary_window, { "window", "x11.randr.GetOutputPrimary.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_GetOutputPrimary_reply_output, { "output", "x11.randr.GetOutputPrimary.reply.output", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_ScreenChangeNotify_rotation, { "rotation", "x11.randr.ScreenChangeNotify.rotation", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_0, { "Rotate_0", "x11.randr.ScreenChangeNotify.rotation.Rotate_0", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_90, { "Rotate_90", "x11.randr.ScreenChangeNotify.rotation.Rotate_90", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_180, { "Rotate_180", "x11.randr.ScreenChangeNotify.rotation.Rotate_180", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_randr_ScreenChangeNotify_rotation_mask_Rotate_270, { "Rotate_270", "x11.randr.ScreenChangeNotify.rotation.Rotate_270", FT_BOOLEAN, 8, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_randr_ScreenChangeNotify_rotation_mask_Reflect_X, { "Reflect_X", "x11.randr.ScreenChangeNotify.rotation.Reflect_X", FT_BOOLEAN, 8, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_randr_ScreenChangeNotify_rotation_mask_Reflect_Y, { "Reflect_Y", "x11.randr.ScreenChangeNotify.rotation.Reflect_Y", FT_BOOLEAN, 8, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_randr_ScreenChangeNotify_rotation, { "rotation", "x11.randr.ScreenChangeNotify.rotation", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_ScreenChangeNotify_timestamp, { "timestamp", "x11.randr.ScreenChangeNotify.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_ScreenChangeNotify_config_timestamp, { "config_timestamp", "x11.randr.ScreenChangeNotify.config_timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_ScreenChangeNotify_root, { "root", "x11.randr.ScreenChangeNotify.root", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_ScreenChangeNotify_request_window, { "request_window", "x11.randr.ScreenChangeNotify.request_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_ScreenChangeNotify_sizeID, { "sizeID", "x11.randr.ScreenChangeNotify.sizeID", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_ScreenChangeNotify_subpixel_order, { "subpixel_order", "x11.randr.ScreenChangeNotify.subpixel_order", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_ScreenChangeNotify_subpixel_order, { "subpixel_order", "x11.randr.ScreenChangeNotify.subpixel_order", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_SubPixel), 0, NULL, HFILL }}, { &hf_x11_randr_ScreenChangeNotify_width, { "width", "x11.randr.ScreenChangeNotify.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_ScreenChangeNotify_height, { "height", "x11.randr.ScreenChangeNotify.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_ScreenChangeNotify_mwidth, { "mwidth", "x11.randr.ScreenChangeNotify.mwidth", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2616,6 +2676,12 @@ { &hf_x11_struct_CrtcChange_window, { "window", "x11.struct.CrtcChange.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_CrtcChange_crtc, { "crtc", "x11.struct.CrtcChange.crtc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_CrtcChange_mode, { "mode", "x11.struct.CrtcChange.mode", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_CrtcChange_rotation_mask_Rotate_0, { "Rotate_0", "x11.struct.CrtcChange.rotation.Rotate_0", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_struct_CrtcChange_rotation_mask_Rotate_90, { "Rotate_90", "x11.struct.CrtcChange.rotation.Rotate_90", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_struct_CrtcChange_rotation_mask_Rotate_180, { "Rotate_180", "x11.struct.CrtcChange.rotation.Rotate_180", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_struct_CrtcChange_rotation_mask_Rotate_270, { "Rotate_270", "x11.struct.CrtcChange.rotation.Rotate_270", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_struct_CrtcChange_rotation_mask_Reflect_X, { "Reflect_X", "x11.struct.CrtcChange.rotation.Reflect_X", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_struct_CrtcChange_rotation_mask_Reflect_Y, { "Reflect_Y", "x11.struct.CrtcChange.rotation.Reflect_Y", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }}, { &hf_x11_struct_CrtcChange_rotation, { "rotation", "x11.struct.CrtcChange.rotation", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_CrtcChange_x, { "x", "x11.struct.CrtcChange.x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_CrtcChange_y, { "y", "x11.struct.CrtcChange.y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -2628,23 +2694,29 @@ { &hf_x11_struct_OutputChange_output, { "output", "x11.struct.OutputChange.output", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_OutputChange_crtc, { "crtc", "x11.struct.OutputChange.crtc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_OutputChange_mode, { "mode", "x11.struct.OutputChange.mode", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_OutputChange_rotation_mask_Rotate_0, { "Rotate_0", "x11.struct.OutputChange.rotation.Rotate_0", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_struct_OutputChange_rotation_mask_Rotate_90, { "Rotate_90", "x11.struct.OutputChange.rotation.Rotate_90", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_struct_OutputChange_rotation_mask_Rotate_180, { "Rotate_180", "x11.struct.OutputChange.rotation.Rotate_180", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_struct_OutputChange_rotation_mask_Rotate_270, { "Rotate_270", "x11.struct.OutputChange.rotation.Rotate_270", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_struct_OutputChange_rotation_mask_Reflect_X, { "Reflect_X", "x11.struct.OutputChange.rotation.Reflect_X", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_struct_OutputChange_rotation_mask_Reflect_Y, { "Reflect_Y", "x11.struct.OutputChange.rotation.Reflect_Y", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }}, { &hf_x11_struct_OutputChange_rotation, { "rotation", "x11.struct.OutputChange.rotation", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_OutputChange_connection, { "connection", "x11.struct.OutputChange.connection", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_OutputChange_subpixel_order, { "subpixel_order", "x11.struct.OutputChange.subpixel_order", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_OutputChange_connection, { "connection", "x11.struct.OutputChange.connection", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Connection), 0, NULL, HFILL }}, +{ &hf_x11_struct_OutputChange_subpixel_order, { "subpixel_order", "x11.struct.OutputChange.subpixel_order", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SubPixel), 0, NULL, HFILL }}, { &hf_x11_struct_OutputProperty, { "OutputProperty", "x11.struct.OutputProperty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_OutputProperty_window, { "window", "x11.struct.OutputProperty.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_OutputProperty_output, { "output", "x11.struct.OutputProperty.output", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_OutputProperty_atom, { "atom", "x11.struct.OutputProperty.atom", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_OutputProperty_timestamp, { "timestamp", "x11.struct.OutputProperty.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_OutputProperty_status, { "status", "x11.struct.OutputProperty.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_OutputProperty_status, { "status", "x11.struct.OutputProperty.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Property), 0, NULL, HFILL }}, { &hf_x11_union_NotifyData, { "NotifyData", "x11.union.NotifyData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_randr_Notify_subCode, { "subCode", "x11.randr.Notify.subCode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_Notify_subCode, { "subCode", "x11.randr.Notify.subCode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Notify), 0, NULL, HFILL }}, { &hf_x11_randr_Notify_u, { "u", "x11.randr.Notify.u", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(randr_extension_minor), 0, "minor opcode", HFILL }}, { &hf_x11_struct_Range8, { "Range8", "x11.struct.Range8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_Range8_first, { "first", "x11.struct.Range8.first", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_Range8_last, { "last", "x11.struct.Range8.last", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_Range8_first, { "first", "x11.struct.Range8.first", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_Range8_last, { "last", "x11.struct.Range8.last", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_Range16, { "Range16", "x11.struct.Range16", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_Range16_first, { "first", "x11.struct.Range16.first", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_Range16_last, { "last", "x11.struct.Range16.last", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2671,7 +2743,7 @@ { &hf_x11_record_QueryVersion_reply_major_version, { "major_version", "x11.record.QueryVersion.reply.major_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_QueryVersion_reply_minor_version, { "minor_version", "x11.record.QueryVersion.reply.minor_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_CreateContext_context, { "context", "x11.record.CreateContext.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_record_CreateContext_element_header, { "element_header", "x11.record.CreateContext.element_header", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_record_CreateContext_element_header, { "element_header", "x11.record.CreateContext.element_header", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_CreateContext_num_client_specs, { "num_client_specs", "x11.record.CreateContext.num_client_specs", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_CreateContext_num_ranges, { "num_ranges", "x11.record.CreateContext.num_ranges", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_CreateContext_client_specs, { "client_specs", "x11.record.CreateContext.client_specs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -2679,7 +2751,7 @@ { &hf_x11_record_CreateContext_ranges, { "ranges", "x11.record.CreateContext.ranges", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_record_CreateContext_ranges_item, { "ranges", "x11.record.CreateContext.ranges", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_record_RegisterClients_context, { "context", "x11.record.RegisterClients.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_record_RegisterClients_element_header, { "element_header", "x11.record.RegisterClients.element_header", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_record_RegisterClients_element_header, { "element_header", "x11.record.RegisterClients.element_header", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_RegisterClients_num_client_specs, { "num_client_specs", "x11.record.RegisterClients.num_client_specs", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_RegisterClients_num_ranges, { "num_ranges", "x11.record.RegisterClients.num_ranges", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_RegisterClients_client_specs, { "client_specs", "x11.record.RegisterClients.client_specs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -2692,12 +2764,12 @@ { &hf_x11_record_UnregisterClients_client_specs_item, { "client_specs", "x11.record.UnregisterClients.client_specs", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_GetContext_context, { "context", "x11.record.GetContext.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_record_GetContext_reply_enabled, { "enabled", "x11.record.GetContext.reply.enabled", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_record_GetContext_reply_element_header, { "element_header", "x11.record.GetContext.reply.element_header", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_record_GetContext_reply_element_header, { "element_header", "x11.record.GetContext.reply.element_header", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_GetContext_reply_num_intercepted_clients, { "num_intercepted_clients", "x11.record.GetContext.reply.num_intercepted_clients", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_GetContext_reply_intercepted_clients, { "intercepted_clients", "x11.record.GetContext.reply.intercepted_clients", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_record_EnableContext_context, { "context", "x11.record.EnableContext.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_record_EnableContext_reply_category, { "category", "x11.record.EnableContext.reply.category", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_record_EnableContext_reply_element_header, { "element_header", "x11.record.EnableContext.reply.element_header", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_record_EnableContext_reply_category, { "category", "x11.record.EnableContext.reply.category", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_record_EnableContext_reply_element_header, { "element_header", "x11.record.EnableContext.reply.element_header", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_EnableContext_reply_client_swapped, { "client_swapped", "x11.record.EnableContext.reply.client_swapped", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_record_EnableContext_reply_xid_base, { "xid_base", "x11.record.EnableContext.reply.xid_base", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_record_EnableContext_reply_server_time, { "server_time", "x11.record.EnableContext.reply.server_time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2720,7 +2792,7 @@ { &hf_x11_render_QueryPictFormats_reply_formats_item, { "formats", "x11.render.QueryPictFormats.reply.formats", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_render_QueryPictFormats_reply_screens, { "screens", "x11.render.QueryPictFormats.reply.screens", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_render_QueryPictFormats_reply_subpixels, { "subpixels", "x11.render.QueryPictFormats.reply.subpixels", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_render_QueryPictFormats_reply_subpixels_item, { "subpixels", "x11.render.QueryPictFormats.reply.subpixels", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_QueryPictFormats_reply_subpixels_item, { "subpixels", "x11.render.QueryPictFormats.reply.subpixels", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_SubPixel), 0, NULL, HFILL }}, { &hf_x11_render_QueryPictIndexValues_format, { "format", "x11.render.QueryPictIndexValues.format", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_QueryPictIndexValues_reply_num_values, { "num_values", "x11.render.QueryPictIndexValues.reply.num_values", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_QueryPictIndexValues_reply_values, { "values", "x11.render.QueryPictIndexValues.reply.values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -2735,9 +2807,9 @@ { &hf_x11_render_SetPictureClipRectangles_rectangles, { "rectangles", "x11.render.SetPictureClipRectangles.rectangles", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_render_SetPictureClipRectangles_rectangles_item, { "rectangles", "x11.render.SetPictureClipRectangles.rectangles", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_render_FreePicture_picture, { "picture", "x11.render.FreePicture.picture", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_render_Composite_op, { "op", "x11.render.Composite.op", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_Composite_op, { "op", "x11.render.Composite.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }}, { &hf_x11_render_Composite_src, { "src", "x11.render.Composite.src", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_render_Composite_mask, { "mask", "x11.render.Composite.mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_Composite_mask, { "mask", "x11.render.Composite.mask", FT_UINT32, BASE_HEX, VALS(x11_enum_Picture), 0, NULL, HFILL }}, { &hf_x11_render_Composite_dst, { "dst", "x11.render.Composite.dst", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_Composite_src_x, { "src_x", "x11.render.Composite.src_x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_Composite_src_y, { "src_y", "x11.render.Composite.src_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -2747,7 +2819,7 @@ { &hf_x11_render_Composite_dst_y, { "dst_y", "x11.render.Composite.dst_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_Composite_width, { "width", "x11.render.Composite.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_Composite_height, { "height", "x11.render.Composite.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_render_Trapezoids_op, { "op", "x11.render.Trapezoids.op", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_Trapezoids_op, { "op", "x11.render.Trapezoids.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }}, { &hf_x11_render_Trapezoids_src, { "src", "x11.render.Trapezoids.src", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_Trapezoids_dst, { "dst", "x11.render.Trapezoids.dst", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_Trapezoids_mask_format, { "mask_format", "x11.render.Trapezoids.mask_format", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -2755,7 +2827,7 @@ { &hf_x11_render_Trapezoids_src_y, { "src_y", "x11.render.Trapezoids.src_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_Trapezoids_traps, { "traps", "x11.render.Trapezoids.traps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_render_Trapezoids_traps_item, { "traps", "x11.render.Trapezoids.traps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_render_Triangles_op, { "op", "x11.render.Triangles.op", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_Triangles_op, { "op", "x11.render.Triangles.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }}, { &hf_x11_render_Triangles_src, { "src", "x11.render.Triangles.src", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_Triangles_dst, { "dst", "x11.render.Triangles.dst", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_Triangles_mask_format, { "mask_format", "x11.render.Triangles.mask_format", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -2763,7 +2835,7 @@ { &hf_x11_render_Triangles_src_y, { "src_y", "x11.render.Triangles.src_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_Triangles_triangles, { "triangles", "x11.render.Triangles.triangles", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_render_Triangles_triangles_item, { "triangles", "x11.render.Triangles.triangles", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_render_TriStrip_op, { "op", "x11.render.TriStrip.op", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_TriStrip_op, { "op", "x11.render.TriStrip.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }}, { &hf_x11_render_TriStrip_src, { "src", "x11.render.TriStrip.src", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_TriStrip_dst, { "dst", "x11.render.TriStrip.dst", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_TriStrip_mask_format, { "mask_format", "x11.render.TriStrip.mask_format", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -2771,7 +2843,7 @@ { &hf_x11_render_TriStrip_src_y, { "src_y", "x11.render.TriStrip.src_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_TriStrip_points, { "points", "x11.render.TriStrip.points", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_render_TriStrip_points_item, { "points", "x11.render.TriStrip.points", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_render_TriFan_op, { "op", "x11.render.TriFan.op", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_TriFan_op, { "op", "x11.render.TriFan.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }}, { &hf_x11_render_TriFan_src, { "src", "x11.render.TriFan.src", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_TriFan_dst, { "dst", "x11.render.TriFan.dst", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_TriFan_mask_format, { "mask_format", "x11.render.TriFan.mask_format", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -2794,7 +2866,7 @@ { &hf_x11_render_FreeGlyphs_glyphset, { "glyphset", "x11.render.FreeGlyphs.glyphset", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_FreeGlyphs_glyphs, { "glyphs", "x11.render.FreeGlyphs.glyphs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_render_FreeGlyphs_glyphs_item, { "glyphs", "x11.render.FreeGlyphs.glyphs", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_render_CompositeGlyphs8_op, { "op", "x11.render.CompositeGlyphs8.op", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CompositeGlyphs8_op, { "op", "x11.render.CompositeGlyphs8.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs8_src, { "src", "x11.render.CompositeGlyphs8.src", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs8_dst, { "dst", "x11.render.CompositeGlyphs8.dst", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs8_mask_format, { "mask_format", "x11.render.CompositeGlyphs8.mask_format", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -2802,7 +2874,7 @@ { &hf_x11_render_CompositeGlyphs8_src_x, { "src_x", "x11.render.CompositeGlyphs8.src_x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs8_src_y, { "src_y", "x11.render.CompositeGlyphs8.src_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs8_glyphcmds, { "glyphcmds", "x11.render.CompositeGlyphs8.glyphcmds", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_render_CompositeGlyphs16_op, { "op", "x11.render.CompositeGlyphs16.op", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CompositeGlyphs16_op, { "op", "x11.render.CompositeGlyphs16.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs16_src, { "src", "x11.render.CompositeGlyphs16.src", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs16_dst, { "dst", "x11.render.CompositeGlyphs16.dst", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs16_mask_format, { "mask_format", "x11.render.CompositeGlyphs16.mask_format", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -2810,7 +2882,7 @@ { &hf_x11_render_CompositeGlyphs16_src_x, { "src_x", "x11.render.CompositeGlyphs16.src_x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs16_src_y, { "src_y", "x11.render.CompositeGlyphs16.src_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs16_glyphcmds, { "glyphcmds", "x11.render.CompositeGlyphs16.glyphcmds", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_render_CompositeGlyphs32_op, { "op", "x11.render.CompositeGlyphs32.op", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CompositeGlyphs32_op, { "op", "x11.render.CompositeGlyphs32.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs32_src, { "src", "x11.render.CompositeGlyphs32.src", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs32_dst, { "dst", "x11.render.CompositeGlyphs32.dst", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs32_mask_format, { "mask_format", "x11.render.CompositeGlyphs32.mask_format", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -2818,7 +2890,7 @@ { &hf_x11_render_CompositeGlyphs32_src_x, { "src_x", "x11.render.CompositeGlyphs32.src_x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs32_src_y, { "src_y", "x11.render.CompositeGlyphs32.src_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CompositeGlyphs32_glyphcmds, { "glyphcmds", "x11.render.CompositeGlyphs32.glyphcmds", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_render_FillRectangles_op, { "op", "x11.render.FillRectangles.op", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_FillRectangles_op, { "op", "x11.render.FillRectangles.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }}, { &hf_x11_render_FillRectangles_dst, { "dst", "x11.render.FillRectangles.dst", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_FillRectangles_color, { "color", "x11.render.FillRectangles.color", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_render_FillRectangles_rects, { "rects", "x11.render.FillRectangles.rects", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -2884,8 +2956,8 @@ { &hf_x11_struct_Type, { "Type", "x11.struct.Type", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_Type_resource_type, { "resource_type", "x11.struct.Type.resource_type", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_Type_count, { "count", "x11.struct.Type.count", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_res_QueryVersion_client_major, { "client_major", "x11.res.QueryVersion.client_major", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_res_QueryVersion_client_minor, { "client_minor", "x11.res.QueryVersion.client_minor", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_res_QueryVersion_client_major, { "client_major", "x11.res.QueryVersion.client_major", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_res_QueryVersion_client_minor, { "client_minor", "x11.res.QueryVersion.client_minor", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_res_QueryVersion_reply_server_major, { "server_major", "x11.res.QueryVersion.reply.server_major", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_res_QueryVersion_reply_server_minor, { "server_minor", "x11.res.QueryVersion.reply.server_minor", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_res_QueryClients_reply_num_clients, { "num_clients", "x11.res.QueryClients.reply.num_clients", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2900,12 +2972,12 @@ { &hf_x11_res_QueryClientPixmapBytes_reply_bytes_overflow, { "bytes_overflow", "x11.res.QueryClientPixmapBytes.reply.bytes_overflow", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_res_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(res_extension_minor), 0, "minor opcode", HFILL }}, -{ &hf_x11_screensaver_QueryVersion_client_major_version, { "client_major_version", "x11.screensaver.QueryVersion.client_major_version", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_screensaver_QueryVersion_client_minor_version, { "client_minor_version", "x11.screensaver.QueryVersion.client_minor_version", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_QueryVersion_client_major_version, { "client_major_version", "x11.screensaver.QueryVersion.client_major_version", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_QueryVersion_client_minor_version, { "client_minor_version", "x11.screensaver.QueryVersion.client_minor_version", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_QueryVersion_reply_server_major_version, { "server_major_version", "x11.screensaver.QueryVersion.reply.server_major_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_QueryVersion_reply_server_minor_version, { "server_minor_version", "x11.screensaver.QueryVersion.reply.server_minor_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_QueryInfo_drawable, { "drawable", "x11.screensaver.QueryInfo.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_screensaver_QueryInfo_reply_state, { "state", "x11.screensaver.QueryInfo.reply.state", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_QueryInfo_reply_state, { "state", "x11.screensaver.QueryInfo.reply.state", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_QueryInfo_reply_saver_window, { "saver_window", "x11.screensaver.QueryInfo.reply.saver_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_QueryInfo_reply_ms_until_server, { "ms_until_server", "x11.screensaver.QueryInfo.reply.ms_until_server", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_QueryInfo_reply_ms_since_user_input, { "ms_since_user_input", "x11.screensaver.QueryInfo.reply.ms_since_user_input", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2920,11 +2992,11 @@ { &hf_x11_screensaver_SetAttributes_height, { "height", "x11.screensaver.SetAttributes.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_SetAttributes_border_width, { "border_width", "x11.screensaver.SetAttributes.border_width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_SetAttributes_class, { "class", "x11.screensaver.SetAttributes.class", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_screensaver_SetAttributes_depth, { "depth", "x11.screensaver.SetAttributes.depth", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_depth, { "depth", "x11.screensaver.SetAttributes.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_SetAttributes_visual, { "visual", "x11.screensaver.SetAttributes.visual", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_UnsetAttributes_drawable, { "drawable", "x11.screensaver.UnsetAttributes.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_Suspend_suspend, { "suspend", "x11.screensaver.Suspend.suspend", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_screensaver_Notify_code, { "code", "x11.screensaver.Notify.code", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_Notify_code, { "code", "x11.screensaver.Notify.code", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_Notify_state, { "state", "x11.screensaver.Notify.state", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_Notify_sequence_number, { "sequence_number", "x11.screensaver.Notify.sequence_number", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_Notify_time, { "time", "x11.screensaver.Notify.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2934,7 +3006,7 @@ { &hf_x11_screensaver_Notify_forced, { "forced", "x11.screensaver.Notify.forced", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(screensaver_extension_minor), 0, "minor opcode", HFILL }}, -{ &hf_x11_shape_Notify_shape_kind, { "shape_kind", "x11.shape.Notify.shape_kind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shape_Notify_shape_kind, { "shape_kind", "x11.shape.Notify.shape_kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }}, { &hf_x11_shape_Notify_affected_window, { "affected_window", "x11.shape.Notify.affected_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Notify_extents_x, { "extents_x", "x11.shape.Notify.extents_x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Notify_extents_y, { "extents_y", "x11.shape.Notify.extents_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -2944,28 +3016,28 @@ { &hf_x11_shape_Notify_shaped, { "shaped", "x11.shape.Notify.shaped", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_QueryVersion_reply_major_version, { "major_version", "x11.shape.QueryVersion.reply.major_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_QueryVersion_reply_minor_version, { "minor_version", "x11.shape.QueryVersion.reply.minor_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shape_Rectangles_operation, { "operation", "x11.shape.Rectangles.operation", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shape_Rectangles_destination_kind, { "destination_kind", "x11.shape.Rectangles.destination_kind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shape_Rectangles_ordering, { "ordering", "x11.shape.Rectangles.ordering", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shape_Rectangles_operation, { "operation", "x11.shape.Rectangles.operation", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SO), 0, NULL, HFILL }}, +{ &hf_x11_shape_Rectangles_destination_kind, { "destination_kind", "x11.shape.Rectangles.destination_kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }}, +{ &hf_x11_shape_Rectangles_ordering, { "ordering", "x11.shape.Rectangles.ordering", FT_UINT8, BASE_DEC, VALS(x11_enum_ClipOrdering), 0, NULL, HFILL }}, { &hf_x11_shape_Rectangles_destination_window, { "destination_window", "x11.shape.Rectangles.destination_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Rectangles_x_offset, { "x_offset", "x11.shape.Rectangles.x_offset", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Rectangles_y_offset, { "y_offset", "x11.shape.Rectangles.y_offset", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Rectangles_rectangles, { "rectangles", "x11.shape.Rectangles.rectangles", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Rectangles_rectangles_item, { "rectangles", "x11.shape.Rectangles.rectangles", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shape_Mask_operation, { "operation", "x11.shape.Mask.operation", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shape_Mask_destination_kind, { "destination_kind", "x11.shape.Mask.destination_kind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shape_Mask_operation, { "operation", "x11.shape.Mask.operation", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SO), 0, NULL, HFILL }}, +{ &hf_x11_shape_Mask_destination_kind, { "destination_kind", "x11.shape.Mask.destination_kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }}, { &hf_x11_shape_Mask_destination_window, { "destination_window", "x11.shape.Mask.destination_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Mask_x_offset, { "x_offset", "x11.shape.Mask.x_offset", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Mask_y_offset, { "y_offset", "x11.shape.Mask.y_offset", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shape_Mask_source_bitmap, { "source_bitmap", "x11.shape.Mask.source_bitmap", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shape_Combine_operation, { "operation", "x11.shape.Combine.operation", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shape_Combine_destination_kind, { "destination_kind", "x11.shape.Combine.destination_kind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shape_Combine_source_kind, { "source_kind", "x11.shape.Combine.source_kind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shape_Mask_source_bitmap, { "source_bitmap", "x11.shape.Mask.source_bitmap", FT_UINT32, BASE_HEX, VALS(x11_enum_Pixmap), 0, NULL, HFILL }}, +{ &hf_x11_shape_Combine_operation, { "operation", "x11.shape.Combine.operation", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SO), 0, NULL, HFILL }}, +{ &hf_x11_shape_Combine_destination_kind, { "destination_kind", "x11.shape.Combine.destination_kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }}, +{ &hf_x11_shape_Combine_source_kind, { "source_kind", "x11.shape.Combine.source_kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }}, { &hf_x11_shape_Combine_destination_window, { "destination_window", "x11.shape.Combine.destination_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Combine_x_offset, { "x_offset", "x11.shape.Combine.x_offset", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Combine_y_offset, { "y_offset", "x11.shape.Combine.y_offset", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Combine_source_window, { "source_window", "x11.shape.Combine.source_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shape_Offset_destination_kind, { "destination_kind", "x11.shape.Offset.destination_kind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shape_Offset_destination_kind, { "destination_kind", "x11.shape.Offset.destination_kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }}, { &hf_x11_shape_Offset_destination_window, { "destination_window", "x11.shape.Offset.destination_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Offset_x_offset, { "x_offset", "x11.shape.Offset.x_offset", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_Offset_y_offset, { "y_offset", "x11.shape.Offset.y_offset", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -2985,8 +3057,8 @@ { &hf_x11_shape_InputSelected_destination_window, { "destination_window", "x11.shape.InputSelected.destination_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_InputSelected_reply_enabled, { "enabled", "x11.shape.InputSelected.reply.enabled", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_GetRectangles_window, { "window", "x11.shape.GetRectangles.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shape_GetRectangles_source_kind, { "source_kind", "x11.shape.GetRectangles.source_kind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shape_GetRectangles_reply_ordering, { "ordering", "x11.shape.GetRectangles.reply.ordering", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shape_GetRectangles_source_kind, { "source_kind", "x11.shape.GetRectangles.source_kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }}, +{ &hf_x11_shape_GetRectangles_reply_ordering, { "ordering", "x11.shape.GetRectangles.reply.ordering", FT_UINT8, BASE_DEC, VALS(x11_enum_ClipOrdering), 0, NULL, HFILL }}, { &hf_x11_shape_GetRectangles_reply_rectangles_len, { "rectangles_len", "x11.shape.GetRectangles.reply.rectangles_len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_GetRectangles_reply_rectangles, { "rectangles", "x11.shape.GetRectangles.reply.rectangles", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_shape_GetRectangles_reply_rectangles_item, { "rectangles", "x11.shape.GetRectangles.reply.rectangles", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -3002,7 +3074,7 @@ { &hf_x11_shm_QueryVersion_reply_minor_version, { "minor_version", "x11.shm.QueryVersion.reply.minor_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_QueryVersion_reply_uid, { "uid", "x11.shm.QueryVersion.reply.uid", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_QueryVersion_reply_gid, { "gid", "x11.shm.QueryVersion.reply.gid", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shm_QueryVersion_reply_pixmap_format, { "pixmap_format", "x11.shm.QueryVersion.reply.pixmap_format", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shm_QueryVersion_reply_pixmap_format, { "pixmap_format", "x11.shm.QueryVersion.reply.pixmap_format", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_Attach_shmseg, { "shmseg", "x11.shm.Attach.shmseg", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_Attach_shmid, { "shmid", "x11.shm.Attach.shmid", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_Attach_read_only, { "read_only", "x11.shm.Attach.read_only", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -3017,9 +3089,9 @@ { &hf_x11_shm_PutImage_src_height, { "src_height", "x11.shm.PutImage.src_height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_PutImage_dst_x, { "dst_x", "x11.shm.PutImage.dst_x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_PutImage_dst_y, { "dst_y", "x11.shm.PutImage.dst_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shm_PutImage_depth, { "depth", "x11.shm.PutImage.depth", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shm_PutImage_format, { "format", "x11.shm.PutImage.format", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shm_PutImage_send_event, { "send_event", "x11.shm.PutImage.send_event", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shm_PutImage_depth, { "depth", "x11.shm.PutImage.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shm_PutImage_format, { "format", "x11.shm.PutImage.format", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shm_PutImage_send_event, { "send_event", "x11.shm.PutImage.send_event", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_PutImage_shmseg, { "shmseg", "x11.shm.PutImage.shmseg", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_PutImage_offset, { "offset", "x11.shm.PutImage.offset", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_GetImage_drawable, { "drawable", "x11.shm.GetImage.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -3028,17 +3100,17 @@ { &hf_x11_shm_GetImage_width, { "width", "x11.shm.GetImage.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_GetImage_height, { "height", "x11.shm.GetImage.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_GetImage_plane_mask, { "plane_mask", "x11.shm.GetImage.plane_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shm_GetImage_format, { "format", "x11.shm.GetImage.format", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shm_GetImage_format, { "format", "x11.shm.GetImage.format", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_GetImage_shmseg, { "shmseg", "x11.shm.GetImage.shmseg", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_GetImage_offset, { "offset", "x11.shm.GetImage.offset", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shm_GetImage_reply_depth, { "depth", "x11.shm.GetImage.reply.depth", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shm_GetImage_reply_depth, { "depth", "x11.shm.GetImage.reply.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_GetImage_reply_visual, { "visual", "x11.shm.GetImage.reply.visual", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_GetImage_reply_size, { "size", "x11.shm.GetImage.reply.size", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_CreatePixmap_pid, { "pid", "x11.shm.CreatePixmap.pid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_CreatePixmap_drawable, { "drawable", "x11.shm.CreatePixmap.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_CreatePixmap_width, { "width", "x11.shm.CreatePixmap.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_CreatePixmap_height, { "height", "x11.shm.CreatePixmap.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shm_CreatePixmap_depth, { "depth", "x11.shm.CreatePixmap.depth", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shm_CreatePixmap_depth, { "depth", "x11.shm.CreatePixmap.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_CreatePixmap_shmseg, { "shmseg", "x11.shm.CreatePixmap.shmseg", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_CreatePixmap_offset, { "offset", "x11.shm.CreatePixmap.offset", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(shm_extension_minor), 0, "minor opcode", HFILL }}, @@ -3053,16 +3125,16 @@ { &hf_x11_struct_SYSTEMCOUNTER_name, { "name", "x11.struct.SYSTEMCOUNTER.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_TRIGGER, { "TRIGGER", "x11.struct.TRIGGER", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_TRIGGER_counter, { "counter", "x11.struct.TRIGGER.counter", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_TRIGGER_wait_type, { "wait_type", "x11.struct.TRIGGER.wait_type", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_TRIGGER_wait_type, { "wait_type", "x11.struct.TRIGGER.wait_type", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_VALUETYPE), 0, NULL, HFILL }}, { &hf_x11_struct_TRIGGER_wait_value, { "wait_value", "x11.struct.TRIGGER.wait_value", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_TRIGGER_test_type, { "test_type", "x11.struct.TRIGGER.test_type", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_TRIGGER_test_type, { "test_type", "x11.struct.TRIGGER.test_type", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_TESTTYPE), 0, NULL, HFILL }}, { &hf_x11_struct_WAITCONDITION, { "WAITCONDITION", "x11.struct.WAITCONDITION", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_WAITCONDITION_trigger, { "trigger", "x11.struct.WAITCONDITION.trigger", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_WAITCONDITION_event_threshold, { "event_threshold", "x11.struct.WAITCONDITION.event_threshold", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_sync_Initialize_desired_major_version, { "desired_major_version", "x11.sync.Initialize.desired_major_version", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_sync_Initialize_desired_minor_version, { "desired_minor_version", "x11.sync.Initialize.desired_minor_version", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_sync_Initialize_reply_major_version, { "major_version", "x11.sync.Initialize.reply.major_version", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_sync_Initialize_reply_minor_version, { "minor_version", "x11.sync.Initialize.reply.minor_version", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_sync_Initialize_desired_major_version, { "desired_major_version", "x11.sync.Initialize.desired_major_version", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_sync_Initialize_desired_minor_version, { "desired_minor_version", "x11.sync.Initialize.desired_minor_version", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_sync_Initialize_reply_major_version, { "major_version", "x11.sync.Initialize.reply.major_version", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_sync_Initialize_reply_minor_version, { "minor_version", "x11.sync.Initialize.reply.minor_version", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_sync_ListSystemCounters_reply_counters_len, { "counters_len", "x11.sync.ListSystemCounters.reply.counters_len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_sync_ListSystemCounters_reply_counters, { "counters", "x11.sync.ListSystemCounters.reply.counters", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_sync_CreateCounter_id, { "id", "x11.sync.CreateCounter.id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -3083,24 +3155,24 @@ { &hf_x11_sync_QueryAlarm_reply_trigger, { "trigger", "x11.sync.QueryAlarm.reply.trigger", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_sync_QueryAlarm_reply_delta, { "delta", "x11.sync.QueryAlarm.reply.delta", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_sync_QueryAlarm_reply_events, { "events", "x11.sync.QueryAlarm.reply.events", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_sync_QueryAlarm_reply_state, { "state", "x11.sync.QueryAlarm.reply.state", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_sync_QueryAlarm_reply_state, { "state", "x11.sync.QueryAlarm.reply.state", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_ALARMSTATE), 0, NULL, HFILL }}, { &hf_x11_sync_SetPriority_id, { "id", "x11.sync.SetPriority.id", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &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_CounterNotify_kind, { "kind", "x11.sync.CounterNotify.kind", FT_BYTES, BASE_NONE, 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 }}, { &hf_x11_sync_CounterNotify_counter_value, { "counter_value", "x11.sync.CounterNotify.counter_value", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_sync_CounterNotify_timestamp, { "timestamp", "x11.sync.CounterNotify.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_sync_CounterNotify_count, { "count", "x11.sync.CounterNotify.count", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_sync_CounterNotify_destroyed, { "destroyed", "x11.sync.CounterNotify.destroyed", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_sync_AlarmNotify_kind, { "kind", "x11.sync.AlarmNotify.kind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_sync_AlarmNotify_kind, { "kind", "x11.sync.AlarmNotify.kind", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_sync_AlarmNotify_alarm, { "alarm", "x11.sync.AlarmNotify.alarm", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_sync_AlarmNotify_counter_value, { "counter_value", "x11.sync.AlarmNotify.counter_value", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_sync_AlarmNotify_alarm_value, { "alarm_value", "x11.sync.AlarmNotify.alarm_value", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_sync_AlarmNotify_timestamp, { "timestamp", "x11.sync.AlarmNotify.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_sync_AlarmNotify_state, { "state", "x11.sync.AlarmNotify.state", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_sync_AlarmNotify_state, { "state", "x11.sync.AlarmNotify.state", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_ALARMSTATE), 0, NULL, HFILL }}, { &hf_x11_sync_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(sync_extension_minor), 0, "minor opcode", HFILL }}, { &hf_x11_xc_misc_GetVersion_client_major_version, { "client_major_version", "x11.xc_misc.GetVersion.client_major_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3200,9 +3272,23 @@ { &hf_x11_xf86vidmode_GetModeLine_reply_vsyncstart, { "vsyncstart", "x11.xf86vidmode.GetModeLine.reply.vsyncstart", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetModeLine_reply_vsyncend, { "vsyncend", "x11.xf86vidmode.GetModeLine.reply.vsyncend", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetModeLine_reply_vtotal, { "vtotal", "x11.xf86vidmode.GetModeLine.reply.vtotal", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HsyncPositive, { "HsyncPositive", "x11.xf86vidmode.GetModeLine.reply.flags.HsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HsyncNegative, { "HsyncNegative", "x11.xf86vidmode.GetModeLine.reply.flags.HsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_VsyncPositive, { "VsyncPositive", "x11.xf86vidmode.GetModeLine.reply.flags.VsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_VsyncNegative, { "VsyncNegative", "x11.xf86vidmode.GetModeLine.reply.flags.VsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Interlace, { "Interlace", "x11.xf86vidmode.GetModeLine.reply.flags.Interlace", FT_BOOLEAN, 32, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_DoubleScan, { "DoubleScan", "x11.xf86vidmode.GetModeLine.reply.flags.DoubleScan", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Csync, { "Csync", "x11.xf86vidmode.GetModeLine.reply.flags.Csync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_CsyncPositive, { "CsyncPositive", "x11.xf86vidmode.GetModeLine.reply.flags.CsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_CsyncNegative, { "CsyncNegative", "x11.xf86vidmode.GetModeLine.reply.flags.CsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HskewPresent, { "HskewPresent", "x11.xf86vidmode.GetModeLine.reply.flags.HskewPresent", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Bcast, { "Bcast", "x11.xf86vidmode.GetModeLine.reply.flags.Bcast", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_PixelMultiplex, { "PixelMultiplex", "x11.xf86vidmode.GetModeLine.reply.flags.PixelMultiplex", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_DoubleClock, { "DoubleClock", "x11.xf86vidmode.GetModeLine.reply.flags.DoubleClock", FT_BOOLEAN, 32, NULL, 1 << 12, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HalveClock, { "HalveClock", "x11.xf86vidmode.GetModeLine.reply.flags.HalveClock", FT_BOOLEAN, 32, NULL, 1 << 13, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetModeLine_reply_flags, { "flags", "x11.xf86vidmode.GetModeLine.reply.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetModeLine_reply_privsize, { "privsize", "x11.xf86vidmode.GetModeLine.reply.privsize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xf86vidmode_GetModeLine_reply_private, { "private", "x11.xf86vidmode.GetModeLine.reply.private", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetModeLine_reply_private, { "private", "x11.xf86vidmode.GetModeLine.reply.private", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ModModeLine_screen, { "screen", "x11.xf86vidmode.ModModeLine.screen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ModModeLine_hdisplay, { "hdisplay", "x11.xf86vidmode.ModModeLine.hdisplay", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ModModeLine_hsyncstart, { "hsyncstart", "x11.xf86vidmode.ModModeLine.hsyncstart", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3213,16 +3299,30 @@ { &hf_x11_xf86vidmode_ModModeLine_vsyncstart, { "vsyncstart", "x11.xf86vidmode.ModModeLine.vsyncstart", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ModModeLine_vsyncend, { "vsyncend", "x11.xf86vidmode.ModModeLine.vsyncend", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ModModeLine_vtotal, { "vtotal", "x11.xf86vidmode.ModModeLine.vtotal", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_HsyncPositive, { "HsyncPositive", "x11.xf86vidmode.ModModeLine.flags.HsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_HsyncNegative, { "HsyncNegative", "x11.xf86vidmode.ModModeLine.flags.HsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_VsyncPositive, { "VsyncPositive", "x11.xf86vidmode.ModModeLine.flags.VsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_VsyncNegative, { "VsyncNegative", "x11.xf86vidmode.ModModeLine.flags.VsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_Interlace, { "Interlace", "x11.xf86vidmode.ModModeLine.flags.Interlace", FT_BOOLEAN, 32, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_DoubleScan, { "DoubleScan", "x11.xf86vidmode.ModModeLine.flags.DoubleScan", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_Csync, { "Csync", "x11.xf86vidmode.ModModeLine.flags.Csync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_CsyncPositive, { "CsyncPositive", "x11.xf86vidmode.ModModeLine.flags.CsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_CsyncNegative, { "CsyncNegative", "x11.xf86vidmode.ModModeLine.flags.CsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_HskewPresent, { "HskewPresent", "x11.xf86vidmode.ModModeLine.flags.HskewPresent", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_Bcast, { "Bcast", "x11.xf86vidmode.ModModeLine.flags.Bcast", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_PixelMultiplex, { "PixelMultiplex", "x11.xf86vidmode.ModModeLine.flags.PixelMultiplex", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_DoubleClock, { "DoubleClock", "x11.xf86vidmode.ModModeLine.flags.DoubleClock", FT_BOOLEAN, 32, NULL, 1 << 12, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_HalveClock, { "HalveClock", "x11.xf86vidmode.ModModeLine.flags.HalveClock", FT_BOOLEAN, 32, NULL, 1 << 13, NULL, HFILL }}, { &hf_x11_xf86vidmode_ModModeLine_flags, { "flags", "x11.xf86vidmode.ModModeLine.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ModModeLine_privsize, { "privsize", "x11.xf86vidmode.ModModeLine.privsize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xf86vidmode_ModModeLine_private, { "private", "x11.xf86vidmode.ModModeLine.private", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ModModeLine_private, { "private", "x11.xf86vidmode.ModModeLine.private", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_SwitchMode_screen, { "screen", "x11.xf86vidmode.SwitchMode.screen", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_SwitchMode_zoom, { "zoom", "x11.xf86vidmode.SwitchMode.zoom", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetMonitor_screen, { "screen", "x11.xf86vidmode.GetMonitor.screen", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xf86vidmode_GetMonitor_reply_vendor_length, { "vendor_length", "x11.xf86vidmode.GetMonitor.reply.vendor_length", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xf86vidmode_GetMonitor_reply_model_length, { "model_length", "x11.xf86vidmode.GetMonitor.reply.model_length", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xf86vidmode_GetMonitor_reply_num_hsync, { "num_hsync", "x11.xf86vidmode.GetMonitor.reply.num_hsync", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xf86vidmode_GetMonitor_reply_num_vsync, { "num_vsync", "x11.xf86vidmode.GetMonitor.reply.num_vsync", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetMonitor_reply_vendor_length, { "vendor_length", "x11.xf86vidmode.GetMonitor.reply.vendor_length", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetMonitor_reply_model_length, { "model_length", "x11.xf86vidmode.GetMonitor.reply.model_length", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetMonitor_reply_num_hsync, { "num_hsync", "x11.xf86vidmode.GetMonitor.reply.num_hsync", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetMonitor_reply_num_vsync, { "num_vsync", "x11.xf86vidmode.GetMonitor.reply.num_vsync", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetMonitor_reply_hsync, { "hsync", "x11.xf86vidmode.GetMonitor.reply.hsync", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetMonitor_reply_hsync_item, { "hsync", "x11.xf86vidmode.GetMonitor.reply.hsync", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetMonitor_reply_vsync, { "vsync", "x11.xf86vidmode.GetMonitor.reply.vsync", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -3247,6 +3347,20 @@ { &hf_x11_xf86vidmode_AddModeLine_vsyncstart, { "vsyncstart", "x11.xf86vidmode.AddModeLine.vsyncstart", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_AddModeLine_vsyncend, { "vsyncend", "x11.xf86vidmode.AddModeLine.vsyncend", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_AddModeLine_vtotal, { "vtotal", "x11.xf86vidmode.AddModeLine.vtotal", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_HsyncPositive, { "HsyncPositive", "x11.xf86vidmode.AddModeLine.flags.HsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_HsyncNegative, { "HsyncNegative", "x11.xf86vidmode.AddModeLine.flags.HsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_VsyncPositive, { "VsyncPositive", "x11.xf86vidmode.AddModeLine.flags.VsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_VsyncNegative, { "VsyncNegative", "x11.xf86vidmode.AddModeLine.flags.VsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_Interlace, { "Interlace", "x11.xf86vidmode.AddModeLine.flags.Interlace", FT_BOOLEAN, 32, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_DoubleScan, { "DoubleScan", "x11.xf86vidmode.AddModeLine.flags.DoubleScan", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_Csync, { "Csync", "x11.xf86vidmode.AddModeLine.flags.Csync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_CsyncPositive, { "CsyncPositive", "x11.xf86vidmode.AddModeLine.flags.CsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_CsyncNegative, { "CsyncNegative", "x11.xf86vidmode.AddModeLine.flags.CsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_HskewPresent, { "HskewPresent", "x11.xf86vidmode.AddModeLine.flags.HskewPresent", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_Bcast, { "Bcast", "x11.xf86vidmode.AddModeLine.flags.Bcast", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_PixelMultiplex, { "PixelMultiplex", "x11.xf86vidmode.AddModeLine.flags.PixelMultiplex", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_DoubleClock, { "DoubleClock", "x11.xf86vidmode.AddModeLine.flags.DoubleClock", FT_BOOLEAN, 32, NULL, 1 << 12, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_HalveClock, { "HalveClock", "x11.xf86vidmode.AddModeLine.flags.HalveClock", FT_BOOLEAN, 32, NULL, 1 << 13, NULL, HFILL }}, { &hf_x11_xf86vidmode_AddModeLine_flags, { "flags", "x11.xf86vidmode.AddModeLine.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_AddModeLine_privsize, { "privsize", "x11.xf86vidmode.AddModeLine.privsize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_AddModeLine_after_dotclock, { "after_dotclock", "x11.xf86vidmode.AddModeLine.after_dotclock", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3259,8 +3373,22 @@ { &hf_x11_xf86vidmode_AddModeLine_after_vsyncstart, { "after_vsyncstart", "x11.xf86vidmode.AddModeLine.after_vsyncstart", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_AddModeLine_after_vsyncend, { "after_vsyncend", "x11.xf86vidmode.AddModeLine.after_vsyncend", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_AddModeLine_after_vtotal, { "after_vtotal", "x11.xf86vidmode.AddModeLine.after_vtotal", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HsyncPositive, { "HsyncPositive", "x11.xf86vidmode.AddModeLine.after_flags.HsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HsyncNegative, { "HsyncNegative", "x11.xf86vidmode.AddModeLine.after_flags.HsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_VsyncPositive, { "VsyncPositive", "x11.xf86vidmode.AddModeLine.after_flags.VsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_VsyncNegative, { "VsyncNegative", "x11.xf86vidmode.AddModeLine.after_flags.VsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Interlace, { "Interlace", "x11.xf86vidmode.AddModeLine.after_flags.Interlace", FT_BOOLEAN, 32, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_DoubleScan, { "DoubleScan", "x11.xf86vidmode.AddModeLine.after_flags.DoubleScan", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Csync, { "Csync", "x11.xf86vidmode.AddModeLine.after_flags.Csync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_CsyncPositive, { "CsyncPositive", "x11.xf86vidmode.AddModeLine.after_flags.CsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_CsyncNegative, { "CsyncNegative", "x11.xf86vidmode.AddModeLine.after_flags.CsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HskewPresent, { "HskewPresent", "x11.xf86vidmode.AddModeLine.after_flags.HskewPresent", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Bcast, { "Bcast", "x11.xf86vidmode.AddModeLine.after_flags.Bcast", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_PixelMultiplex, { "PixelMultiplex", "x11.xf86vidmode.AddModeLine.after_flags.PixelMultiplex", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_DoubleClock, { "DoubleClock", "x11.xf86vidmode.AddModeLine.after_flags.DoubleClock", FT_BOOLEAN, 32, NULL, 1 << 12, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HalveClock, { "HalveClock", "x11.xf86vidmode.AddModeLine.after_flags.HalveClock", FT_BOOLEAN, 32, NULL, 1 << 13, NULL, HFILL }}, { &hf_x11_xf86vidmode_AddModeLine_after_flags, { "after_flags", "x11.xf86vidmode.AddModeLine.after_flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xf86vidmode_AddModeLine_private, { "private", "x11.xf86vidmode.AddModeLine.private", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_AddModeLine_private, { "private", "x11.xf86vidmode.AddModeLine.private", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_DeleteModeLine_screen, { "screen", "x11.xf86vidmode.DeleteModeLine.screen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_DeleteModeLine_dotclock, { "dotclock", "x11.xf86vidmode.DeleteModeLine.dotclock", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_DeleteModeLine_hdisplay, { "hdisplay", "x11.xf86vidmode.DeleteModeLine.hdisplay", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3272,9 +3400,23 @@ { &hf_x11_xf86vidmode_DeleteModeLine_vsyncstart, { "vsyncstart", "x11.xf86vidmode.DeleteModeLine.vsyncstart", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_DeleteModeLine_vsyncend, { "vsyncend", "x11.xf86vidmode.DeleteModeLine.vsyncend", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_DeleteModeLine_vtotal, { "vtotal", "x11.xf86vidmode.DeleteModeLine.vtotal", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HsyncPositive, { "HsyncPositive", "x11.xf86vidmode.DeleteModeLine.flags.HsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HsyncNegative, { "HsyncNegative", "x11.xf86vidmode.DeleteModeLine.flags.HsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_VsyncPositive, { "VsyncPositive", "x11.xf86vidmode.DeleteModeLine.flags.VsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_VsyncNegative, { "VsyncNegative", "x11.xf86vidmode.DeleteModeLine.flags.VsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Interlace, { "Interlace", "x11.xf86vidmode.DeleteModeLine.flags.Interlace", FT_BOOLEAN, 32, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_DoubleScan, { "DoubleScan", "x11.xf86vidmode.DeleteModeLine.flags.DoubleScan", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Csync, { "Csync", "x11.xf86vidmode.DeleteModeLine.flags.Csync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_CsyncPositive, { "CsyncPositive", "x11.xf86vidmode.DeleteModeLine.flags.CsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_CsyncNegative, { "CsyncNegative", "x11.xf86vidmode.DeleteModeLine.flags.CsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HskewPresent, { "HskewPresent", "x11.xf86vidmode.DeleteModeLine.flags.HskewPresent", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Bcast, { "Bcast", "x11.xf86vidmode.DeleteModeLine.flags.Bcast", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_PixelMultiplex, { "PixelMultiplex", "x11.xf86vidmode.DeleteModeLine.flags.PixelMultiplex", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_DoubleClock, { "DoubleClock", "x11.xf86vidmode.DeleteModeLine.flags.DoubleClock", FT_BOOLEAN, 32, NULL, 1 << 12, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HalveClock, { "HalveClock", "x11.xf86vidmode.DeleteModeLine.flags.HalveClock", FT_BOOLEAN, 32, NULL, 1 << 13, NULL, HFILL }}, { &hf_x11_xf86vidmode_DeleteModeLine_flags, { "flags", "x11.xf86vidmode.DeleteModeLine.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_DeleteModeLine_privsize, { "privsize", "x11.xf86vidmode.DeleteModeLine.privsize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xf86vidmode_DeleteModeLine_private, { "private", "x11.xf86vidmode.DeleteModeLine.private", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_DeleteModeLine_private, { "private", "x11.xf86vidmode.DeleteModeLine.private", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ValidateModeLine_screen, { "screen", "x11.xf86vidmode.ValidateModeLine.screen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ValidateModeLine_dotclock, { "dotclock", "x11.xf86vidmode.ValidateModeLine.dotclock", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ValidateModeLine_hdisplay, { "hdisplay", "x11.xf86vidmode.ValidateModeLine.hdisplay", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3286,9 +3428,23 @@ { &hf_x11_xf86vidmode_ValidateModeLine_vsyncstart, { "vsyncstart", "x11.xf86vidmode.ValidateModeLine.vsyncstart", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ValidateModeLine_vsyncend, { "vsyncend", "x11.xf86vidmode.ValidateModeLine.vsyncend", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ValidateModeLine_vtotal, { "vtotal", "x11.xf86vidmode.ValidateModeLine.vtotal", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HsyncPositive, { "HsyncPositive", "x11.xf86vidmode.ValidateModeLine.flags.HsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HsyncNegative, { "HsyncNegative", "x11.xf86vidmode.ValidateModeLine.flags.HsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_VsyncPositive, { "VsyncPositive", "x11.xf86vidmode.ValidateModeLine.flags.VsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_VsyncNegative, { "VsyncNegative", "x11.xf86vidmode.ValidateModeLine.flags.VsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Interlace, { "Interlace", "x11.xf86vidmode.ValidateModeLine.flags.Interlace", FT_BOOLEAN, 32, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_DoubleScan, { "DoubleScan", "x11.xf86vidmode.ValidateModeLine.flags.DoubleScan", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Csync, { "Csync", "x11.xf86vidmode.ValidateModeLine.flags.Csync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_CsyncPositive, { "CsyncPositive", "x11.xf86vidmode.ValidateModeLine.flags.CsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_CsyncNegative, { "CsyncNegative", "x11.xf86vidmode.ValidateModeLine.flags.CsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HskewPresent, { "HskewPresent", "x11.xf86vidmode.ValidateModeLine.flags.HskewPresent", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Bcast, { "Bcast", "x11.xf86vidmode.ValidateModeLine.flags.Bcast", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_PixelMultiplex, { "PixelMultiplex", "x11.xf86vidmode.ValidateModeLine.flags.PixelMultiplex", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_DoubleClock, { "DoubleClock", "x11.xf86vidmode.ValidateModeLine.flags.DoubleClock", FT_BOOLEAN, 32, NULL, 1 << 12, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HalveClock, { "HalveClock", "x11.xf86vidmode.ValidateModeLine.flags.HalveClock", FT_BOOLEAN, 32, NULL, 1 << 13, NULL, HFILL }}, { &hf_x11_xf86vidmode_ValidateModeLine_flags, { "flags", "x11.xf86vidmode.ValidateModeLine.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ValidateModeLine_privsize, { "privsize", "x11.xf86vidmode.ValidateModeLine.privsize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xf86vidmode_ValidateModeLine_private, { "private", "x11.xf86vidmode.ValidateModeLine.private", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_ValidateModeLine_private, { "private", "x11.xf86vidmode.ValidateModeLine.private", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_ValidateModeLine_reply_status, { "status", "x11.xf86vidmode.ValidateModeLine.reply.status", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_SwitchToMode_screen, { "screen", "x11.xf86vidmode.SwitchToMode.screen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_SwitchToMode_dotclock, { "dotclock", "x11.xf86vidmode.SwitchToMode.dotclock", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3301,9 +3457,23 @@ { &hf_x11_xf86vidmode_SwitchToMode_vsyncstart, { "vsyncstart", "x11.xf86vidmode.SwitchToMode.vsyncstart", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_SwitchToMode_vsyncend, { "vsyncend", "x11.xf86vidmode.SwitchToMode.vsyncend", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_SwitchToMode_vtotal, { "vtotal", "x11.xf86vidmode.SwitchToMode.vtotal", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_HsyncPositive, { "HsyncPositive", "x11.xf86vidmode.SwitchToMode.flags.HsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_HsyncNegative, { "HsyncNegative", "x11.xf86vidmode.SwitchToMode.flags.HsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_VsyncPositive, { "VsyncPositive", "x11.xf86vidmode.SwitchToMode.flags.VsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_VsyncNegative, { "VsyncNegative", "x11.xf86vidmode.SwitchToMode.flags.VsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Interlace, { "Interlace", "x11.xf86vidmode.SwitchToMode.flags.Interlace", FT_BOOLEAN, 32, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_DoubleScan, { "DoubleScan", "x11.xf86vidmode.SwitchToMode.flags.DoubleScan", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Csync, { "Csync", "x11.xf86vidmode.SwitchToMode.flags.Csync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_CsyncPositive, { "CsyncPositive", "x11.xf86vidmode.SwitchToMode.flags.CsyncPositive", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_CsyncNegative, { "CsyncNegative", "x11.xf86vidmode.SwitchToMode.flags.CsyncNegative", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_HskewPresent, { "HskewPresent", "x11.xf86vidmode.SwitchToMode.flags.HskewPresent", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Bcast, { "Bcast", "x11.xf86vidmode.SwitchToMode.flags.Bcast", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_PixelMultiplex, { "PixelMultiplex", "x11.xf86vidmode.SwitchToMode.flags.PixelMultiplex", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_DoubleClock, { "DoubleClock", "x11.xf86vidmode.SwitchToMode.flags.DoubleClock", FT_BOOLEAN, 32, NULL, 1 << 12, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_HalveClock, { "HalveClock", "x11.xf86vidmode.SwitchToMode.flags.HalveClock", FT_BOOLEAN, 32, NULL, 1 << 13, NULL, HFILL }}, { &hf_x11_xf86vidmode_SwitchToMode_flags, { "flags", "x11.xf86vidmode.SwitchToMode.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_SwitchToMode_privsize, { "privsize", "x11.xf86vidmode.SwitchToMode.privsize", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xf86vidmode_SwitchToMode_private, { "private", "x11.xf86vidmode.SwitchToMode.private", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_SwitchToMode_private, { "private", "x11.xf86vidmode.SwitchToMode.private", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetViewPort_screen, { "screen", "x11.xf86vidmode.GetViewPort.screen", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetViewPort_reply_x, { "x", "x11.xf86vidmode.GetViewPort.reply.x", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetViewPort_reply_y, { "y", "x11.xf86vidmode.GetViewPort.reply.y", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3311,6 +3481,7 @@ { &hf_x11_xf86vidmode_SetViewPort_x, { "x", "x11.xf86vidmode.SetViewPort.x", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_SetViewPort_y, { "y", "x11.xf86vidmode.SetViewPort.y", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetDotClocks_screen, { "screen", "x11.xf86vidmode.GetDotClocks.screen", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetDotClocks_reply_flags_mask_Programable, { "Programable", "x11.xf86vidmode.GetDotClocks.reply.flags.Programable", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetDotClocks_reply_flags, { "flags", "x11.xf86vidmode.GetDotClocks.reply.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetDotClocks_reply_clocks, { "clocks", "x11.xf86vidmode.GetDotClocks.reply.clocks", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetDotClocks_reply_maxclocks, { "maxclocks", "x11.xf86vidmode.GetDotClocks.reply.maxclocks", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3346,6 +3517,8 @@ { &hf_x11_xf86vidmode_GetGammaRampSize_screen, { "screen", "x11.xf86vidmode.GetGammaRampSize.screen", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetGammaRampSize_reply_size, { "size", "x11.xf86vidmode.GetGammaRampSize.reply.size", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetPermissions_screen, { "screen", "x11.xf86vidmode.GetPermissions.screen", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetPermissions_reply_permissions_mask_Read, { "Read", "x11.xf86vidmode.GetPermissions.reply.permissions.Read", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xf86vidmode_GetPermissions_reply_permissions_mask_Write, { "Write", "x11.xf86vidmode.GetPermissions.reply.permissions.Write", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }}, { &hf_x11_xf86vidmode_GetPermissions_reply_permissions, { "permissions", "x11.xf86vidmode.GetPermissions.reply.permissions", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xf86vidmode_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(xf86vidmode_extension_minor), 0, "minor opcode", HFILL }}, @@ -3353,11 +3526,11 @@ { &hf_x11_xfixes_QueryVersion_client_minor_version, { "client_minor_version", "x11.xfixes.QueryVersion.client_minor_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_QueryVersion_reply_major_version, { "major_version", "x11.xfixes.QueryVersion.reply.major_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_QueryVersion_reply_minor_version, { "minor_version", "x11.xfixes.QueryVersion.reply.minor_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_ChangeSaveSet_mode, { "mode", "x11.xfixes.ChangeSaveSet.mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_ChangeSaveSet_target, { "target", "x11.xfixes.ChangeSaveSet.target", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_ChangeSaveSet_map, { "map", "x11.xfixes.ChangeSaveSet.map", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_ChangeSaveSet_mode, { "mode", "x11.xfixes.ChangeSaveSet.mode", FT_UINT8, BASE_DEC, VALS(x11_enum_SaveSetMode), 0, NULL, HFILL }}, +{ &hf_x11_xfixes_ChangeSaveSet_target, { "target", "x11.xfixes.ChangeSaveSet.target", FT_UINT8, BASE_DEC, VALS(x11_enum_SaveSetTarget), 0, NULL, HFILL }}, +{ &hf_x11_xfixes_ChangeSaveSet_map, { "map", "x11.xfixes.ChangeSaveSet.map", FT_UINT8, BASE_DEC, VALS(x11_enum_SaveSetMapping), 0, NULL, HFILL }}, { &hf_x11_xfixes_ChangeSaveSet_window, { "window", "x11.xfixes.ChangeSaveSet.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_SelectionNotify_subtype, { "subtype", "x11.xfixes.SelectionNotify.subtype", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_SelectionNotify_subtype, { "subtype", "x11.xfixes.SelectionNotify.subtype", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SelectionEvent), 0, NULL, HFILL }}, { &hf_x11_xfixes_SelectionNotify_window, { "window", "x11.xfixes.SelectionNotify.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_SelectionNotify_owner, { "owner", "x11.xfixes.SelectionNotify.owner", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_SelectionNotify_selection, { "selection", "x11.xfixes.SelectionNotify.selection", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -3365,13 +3538,17 @@ { &hf_x11_xfixes_SelectionNotify_selection_timestamp, { "selection_timestamp", "x11.xfixes.SelectionNotify.selection_timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_SelectSelectionInput_window, { "window", "x11.xfixes.SelectSelectionInput.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_SelectSelectionInput_selection, { "selection", "x11.xfixes.SelectSelectionInput.selection", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_SelectSelectionInput_event_mask_mask_SetSelectionOwner, { "SetSelectionOwner", "x11.xfixes.SelectSelectionInput.event_mask.SetSelectionOwner", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xfixes_SelectSelectionInput_event_mask_mask_SelectionWindowDestroy, { "SelectionWindowDestroy", "x11.xfixes.SelectSelectionInput.event_mask.SelectionWindowDestroy", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_xfixes_SelectSelectionInput_event_mask_mask_SelectionClientClose, { "SelectionClientClose", "x11.xfixes.SelectSelectionInput.event_mask.SelectionClientClose", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }}, { &hf_x11_xfixes_SelectSelectionInput_event_mask, { "event_mask", "x11.xfixes.SelectSelectionInput.event_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_CursorNotify_subtype, { "subtype", "x11.xfixes.CursorNotify.subtype", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_CursorNotify_subtype, { "subtype", "x11.xfixes.CursorNotify.subtype", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_CursorNotify), 0, NULL, HFILL }}, { &hf_x11_xfixes_CursorNotify_window, { "window", "x11.xfixes.CursorNotify.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_CursorNotify_cursor_serial, { "cursor_serial", "x11.xfixes.CursorNotify.cursor_serial", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_CursorNotify_timestamp, { "timestamp", "x11.xfixes.CursorNotify.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_CursorNotify_name, { "name", "x11.xfixes.CursorNotify.name", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_CursorNotify_name, { "name", "x11.xfixes.CursorNotify.name", FT_UINT32, BASE_HEX, VALS(x11_enum_Atom), 0, NULL, HFILL }}, { &hf_x11_xfixes_SelectCursorInput_window, { "window", "x11.xfixes.SelectCursorInput.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_SelectCursorInput_event_mask_mask_DisplayCursor, { "DisplayCursor", "x11.xfixes.SelectCursorInput.event_mask.DisplayCursor", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, { &hf_x11_xfixes_SelectCursorInput_event_mask, { "event_mask", "x11.xfixes.SelectCursorInput.event_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_GetCursorImage_reply_x, { "x", "x11.xfixes.GetCursorImage.reply.x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_GetCursorImage_reply_y, { "y", "x11.xfixes.GetCursorImage.reply.y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -3389,7 +3566,7 @@ { &hf_x11_xfixes_CreateRegionFromBitmap_bitmap, { "bitmap", "x11.xfixes.CreateRegionFromBitmap.bitmap", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_CreateRegionFromWindow_region, { "region", "x11.xfixes.CreateRegionFromWindow.region", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_CreateRegionFromWindow_window, { "window", "x11.xfixes.CreateRegionFromWindow.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_CreateRegionFromWindow_kind, { "kind", "x11.xfixes.CreateRegionFromWindow.kind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_CreateRegionFromWindow_kind, { "kind", "x11.xfixes.CreateRegionFromWindow.kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }}, { &hf_x11_xfixes_CreateRegionFromGC_region, { "region", "x11.xfixes.CreateRegionFromGC.region", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_CreateRegionFromGC_gc, { "gc", "x11.xfixes.CreateRegionFromGC.gc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_CreateRegionFromPicture_region, { "region", "x11.xfixes.CreateRegionFromPicture.region", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -3422,23 +3599,23 @@ { &hf_x11_xfixes_FetchRegion_reply_rectangles, { "rectangles", "x11.xfixes.FetchRegion.reply.rectangles", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_FetchRegion_reply_rectangles_item, { "rectangles", "x11.xfixes.FetchRegion.reply.rectangles", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_SetGCClipRegion_gc, { "gc", "x11.xfixes.SetGCClipRegion.gc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_SetGCClipRegion_region, { "region", "x11.xfixes.SetGCClipRegion.region", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_SetGCClipRegion_region, { "region", "x11.xfixes.SetGCClipRegion.region", FT_UINT32, BASE_HEX, VALS(x11_enum_Region), 0, NULL, HFILL }}, { &hf_x11_xfixes_SetGCClipRegion_x_origin, { "x_origin", "x11.xfixes.SetGCClipRegion.x_origin", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_SetGCClipRegion_y_origin, { "y_origin", "x11.xfixes.SetGCClipRegion.y_origin", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_SetWindowShapeRegion_dest, { "dest", "x11.xfixes.SetWindowShapeRegion.dest", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_SetWindowShapeRegion_dest_kind, { "dest_kind", "x11.xfixes.SetWindowShapeRegion.dest_kind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_SetWindowShapeRegion_dest_kind, { "dest_kind", "x11.xfixes.SetWindowShapeRegion.dest_kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }}, { &hf_x11_xfixes_SetWindowShapeRegion_x_offset, { "x_offset", "x11.xfixes.SetWindowShapeRegion.x_offset", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_SetWindowShapeRegion_y_offset, { "y_offset", "x11.xfixes.SetWindowShapeRegion.y_offset", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_SetWindowShapeRegion_region, { "region", "x11.xfixes.SetWindowShapeRegion.region", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_SetWindowShapeRegion_region, { "region", "x11.xfixes.SetWindowShapeRegion.region", FT_UINT32, BASE_HEX, VALS(x11_enum_Region), 0, NULL, HFILL }}, { &hf_x11_xfixes_SetPictureClipRegion_picture, { "picture", "x11.xfixes.SetPictureClipRegion.picture", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_SetPictureClipRegion_region, { "region", "x11.xfixes.SetPictureClipRegion.region", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_SetPictureClipRegion_region, { "region", "x11.xfixes.SetPictureClipRegion.region", FT_UINT32, BASE_HEX, VALS(x11_enum_Region), 0, NULL, HFILL }}, { &hf_x11_xfixes_SetPictureClipRegion_x_origin, { "x_origin", "x11.xfixes.SetPictureClipRegion.x_origin", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_SetPictureClipRegion_y_origin, { "y_origin", "x11.xfixes.SetPictureClipRegion.y_origin", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_SetCursorName_cursor, { "cursor", "x11.xfixes.SetCursorName.cursor", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_SetCursorName_nbytes, { "nbytes", "x11.xfixes.SetCursorName.nbytes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_SetCursorName_name, { "name", "x11.xfixes.SetCursorName.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_GetCursorName_cursor, { "cursor", "x11.xfixes.GetCursorName.cursor", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_GetCursorName_reply_atom, { "atom", "x11.xfixes.GetCursorName.reply.atom", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_GetCursorName_reply_atom, { "atom", "x11.xfixes.GetCursorName.reply.atom", FT_UINT32, BASE_HEX, VALS(x11_enum_Atom), 0, NULL, HFILL }}, { &hf_x11_xfixes_GetCursorName_reply_nbytes, { "nbytes", "x11.xfixes.GetCursorName.reply.nbytes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_GetCursorName_reply_name, { "name", "x11.xfixes.GetCursorName.reply.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_GetCursorImageAndName_reply_x, { "x", "x11.xfixes.GetCursorImageAndName.reply.x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -3448,7 +3625,7 @@ { &hf_x11_xfixes_GetCursorImageAndName_reply_xhot, { "xhot", "x11.xfixes.GetCursorImageAndName.reply.xhot", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_GetCursorImageAndName_reply_yhot, { "yhot", "x11.xfixes.GetCursorImageAndName.reply.yhot", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_GetCursorImageAndName_reply_cursor_serial, { "cursor_serial", "x11.xfixes.GetCursorImageAndName.reply.cursor_serial", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xfixes_GetCursorImageAndName_reply_cursor_atom, { "cursor_atom", "x11.xfixes.GetCursorImageAndName.reply.cursor_atom", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xfixes_GetCursorImageAndName_reply_cursor_atom, { "cursor_atom", "x11.xfixes.GetCursorImageAndName.reply.cursor_atom", FT_UINT32, BASE_HEX, VALS(x11_enum_Atom), 0, NULL, HFILL }}, { &hf_x11_xfixes_GetCursorImageAndName_reply_nbytes, { "nbytes", "x11.xfixes.GetCursorImageAndName.reply.nbytes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_GetCursorImageAndName_reply_name, { "name", "x11.xfixes.GetCursorImageAndName.reply.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_GetCursorImageAndName_reply_cursor_image, { "cursor_image", "x11.xfixes.GetCursorImageAndName.reply.cursor_image", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -3473,8 +3650,8 @@ { &hf_x11_struct_ScreenInfo_y_org, { "y_org", "x11.struct.ScreenInfo.y_org", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ScreenInfo_width, { "width", "x11.struct.ScreenInfo.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ScreenInfo_height, { "height", "x11.struct.ScreenInfo.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinerama_QueryVersion_major, { "major", "x11.xinerama.QueryVersion.major", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinerama_QueryVersion_minor, { "minor", "x11.xinerama.QueryVersion.minor", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinerama_QueryVersion_major, { "major", "x11.xinerama.QueryVersion.major", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinerama_QueryVersion_minor, { "minor", "x11.xinerama.QueryVersion.minor", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinerama_QueryVersion_reply_major, { "major", "x11.xinerama.QueryVersion.reply.major", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinerama_QueryVersion_reply_minor, { "minor", "x11.xinerama.QueryVersion.reply.minor", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinerama_GetState_window, { "window", "x11.xinerama.GetState.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -3502,23 +3679,23 @@ { &hf_x11_xinput_GetExtensionVersion_reply_present, { "present", "x11.xinput.GetExtensionVersion.reply.present", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_DeviceInfo, { "DeviceInfo", "x11.struct.DeviceInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_DeviceInfo_device_type, { "device_type", "x11.struct.DeviceInfo.device_type", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_DeviceInfo_device_id, { "device_id", "x11.struct.DeviceInfo.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_DeviceInfo_num_class_info, { "num_class_info", "x11.struct.DeviceInfo.num_class_info", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_DeviceInfo_device_use, { "device_use", "x11.struct.DeviceInfo.device_use", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ListInputDevices_reply_devices_len, { "devices_len", "x11.xinput.ListInputDevices.reply.devices_len", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_DeviceInfo_device_id, { "device_id", "x11.struct.DeviceInfo.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_DeviceInfo_num_class_info, { "num_class_info", "x11.struct.DeviceInfo.num_class_info", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_DeviceInfo_device_use, { "device_use", "x11.struct.DeviceInfo.device_use", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_DeviceUse), 0, NULL, HFILL }}, +{ &hf_x11_xinput_ListInputDevices_reply_devices_len, { "devices_len", "x11.xinput.ListInputDevices.reply.devices_len", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ListInputDevices_reply_devices, { "devices", "x11.xinput.ListInputDevices.reply.devices", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ListInputDevices_reply_devices_item, { "devices", "x11.xinput.ListInputDevices.reply.devices", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_InputClassInfo, { "InputClassInfo", "x11.struct.InputClassInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_InputClassInfo_class_id, { "class_id", "x11.struct.InputClassInfo.class_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_InputClassInfo_event_type_base, { "event_type_base", "x11.struct.InputClassInfo.event_type_base", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_OpenDevice_device_id, { "device_id", "x11.xinput.OpenDevice.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_OpenDevice_reply_num_classes, { "num_classes", "x11.xinput.OpenDevice.reply.num_classes", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_InputClassInfo_class_id, { "class_id", "x11.struct.InputClassInfo.class_id", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_InputClass), 0, NULL, HFILL }}, +{ &hf_x11_struct_InputClassInfo_event_type_base, { "event_type_base", "x11.struct.InputClassInfo.event_type_base", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_OpenDevice_device_id, { "device_id", "x11.xinput.OpenDevice.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_OpenDevice_reply_num_classes, { "num_classes", "x11.xinput.OpenDevice.reply.num_classes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_OpenDevice_reply_class_info, { "class_info", "x11.xinput.OpenDevice.reply.class_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_OpenDevice_reply_class_info_item, { "class_info", "x11.xinput.OpenDevice.reply.class_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_CloseDevice_device_id, { "device_id", "x11.xinput.CloseDevice.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceMode_device_id, { "device_id", "x11.xinput.SetDeviceMode.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceMode_mode, { "mode", "x11.xinput.SetDeviceMode.mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceMode_reply_status, { "status", "x11.xinput.SetDeviceMode.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_CloseDevice_device_id, { "device_id", "x11.xinput.CloseDevice.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceMode_device_id, { "device_id", "x11.xinput.SetDeviceMode.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceMode_mode, { "mode", "x11.xinput.SetDeviceMode.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_ValuatorMode), 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceMode_reply_status, { "status", "x11.xinput.SetDeviceMode.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabStatus), 0, NULL, HFILL }}, { &hf_x11_xinput_SelectExtensionEvent_window, { "window", "x11.xinput.SelectExtensionEvent.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SelectExtensionEvent_num_classes, { "num_classes", "x11.xinput.SelectExtensionEvent.num_classes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SelectExtensionEvent_classes, { "classes", "x11.xinput.SelectExtensionEvent.classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -3532,7 +3709,7 @@ { &hf_x11_xinput_GetSelectedExtensionEvents_reply_all_classes_item, { "all_classes", "x11.xinput.GetSelectedExtensionEvents.reply.all_classes", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceDontPropagateList_window, { "window", "x11.xinput.ChangeDeviceDontPropagateList.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceDontPropagateList_num_classes, { "num_classes", "x11.xinput.ChangeDeviceDontPropagateList.num_classes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangeDeviceDontPropagateList_mode, { "mode", "x11.xinput.ChangeDeviceDontPropagateList.mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeDeviceDontPropagateList_mode, { "mode", "x11.xinput.ChangeDeviceDontPropagateList.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_PropagateMode), 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceDontPropagateList_classes, { "classes", "x11.xinput.ChangeDeviceDontPropagateList.classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceDontPropagateList_classes_item, { "classes", "x11.xinput.ChangeDeviceDontPropagateList.classes", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceDontPropagateList_window, { "window", "x11.xinput.GetDeviceDontPropagateList.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -3540,168 +3717,204 @@ { &hf_x11_xinput_GetDeviceDontPropagateList_reply_classes, { "classes", "x11.xinput.GetDeviceDontPropagateList.reply.classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceDontPropagateList_reply_classes_item, { "classes", "x11.xinput.GetDeviceDontPropagateList.reply.classes", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceMotionEvents_start, { "start", "x11.xinput.GetDeviceMotionEvents.start", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceMotionEvents_stop, { "stop", "x11.xinput.GetDeviceMotionEvents.stop", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceMotionEvents_device_id, { "device_id", "x11.xinput.GetDeviceMotionEvents.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceMotionEvents_stop, { "stop", "x11.xinput.GetDeviceMotionEvents.stop", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_Time), 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceMotionEvents_device_id, { "device_id", "x11.xinput.GetDeviceMotionEvents.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceMotionEvents_reply_num_coords, { "num_coords", "x11.xinput.GetDeviceMotionEvents.reply.num_coords", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceMotionEvents_reply_num_axes, { "num_axes", "x11.xinput.GetDeviceMotionEvents.reply.num_axes", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceMotionEvents_reply_device_mode, { "device_mode", "x11.xinput.GetDeviceMotionEvents.reply.device_mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangeKeyboardDevice_device_id, { "device_id", "x11.xinput.ChangeKeyboardDevice.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangeKeyboardDevice_reply_status, { "status", "x11.xinput.ChangeKeyboardDevice.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangePointerDevice_x_axis, { "x_axis", "x11.xinput.ChangePointerDevice.x_axis", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangePointerDevice_y_axis, { "y_axis", "x11.xinput.ChangePointerDevice.y_axis", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangePointerDevice_device_id, { "device_id", "x11.xinput.ChangePointerDevice.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangePointerDevice_reply_status, { "status", "x11.xinput.ChangePointerDevice.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceMotionEvents_reply_num_axes, { "num_axes", "x11.xinput.GetDeviceMotionEvents.reply.num_axes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceMotionEvents_reply_device_mode, { "device_mode", "x11.xinput.GetDeviceMotionEvents.reply.device_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_ValuatorMode), 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeKeyboardDevice_device_id, { "device_id", "x11.xinput.ChangeKeyboardDevice.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeKeyboardDevice_reply_status, { "status", "x11.xinput.ChangeKeyboardDevice.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabStatus), 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangePointerDevice_x_axis, { "x_axis", "x11.xinput.ChangePointerDevice.x_axis", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangePointerDevice_y_axis, { "y_axis", "x11.xinput.ChangePointerDevice.y_axis", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangePointerDevice_device_id, { "device_id", "x11.xinput.ChangePointerDevice.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangePointerDevice_reply_status, { "status", "x11.xinput.ChangePointerDevice.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabStatus), 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDevice_grab_window, { "grab_window", "x11.xinput.GrabDevice.grab_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDevice_time, { "time", "x11.xinput.GrabDevice.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDevice_time, { "time", "x11.xinput.GrabDevice.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_Time), 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDevice_num_classes, { "num_classes", "x11.xinput.GrabDevice.num_classes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDevice_this_device_mode, { "this_device_mode", "x11.xinput.GrabDevice.this_device_mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDevice_other_device_mode, { "other_device_mode", "x11.xinput.GrabDevice.other_device_mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDevice_this_device_mode, { "this_device_mode", "x11.xinput.GrabDevice.this_device_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabMode), 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDevice_other_device_mode, { "other_device_mode", "x11.xinput.GrabDevice.other_device_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabMode), 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDevice_owner_events, { "owner_events", "x11.xinput.GrabDevice.owner_events", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDevice_device_id, { "device_id", "x11.xinput.GrabDevice.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDevice_device_id, { "device_id", "x11.xinput.GrabDevice.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDevice_classes, { "classes", "x11.xinput.GrabDevice.classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDevice_classes_item, { "classes", "x11.xinput.GrabDevice.classes", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDevice_reply_status, { "status", "x11.xinput.GrabDevice.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_UngrabDevice_time, { "time", "x11.xinput.UngrabDevice.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_UngrabDevice_device_id, { "device_id", "x11.xinput.UngrabDevice.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDevice_reply_status, { "status", "x11.xinput.GrabDevice.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabStatus), 0, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDevice_time, { "time", "x11.xinput.UngrabDevice.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_Time), 0, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDevice_device_id, { "device_id", "x11.xinput.UngrabDevice.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceKey_grab_window, { "grab_window", "x11.xinput.GrabDeviceKey.grab_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceKey_num_classes, { "num_classes", "x11.xinput.GrabDeviceKey.num_classes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_modifiers_mask_Shift, { "Shift", "x11.xinput.GrabDeviceKey.modifiers.Shift", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_modifiers_mask_Lock, { "Lock", "x11.xinput.GrabDeviceKey.modifiers.Lock", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_modifiers_mask_Control, { "Control", "x11.xinput.GrabDeviceKey.modifiers.Control", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_modifiers_mask_1, { "1", "x11.xinput.GrabDeviceKey.modifiers.1", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_modifiers_mask_2, { "2", "x11.xinput.GrabDeviceKey.modifiers.2", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_modifiers_mask_3, { "3", "x11.xinput.GrabDeviceKey.modifiers.3", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_modifiers_mask_4, { "4", "x11.xinput.GrabDeviceKey.modifiers.4", FT_BOOLEAN, 16, NULL, 1 << 6, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_modifiers_mask_5, { "5", "x11.xinput.GrabDeviceKey.modifiers.5", FT_BOOLEAN, 16, NULL, 1 << 7, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_modifiers_mask_Any, { "Any", "x11.xinput.GrabDeviceKey.modifiers.Any", FT_BOOLEAN, 16, NULL, 1 << 15, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceKey_modifiers, { "modifiers", "x11.xinput.GrabDeviceKey.modifiers", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDeviceKey_modifier_device, { "modifier_device", "x11.xinput.GrabDeviceKey.modifier_device", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDeviceKey_grabbed_device, { "grabbed_device", "x11.xinput.GrabDeviceKey.grabbed_device", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDeviceKey_key, { "key", "x11.xinput.GrabDeviceKey.key", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDeviceKey_this_device_mode, { "this_device_mode", "x11.xinput.GrabDeviceKey.this_device_mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDeviceKey_other_device_mode, { "other_device_mode", "x11.xinput.GrabDeviceKey.other_device_mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_modifier_device, { "modifier_device", "x11.xinput.GrabDeviceKey.modifier_device", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_grabbed_device, { "grabbed_device", "x11.xinput.GrabDeviceKey.grabbed_device", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_key, { "key", "x11.xinput.GrabDeviceKey.key", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Grab), 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_this_device_mode, { "this_device_mode", "x11.xinput.GrabDeviceKey.this_device_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabMode), 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceKey_other_device_mode, { "other_device_mode", "x11.xinput.GrabDeviceKey.other_device_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabMode), 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceKey_owner_events, { "owner_events", "x11.xinput.GrabDeviceKey.owner_events", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceKey_classes, { "classes", "x11.xinput.GrabDeviceKey.classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceKey_classes_item, { "classes", "x11.xinput.GrabDeviceKey.classes", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_UngrabDeviceKey_grabWindow, { "grabWindow", "x11.xinput.UngrabDeviceKey.grabWindow", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Shift, { "Shift", "x11.xinput.UngrabDeviceKey.modifiers.Shift", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Lock, { "Lock", "x11.xinput.UngrabDeviceKey.modifiers.Lock", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Control, { "Control", "x11.xinput.UngrabDeviceKey.modifiers.Control", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_1, { "1", "x11.xinput.UngrabDeviceKey.modifiers.1", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_2, { "2", "x11.xinput.UngrabDeviceKey.modifiers.2", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_3, { "3", "x11.xinput.UngrabDeviceKey.modifiers.3", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_4, { "4", "x11.xinput.UngrabDeviceKey.modifiers.4", FT_BOOLEAN, 16, NULL, 1 << 6, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_5, { "5", "x11.xinput.UngrabDeviceKey.modifiers.5", FT_BOOLEAN, 16, NULL, 1 << 7, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Any, { "Any", "x11.xinput.UngrabDeviceKey.modifiers.Any", FT_BOOLEAN, 16, NULL, 1 << 15, NULL, HFILL }}, { &hf_x11_xinput_UngrabDeviceKey_modifiers, { "modifiers", "x11.xinput.UngrabDeviceKey.modifiers", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_UngrabDeviceKey_modifier_device, { "modifier_device", "x11.xinput.UngrabDeviceKey.modifier_device", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_UngrabDeviceKey_key, { "key", "x11.xinput.UngrabDeviceKey.key", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_UngrabDeviceKey_grabbed_device, { "grabbed_device", "x11.xinput.UngrabDeviceKey.grabbed_device", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceKey_modifier_device, { "modifier_device", "x11.xinput.UngrabDeviceKey.modifier_device", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceKey_key, { "key", "x11.xinput.UngrabDeviceKey.key", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Grab), 0, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceKey_grabbed_device, { "grabbed_device", "x11.xinput.UngrabDeviceKey.grabbed_device", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceButton_grab_window, { "grab_window", "x11.xinput.GrabDeviceButton.grab_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDeviceButton_grabbed_device, { "grabbed_device", "x11.xinput.GrabDeviceButton.grabbed_device", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDeviceButton_modifier_device, { "modifier_device", "x11.xinput.GrabDeviceButton.modifier_device", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_grabbed_device, { "grabbed_device", "x11.xinput.GrabDeviceButton.grabbed_device", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_modifier_device, { "modifier_device", "x11.xinput.GrabDeviceButton.modifier_device", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceButton_num_classes, { "num_classes", "x11.xinput.GrabDeviceButton.num_classes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_modifiers_mask_Shift, { "Shift", "x11.xinput.GrabDeviceButton.modifiers.Shift", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_modifiers_mask_Lock, { "Lock", "x11.xinput.GrabDeviceButton.modifiers.Lock", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_modifiers_mask_Control, { "Control", "x11.xinput.GrabDeviceButton.modifiers.Control", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_modifiers_mask_1, { "1", "x11.xinput.GrabDeviceButton.modifiers.1", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_modifiers_mask_2, { "2", "x11.xinput.GrabDeviceButton.modifiers.2", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_modifiers_mask_3, { "3", "x11.xinput.GrabDeviceButton.modifiers.3", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_modifiers_mask_4, { "4", "x11.xinput.GrabDeviceButton.modifiers.4", FT_BOOLEAN, 16, NULL, 1 << 6, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_modifiers_mask_5, { "5", "x11.xinput.GrabDeviceButton.modifiers.5", FT_BOOLEAN, 16, NULL, 1 << 7, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_modifiers_mask_Any, { "Any", "x11.xinput.GrabDeviceButton.modifiers.Any", FT_BOOLEAN, 16, NULL, 1 << 15, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceButton_modifiers, { "modifiers", "x11.xinput.GrabDeviceButton.modifiers", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDeviceButton_this_device_mode, { "this_device_mode", "x11.xinput.GrabDeviceButton.this_device_mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDeviceButton_other_device_mode, { "other_device_mode", "x11.xinput.GrabDeviceButton.other_device_mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDeviceButton_button, { "button", "x11.xinput.GrabDeviceButton.button", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDeviceButton_owner_events, { "owner_events", "x11.xinput.GrabDeviceButton.owner_events", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_this_device_mode, { "this_device_mode", "x11.xinput.GrabDeviceButton.this_device_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabMode), 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_other_device_mode, { "other_device_mode", "x11.xinput.GrabDeviceButton.other_device_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabMode), 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_button, { "button", "x11.xinput.GrabDeviceButton.button", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Grab), 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_owner_events, { "owner_events", "x11.xinput.GrabDeviceButton.owner_events", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceButton_classes, { "classes", "x11.xinput.GrabDeviceButton.classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceButton_classes_item, { "classes", "x11.xinput.GrabDeviceButton.classes", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_UngrabDeviceButton_grab_window, { "grab_window", "x11.xinput.UngrabDeviceButton.grab_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Shift, { "Shift", "x11.xinput.UngrabDeviceButton.modifiers.Shift", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Lock, { "Lock", "x11.xinput.UngrabDeviceButton.modifiers.Lock", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Control, { "Control", "x11.xinput.UngrabDeviceButton.modifiers.Control", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_1, { "1", "x11.xinput.UngrabDeviceButton.modifiers.1", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_2, { "2", "x11.xinput.UngrabDeviceButton.modifiers.2", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_3, { "3", "x11.xinput.UngrabDeviceButton.modifiers.3", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_4, { "4", "x11.xinput.UngrabDeviceButton.modifiers.4", FT_BOOLEAN, 16, NULL, 1 << 6, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_5, { "5", "x11.xinput.UngrabDeviceButton.modifiers.5", FT_BOOLEAN, 16, NULL, 1 << 7, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Any, { "Any", "x11.xinput.UngrabDeviceButton.modifiers.Any", FT_BOOLEAN, 16, NULL, 1 << 15, NULL, HFILL }}, { &hf_x11_xinput_UngrabDeviceButton_modifiers, { "modifiers", "x11.xinput.UngrabDeviceButton.modifiers", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_UngrabDeviceButton_modifier_device, { "modifier_device", "x11.xinput.UngrabDeviceButton.modifier_device", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_UngrabDeviceButton_button, { "button", "x11.xinput.UngrabDeviceButton.button", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_UngrabDeviceButton_grabbed_device, { "grabbed_device", "x11.xinput.UngrabDeviceButton.grabbed_device", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_AllowDeviceEvents_time, { "time", "x11.xinput.AllowDeviceEvents.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_AllowDeviceEvents_mode, { "mode", "x11.xinput.AllowDeviceEvents.mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_AllowDeviceEvents_device_id, { "device_id", "x11.xinput.AllowDeviceEvents.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceFocus_device_id, { "device_id", "x11.xinput.GetDeviceFocus.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceFocus_reply_focus, { "focus", "x11.xinput.GetDeviceFocus.reply.focus", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceButton_modifier_device, { "modifier_device", "x11.xinput.UngrabDeviceButton.modifier_device", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceButton_button, { "button", "x11.xinput.UngrabDeviceButton.button", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Grab), 0, NULL, HFILL }}, +{ &hf_x11_xinput_UngrabDeviceButton_grabbed_device, { "grabbed_device", "x11.xinput.UngrabDeviceButton.grabbed_device", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_AllowDeviceEvents_time, { "time", "x11.xinput.AllowDeviceEvents.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_Time), 0, NULL, HFILL }}, +{ &hf_x11_xinput_AllowDeviceEvents_mode, { "mode", "x11.xinput.AllowDeviceEvents.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_DeviceInputMode), 0, NULL, HFILL }}, +{ &hf_x11_xinput_AllowDeviceEvents_device_id, { "device_id", "x11.xinput.AllowDeviceEvents.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceFocus_device_id, { "device_id", "x11.xinput.GetDeviceFocus.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceFocus_reply_focus, { "focus", "x11.xinput.GetDeviceFocus.reply.focus", FT_UINT32, BASE_HEX, VALS(x11_enum_InputFocus), 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceFocus_reply_time, { "time", "x11.xinput.GetDeviceFocus.reply.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceFocus_reply_revert_to, { "revert_to", "x11.xinput.GetDeviceFocus.reply.revert_to", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceFocus_focus, { "focus", "x11.xinput.SetDeviceFocus.focus", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceFocus_time, { "time", "x11.xinput.SetDeviceFocus.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceFocus_revert_to, { "revert_to", "x11.xinput.SetDeviceFocus.revert_to", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceFocus_device_id, { "device_id", "x11.xinput.SetDeviceFocus.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetFeedbackControl_device_id, { "device_id", "x11.xinput.GetFeedbackControl.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceFocus_reply_revert_to, { "revert_to", "x11.xinput.GetDeviceFocus.reply.revert_to", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_InputFocus), 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceFocus_focus, { "focus", "x11.xinput.SetDeviceFocus.focus", FT_UINT32, BASE_HEX, VALS(x11_enum_InputFocus), 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceFocus_time, { "time", "x11.xinput.SetDeviceFocus.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_Time), 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceFocus_revert_to, { "revert_to", "x11.xinput.SetDeviceFocus.revert_to", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_InputFocus), 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceFocus_device_id, { "device_id", "x11.xinput.SetDeviceFocus.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetFeedbackControl_device_id, { "device_id", "x11.xinput.GetFeedbackControl.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetFeedbackControl_reply_num_feedback, { "num_feedback", "x11.xinput.GetFeedbackControl.reply.num_feedback", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceKeyMapping_device_id, { "device_id", "x11.xinput.GetDeviceKeyMapping.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceKeyMapping_first_keycode, { "first_keycode", "x11.xinput.GetDeviceKeyMapping.first_keycode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceKeyMapping_count, { "count", "x11.xinput.GetDeviceKeyMapping.count", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceKeyMapping_reply_keysyms_per_keycode, { "keysyms_per_keycode", "x11.xinput.GetDeviceKeyMapping.reply.keysyms_per_keycode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceKeyMapping_device_id, { "device_id", "x11.xinput.GetDeviceKeyMapping.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceKeyMapping_first_keycode, { "first_keycode", "x11.xinput.GetDeviceKeyMapping.first_keycode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceKeyMapping_count, { "count", "x11.xinput.GetDeviceKeyMapping.count", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceKeyMapping_reply_keysyms_per_keycode, { "keysyms_per_keycode", "x11.xinput.GetDeviceKeyMapping.reply.keysyms_per_keycode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceKeyMapping_reply_keysyms, { "keysyms", "x11.xinput.GetDeviceKeyMapping.reply.keysyms", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceKeyMapping_reply_keysyms_item, { "keysyms", "x11.xinput.GetDeviceKeyMapping.reply.keysyms", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangeDeviceKeyMapping_device_id, { "device_id", "x11.xinput.ChangeDeviceKeyMapping.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangeDeviceKeyMapping_first_keycode, { "first_keycode", "x11.xinput.ChangeDeviceKeyMapping.first_keycode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangeDeviceKeyMapping_keysyms_per_keycode, { "keysyms_per_keycode", "x11.xinput.ChangeDeviceKeyMapping.keysyms_per_keycode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangeDeviceKeyMapping_keycode_count, { "keycode_count", "x11.xinput.ChangeDeviceKeyMapping.keycode_count", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeDeviceKeyMapping_device_id, { "device_id", "x11.xinput.ChangeDeviceKeyMapping.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeDeviceKeyMapping_first_keycode, { "first_keycode", "x11.xinput.ChangeDeviceKeyMapping.first_keycode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeDeviceKeyMapping_keysyms_per_keycode, { "keysyms_per_keycode", "x11.xinput.ChangeDeviceKeyMapping.keysyms_per_keycode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeDeviceKeyMapping_keycode_count, { "keycode_count", "x11.xinput.ChangeDeviceKeyMapping.keycode_count", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceKeyMapping_keysyms, { "keysyms", "x11.xinput.ChangeDeviceKeyMapping.keysyms", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceKeyMapping_keysyms_item, { "keysyms", "x11.xinput.ChangeDeviceKeyMapping.keysyms", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceModifierMapping_device_id, { "device_id", "x11.xinput.GetDeviceModifierMapping.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceModifierMapping_reply_keycodes_per_modifier, { "keycodes_per_modifier", "x11.xinput.GetDeviceModifierMapping.reply.keycodes_per_modifier", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceModifierMapping_reply_keymaps, { "keymaps", "x11.xinput.GetDeviceModifierMapping.reply.keymaps", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceModifierMapping_device_id, { "device_id", "x11.xinput.SetDeviceModifierMapping.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceModifierMapping_keycodes_per_modifier, { "keycodes_per_modifier", "x11.xinput.SetDeviceModifierMapping.keycodes_per_modifier", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceModifierMapping_keymaps, { "keymaps", "x11.xinput.SetDeviceModifierMapping.keymaps", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceModifierMapping_reply_status, { "status", "x11.xinput.SetDeviceModifierMapping.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceButtonMapping_device_id, { "device_id", "x11.xinput.GetDeviceButtonMapping.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceButtonMapping_reply_map_size, { "map_size", "x11.xinput.GetDeviceButtonMapping.reply.map_size", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceButtonMapping_reply_map, { "map", "x11.xinput.GetDeviceButtonMapping.reply.map", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceButtonMapping_device_id, { "device_id", "x11.xinput.SetDeviceButtonMapping.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceButtonMapping_map_size, { "map_size", "x11.xinput.SetDeviceButtonMapping.map_size", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceButtonMapping_map, { "map", "x11.xinput.SetDeviceButtonMapping.map", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceButtonMapping_reply_status, { "status", "x11.xinput.SetDeviceButtonMapping.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_QueryDeviceState_device_id, { "device_id", "x11.xinput.QueryDeviceState.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_QueryDeviceState_reply_num_classes, { "num_classes", "x11.xinput.QueryDeviceState.reply.num_classes", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceModifierMapping_device_id, { "device_id", "x11.xinput.GetDeviceModifierMapping.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceModifierMapping_reply_keycodes_per_modifier, { "keycodes_per_modifier", "x11.xinput.GetDeviceModifierMapping.reply.keycodes_per_modifier", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceModifierMapping_reply_keymaps, { "keymaps", "x11.xinput.GetDeviceModifierMapping.reply.keymaps", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceModifierMapping_device_id, { "device_id", "x11.xinput.SetDeviceModifierMapping.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceModifierMapping_keycodes_per_modifier, { "keycodes_per_modifier", "x11.xinput.SetDeviceModifierMapping.keycodes_per_modifier", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceModifierMapping_keymaps, { "keymaps", "x11.xinput.SetDeviceModifierMapping.keymaps", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceModifierMapping_reply_status, { "status", "x11.xinput.SetDeviceModifierMapping.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_MappingStatus), 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceButtonMapping_device_id, { "device_id", "x11.xinput.GetDeviceButtonMapping.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceButtonMapping_reply_map_size, { "map_size", "x11.xinput.GetDeviceButtonMapping.reply.map_size", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceButtonMapping_reply_map, { "map", "x11.xinput.GetDeviceButtonMapping.reply.map", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceButtonMapping_device_id, { "device_id", "x11.xinput.SetDeviceButtonMapping.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceButtonMapping_map_size, { "map_size", "x11.xinput.SetDeviceButtonMapping.map_size", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceButtonMapping_map, { "map", "x11.xinput.SetDeviceButtonMapping.map", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceButtonMapping_reply_status, { "status", "x11.xinput.SetDeviceButtonMapping.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_MappingStatus), 0, NULL, HFILL }}, +{ &hf_x11_xinput_QueryDeviceState_device_id, { "device_id", "x11.xinput.QueryDeviceState.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_QueryDeviceState_reply_num_classes, { "num_classes", "x11.xinput.QueryDeviceState.reply.num_classes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SendExtensionEvent_destination, { "destination", "x11.xinput.SendExtensionEvent.destination", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SendExtensionEvent_device_id, { "device_id", "x11.xinput.SendExtensionEvent.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SendExtensionEvent_device_id, { "device_id", "x11.xinput.SendExtensionEvent.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SendExtensionEvent_propagate, { "propagate", "x11.xinput.SendExtensionEvent.propagate", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SendExtensionEvent_num_classes, { "num_classes", "x11.xinput.SendExtensionEvent.num_classes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SendExtensionEvent_num_events, { "num_events", "x11.xinput.SendExtensionEvent.num_events", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SendExtensionEvent_num_events, { "num_events", "x11.xinput.SendExtensionEvent.num_events", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SendExtensionEvent_events, { "events", "x11.xinput.SendExtensionEvent.events", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SendExtensionEvent_classes, { "classes", "x11.xinput.SendExtensionEvent.classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SendExtensionEvent_classes_item, { "classes", "x11.xinput.SendExtensionEvent.classes", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceBell_device_id, { "device_id", "x11.xinput.DeviceBell.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceBell_feedback_id, { "feedback_id", "x11.xinput.DeviceBell.feedback_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceBell_feedback_class, { "feedback_class", "x11.xinput.DeviceBell.feedback_class", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceBell_percent, { "percent", "x11.xinput.DeviceBell.percent", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceValuators_device_id, { "device_id", "x11.xinput.SetDeviceValuators.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceValuators_first_valuator, { "first_valuator", "x11.xinput.SetDeviceValuators.first_valuator", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceValuators_num_valuators, { "num_valuators", "x11.xinput.SetDeviceValuators.num_valuators", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceBell_device_id, { "device_id", "x11.xinput.DeviceBell.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceBell_feedback_id, { "feedback_id", "x11.xinput.DeviceBell.feedback_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceBell_feedback_class, { "feedback_class", "x11.xinput.DeviceBell.feedback_class", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceBell_percent, { "percent", "x11.xinput.DeviceBell.percent", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceValuators_device_id, { "device_id", "x11.xinput.SetDeviceValuators.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceValuators_first_valuator, { "first_valuator", "x11.xinput.SetDeviceValuators.first_valuator", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceValuators_num_valuators, { "num_valuators", "x11.xinput.SetDeviceValuators.num_valuators", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SetDeviceValuators_valuators, { "valuators", "x11.xinput.SetDeviceValuators.valuators", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SetDeviceValuators_valuators_item, { "valuators", "x11.xinput.SetDeviceValuators.valuators", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_SetDeviceValuators_reply_status, { "status", "x11.xinput.SetDeviceValuators.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceValuators_reply_status, { "status", "x11.xinput.SetDeviceValuators.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabStatus), 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceControl_control_id, { "control_id", "x11.xinput.GetDeviceControl.control_id", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceControl_device_id, { "device_id", "x11.xinput.GetDeviceControl.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GetDeviceControl_reply_status, { "status", "x11.xinput.GetDeviceControl.reply.status", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceValuator_device_id, { "device_id", "x11.xinput.DeviceValuator.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceControl_device_id, { "device_id", "x11.xinput.GetDeviceControl.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceControl_reply_status, { "status", "x11.xinput.GetDeviceControl.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabStatus), 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceValuator_device_id, { "device_id", "x11.xinput.DeviceValuator.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceValuator_device_state, { "device_state", "x11.xinput.DeviceValuator.device_state", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceValuator_num_valuators, { "num_valuators", "x11.xinput.DeviceValuator.num_valuators", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceValuator_first_valuator, { "first_valuator", "x11.xinput.DeviceValuator.first_valuator", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceValuator_num_valuators, { "num_valuators", "x11.xinput.DeviceValuator.num_valuators", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceValuator_first_valuator, { "first_valuator", "x11.xinput.DeviceValuator.first_valuator", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceValuator_valuators, { "valuators", "x11.xinput.DeviceValuator.valuators", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceValuator_valuators_item, { "valuators", "x11.xinput.DeviceValuator.valuators", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_detail, { "detail", "x11.xinput.DeviceKeyPress.detail", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_time, { "time", "x11.xinput.DeviceKeyPress.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_root, { "root", "x11.xinput.DeviceKeyPress.root", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_event, { "event", "x11.xinput.DeviceKeyPress.event", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceKeyPress_child, { "child", "x11.xinput.DeviceKeyPress.child", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_child, { "child", "x11.xinput.DeviceKeyPress.child", FT_UINT32, BASE_HEX, VALS(x11_enum_Window), 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_root_x, { "root_x", "x11.xinput.DeviceKeyPress.root_x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_root_y, { "root_y", "x11.xinput.DeviceKeyPress.root_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_event_x, { "event_x", "x11.xinput.DeviceKeyPress.event_x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_event_y, { "event_y", "x11.xinput.DeviceKeyPress.event_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_state, { "state", "x11.xinput.DeviceKeyPress.state", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_same_screen, { "same_screen", "x11.xinput.DeviceKeyPress.same_screen", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceKeyPress_device_id, { "device_id", "x11.xinput.DeviceKeyPress.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_FocusIn_detail, { "detail", "x11.xinput.FocusIn.detail", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_device_id, { "device_id", "x11.xinput.DeviceKeyPress.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_FocusIn_detail, { "detail", "x11.xinput.FocusIn.detail", FT_UINT8, BASE_DEC, VALS(x11_enum_NotifyDetail), 0, NULL, HFILL }}, { &hf_x11_xinput_FocusIn_time, { "time", "x11.xinput.FocusIn.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_FocusIn_window, { "window", "x11.xinput.FocusIn.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_FocusIn_mode, { "mode", "x11.xinput.FocusIn.mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_FocusIn_device_id, { "device_id", "x11.xinput.FocusIn.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_FocusIn_mode, { "mode", "x11.xinput.FocusIn.mode", FT_UINT8, BASE_DEC, VALS(x11_enum_NotifyMode), 0, NULL, HFILL }}, +{ &hf_x11_xinput_FocusIn_device_id, { "device_id", "x11.xinput.FocusIn.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceStateNotify_device_id, { "device_id", "x11.xinput.DeviceStateNotify.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceStateNotify_time, { "time", "x11.xinput.DeviceStateNotify.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceStateNotify_num_keys, { "num_keys", "x11.xinput.DeviceStateNotify.num_keys", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceStateNotify_num_buttons, { "num_buttons", "x11.xinput.DeviceStateNotify.num_buttons", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceStateNotify_num_valuators, { "num_valuators", "x11.xinput.DeviceStateNotify.num_valuators", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceStateNotify_classes_reported, { "classes_reported", "x11.xinput.DeviceStateNotify.classes_reported", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceStateNotify_buttons, { "buttons", "x11.xinput.DeviceStateNotify.buttons", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceStateNotify_keys, { "keys", "x11.xinput.DeviceStateNotify.keys", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceStateNotify_num_keys, { "num_keys", "x11.xinput.DeviceStateNotify.num_keys", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceStateNotify_num_buttons, { "num_buttons", "x11.xinput.DeviceStateNotify.num_buttons", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceStateNotify_num_valuators, { "num_valuators", "x11.xinput.DeviceStateNotify.num_valuators", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceStateNotify_classes_reported, { "classes_reported", "x11.xinput.DeviceStateNotify.classes_reported", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceStateNotify_buttons, { "buttons", "x11.xinput.DeviceStateNotify.buttons", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceStateNotify_keys, { "keys", "x11.xinput.DeviceStateNotify.keys", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceStateNotify_valuators, { "valuators", "x11.xinput.DeviceStateNotify.valuators", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceStateNotify_valuators_item, { "valuators", "x11.xinput.DeviceStateNotify.valuators", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceMappingNotify_device_id, { "device_id", "x11.xinput.DeviceMappingNotify.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceMappingNotify_request, { "request", "x11.xinput.DeviceMappingNotify.request", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceMappingNotify_first_keycode, { "first_keycode", "x11.xinput.DeviceMappingNotify.first_keycode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceMappingNotify_count, { "count", "x11.xinput.DeviceMappingNotify.count", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceMappingNotify_request, { "request", "x11.xinput.DeviceMappingNotify.request", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceMappingNotify_first_keycode, { "first_keycode", "x11.xinput.DeviceMappingNotify.first_keycode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceMappingNotify_count, { "count", "x11.xinput.DeviceMappingNotify.count", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceMappingNotify_time, { "time", "x11.xinput.DeviceMappingNotify.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceNotify_device_id, { "device_id", "x11.xinput.ChangeDeviceNotify.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceNotify_time, { "time", "x11.xinput.ChangeDeviceNotify.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangeDeviceNotify_request, { "request", "x11.xinput.ChangeDeviceNotify.request", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeDeviceNotify_request, { "request", "x11.xinput.ChangeDeviceNotify.request", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyStateNotify_device_id, { "device_id", "x11.xinput.DeviceKeyStateNotify.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceKeyStateNotify_keys, { "keys", "x11.xinput.DeviceKeyStateNotify.keys", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyStateNotify_keys, { "keys", "x11.xinput.DeviceKeyStateNotify.keys", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceButtonStateNotify_device_id, { "device_id", "x11.xinput.DeviceButtonStateNotify.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceButtonStateNotify_buttons, { "buttons", "x11.xinput.DeviceButtonStateNotify.buttons", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceButtonStateNotify_buttons, { "buttons", "x11.xinput.DeviceButtonStateNotify.buttons", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DevicePresenceNotify_time, { "time", "x11.xinput.DevicePresenceNotify.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DevicePresenceNotify_devchange, { "devchange", "x11.xinput.DevicePresenceNotify.devchange", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DevicePresenceNotify_device_id, { "device_id", "x11.xinput.DevicePresenceNotify.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -3730,9 +3943,9 @@ { &hf_x11_xprint_PrintGetContext_reply_context, { "context", "x11.xprint.PrintGetContext.reply.context", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintDestroyContext_context, { "context", "x11.xprint.PrintDestroyContext.context", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetScreenOfContext_reply_root, { "root", "x11.xprint.PrintGetScreenOfContext.reply.root", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xprint_PrintStartJob_output_mode, { "output_mode", "x11.xprint.PrintStartJob.output_mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xprint_PrintStartJob_output_mode, { "output_mode", "x11.xprint.PrintStartJob.output_mode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintEndJob_cancel, { "cancel", "x11.xprint.PrintEndJob.cancel", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xprint_PrintStartDoc_driver_mode, { "driver_mode", "x11.xprint.PrintStartDoc.driver_mode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xprint_PrintStartDoc_driver_mode, { "driver_mode", "x11.xprint.PrintStartDoc.driver_mode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintEndDoc_cancel, { "cancel", "x11.xprint.PrintEndDoc.cancel", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintPutDocumentData_drawable, { "drawable", "x11.xprint.PrintPutDocumentData.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintPutDocumentData_len_data, { "len_data", "x11.xprint.PrintPutDocumentData.len_data", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3752,19 +3965,19 @@ { &hf_x11_xprint_PrintSelectInput_context, { "context", "x11.xprint.PrintSelectInput.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintInputSelected_context, { "context", "x11.xprint.PrintInputSelected.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetAttributes_context, { "context", "x11.xprint.PrintGetAttributes.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xprint_PrintGetAttributes_pool, { "pool", "x11.xprint.PrintGetAttributes.pool", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xprint_PrintGetAttributes_pool, { "pool", "x11.xprint.PrintGetAttributes.pool", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetAttributes_reply_stringLen, { "stringLen", "x11.xprint.PrintGetAttributes.reply.stringLen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetAttributes_reply_attributes, { "attributes", "x11.xprint.PrintGetAttributes.reply.attributes", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetOneAttributes_context, { "context", "x11.xprint.PrintGetOneAttributes.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetOneAttributes_nameLen, { "nameLen", "x11.xprint.PrintGetOneAttributes.nameLen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xprint_PrintGetOneAttributes_pool, { "pool", "x11.xprint.PrintGetOneAttributes.pool", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xprint_PrintGetOneAttributes_pool, { "pool", "x11.xprint.PrintGetOneAttributes.pool", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetOneAttributes_name, { "name", "x11.xprint.PrintGetOneAttributes.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetOneAttributes_reply_valueLen, { "valueLen", "x11.xprint.PrintGetOneAttributes.reply.valueLen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetOneAttributes_reply_value, { "value", "x11.xprint.PrintGetOneAttributes.reply.value", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintSetAttributes_context, { "context", "x11.xprint.PrintSetAttributes.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintSetAttributes_stringLen, { "stringLen", "x11.xprint.PrintSetAttributes.stringLen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xprint_PrintSetAttributes_pool, { "pool", "x11.xprint.PrintSetAttributes.pool", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xprint_PrintSetAttributes_rule, { "rule", "x11.xprint.PrintSetAttributes.rule", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xprint_PrintSetAttributes_pool, { "pool", "x11.xprint.PrintSetAttributes.pool", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xprint_PrintSetAttributes_rule, { "rule", "x11.xprint.PrintSetAttributes.rule", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintSetAttributes_attributes, { "attributes", "x11.xprint.PrintSetAttributes.attributes", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetPageDimensions_context, { "context", "x11.xprint.PrintGetPageDimensions.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetPageDimensions_reply_width, { "width", "x11.xprint.PrintGetPageDimensions.reply.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3782,15 +3995,15 @@ { &hf_x11_xprint_PrintSetImageResolution_reply_previous_resolutions, { "previous_resolutions", "x11.xprint.PrintSetImageResolution.reply.previous_resolutions", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetImageResolution_context, { "context", "x11.xprint.PrintGetImageResolution.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetImageResolution_reply_image_resolution, { "image_resolution", "x11.xprint.PrintGetImageResolution.reply.image_resolution", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xprint_Notify_detail, { "detail", "x11.xprint.Notify.detail", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xprint_Notify_detail, { "detail", "x11.xprint.Notify.detail", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_Notify_context, { "context", "x11.xprint.Notify.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_Notify_cancel, { "cancel", "x11.xprint.Notify.cancel", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xprint_AttributNotify_detail, { "detail", "x11.xprint.AttributNotify.detail", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xprint_AttributNotify_detail, { "detail", "x11.xprint.AttributNotify.detail", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_AttributNotify_context, { "context", "x11.xprint.AttributNotify.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(xprint_extension_minor), 0, "minor opcode", HFILL }}, -{ &hf_x11_xselinux_QueryVersion_client_major, { "client_major", "x11.xselinux.QueryVersion.client_major", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xselinux_QueryVersion_client_minor, { "client_minor", "x11.xselinux.QueryVersion.client_minor", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xselinux_QueryVersion_client_major, { "client_major", "x11.xselinux.QueryVersion.client_major", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xselinux_QueryVersion_client_minor, { "client_minor", "x11.xselinux.QueryVersion.client_minor", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xselinux_QueryVersion_reply_server_major, { "server_major", "x11.xselinux.QueryVersion.reply.server_major", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xselinux_QueryVersion_reply_server_minor, { "server_minor", "x11.xselinux.QueryVersion.reply.server_minor", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xselinux_SetDeviceCreateContext_context_len, { "context_len", "x11.xselinux.SetDeviceCreateContext.context_len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3856,9 +4069,9 @@ { &hf_x11_xselinux_GetClientContext_reply_context, { "context", "x11.xselinux.GetClientContext.reply.context", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xselinux_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(xselinux_extension_minor), 0, "minor opcode", HFILL }}, -{ &hf_x11_xtest_GetVersion_major_version, { "major_version", "x11.xtest.GetVersion.major_version", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xtest_GetVersion_major_version, { "major_version", "x11.xtest.GetVersion.major_version", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xtest_GetVersion_minor_version, { "minor_version", "x11.xtest.GetVersion.minor_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xtest_GetVersion_reply_major_version, { "major_version", "x11.xtest.GetVersion.reply.major_version", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xtest_GetVersion_reply_major_version, { "major_version", "x11.xtest.GetVersion.reply.major_version", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xtest_GetVersion_reply_minor_version, { "minor_version", "x11.xtest.GetVersion.reply.minor_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xtest_CompareCursor_window, { "window", "x11.xtest.CompareCursor.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xtest_CompareCursor_cursor, { "cursor", "x11.xtest.CompareCursor.cursor", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -3869,7 +4082,7 @@ { &hf_x11_xtest_FakeInput_root, { "root", "x11.xtest.FakeInput.root", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xtest_FakeInput_rootX, { "rootX", "x11.xtest.FakeInput.rootX", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xtest_FakeInput_rootY, { "rootY", "x11.xtest.FakeInput.rootY", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xtest_FakeInput_deviceid, { "deviceid", "x11.xtest.FakeInput.deviceid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xtest_FakeInput_deviceid, { "deviceid", "x11.xtest.FakeInput.deviceid", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xtest_GrabControl_impervious, { "impervious", "x11.xtest.GrabControl.impervious", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xtest_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(xtest_extension_minor), 0, "minor opcode", HFILL }}, @@ -3878,13 +4091,18 @@ { &hf_x11_struct_Rational_denominator, { "denominator", "x11.struct.Rational.denominator", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_Format, { "Format", "x11.struct.Format", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_Format_visual, { "visual", "x11.struct.Format.visual", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_Format_depth, { "depth", "x11.struct.Format.depth", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_Format_depth, { "depth", "x11.struct.Format.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_AdaptorInfo, { "AdaptorInfo", "x11.struct.AdaptorInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_AdaptorInfo_base_id, { "base_id", "x11.struct.AdaptorInfo.base_id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_AdaptorInfo_name_size, { "name_size", "x11.struct.AdaptorInfo.name_size", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_AdaptorInfo_num_ports, { "num_ports", "x11.struct.AdaptorInfo.num_ports", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_AdaptorInfo_num_formats, { "num_formats", "x11.struct.AdaptorInfo.num_formats", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_AdaptorInfo_type, { "type", "x11.struct.AdaptorInfo.type", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_AdaptorInfo_type_mask_InputMask, { "InputMask", "x11.struct.AdaptorInfo.type.InputMask", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_struct_AdaptorInfo_type_mask_OutputMask, { "OutputMask", "x11.struct.AdaptorInfo.type.OutputMask", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }}, +{ &hf_x11_struct_AdaptorInfo_type_mask_VideoMask, { "VideoMask", "x11.struct.AdaptorInfo.type.VideoMask", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }}, +{ &hf_x11_struct_AdaptorInfo_type_mask_StillMask, { "StillMask", "x11.struct.AdaptorInfo.type.StillMask", FT_BOOLEAN, 8, NULL, 1 << 3, NULL, HFILL }}, +{ &hf_x11_struct_AdaptorInfo_type_mask_ImageMask, { "ImageMask", "x11.struct.AdaptorInfo.type.ImageMask", FT_BOOLEAN, 8, NULL, 1 << 4, NULL, HFILL }}, +{ &hf_x11_struct_AdaptorInfo_type, { "type", "x11.struct.AdaptorInfo.type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_AdaptorInfo_name, { "name", "x11.struct.AdaptorInfo.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_AdaptorInfo_formats, { "formats", "x11.struct.AdaptorInfo.formats", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_AdaptorInfo_formats_item, { "formats", "x11.struct.AdaptorInfo.formats", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -3896,6 +4114,8 @@ { &hf_x11_struct_EncodingInfo_rate, { "rate", "x11.struct.EncodingInfo.rate", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_EncodingInfo_name, { "name", "x11.struct.EncodingInfo.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_AttributeInfo, { "AttributeInfo", "x11.struct.AttributeInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_AttributeInfo_flags_mask_Gettable, { "Gettable", "x11.struct.AttributeInfo.flags.Gettable", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }}, +{ &hf_x11_struct_AttributeInfo_flags_mask_Settable, { "Settable", "x11.struct.AttributeInfo.flags.Settable", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }}, { &hf_x11_struct_AttributeInfo_flags, { "flags", "x11.struct.AttributeInfo.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_AttributeInfo_min, { "min", "x11.struct.AttributeInfo.min", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_AttributeInfo_max, { "max", "x11.struct.AttributeInfo.max", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -3903,16 +4123,16 @@ { &hf_x11_struct_AttributeInfo_name, { "name", "x11.struct.AttributeInfo.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ImageFormatInfo, { "ImageFormatInfo", "x11.struct.ImageFormatInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ImageFormatInfo_id, { "id", "x11.struct.ImageFormatInfo.id", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_ImageFormatInfo_type, { "type", "x11.struct.ImageFormatInfo.type", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_ImageFormatInfo_byte_order, { "byte_order", "x11.struct.ImageFormatInfo.byte_order", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_ImageFormatInfo_guid, { "guid", "x11.struct.ImageFormatInfo.guid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_ImageFormatInfo_bpp, { "bpp", "x11.struct.ImageFormatInfo.bpp", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_ImageFormatInfo_num_planes, { "num_planes", "x11.struct.ImageFormatInfo.num_planes", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_ImageFormatInfo_depth, { "depth", "x11.struct.ImageFormatInfo.depth", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_ImageFormatInfo_type, { "type", "x11.struct.ImageFormatInfo.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_ImageFormatInfoType), 0, NULL, HFILL }}, +{ &hf_x11_struct_ImageFormatInfo_byte_order, { "byte_order", "x11.struct.ImageFormatInfo.byte_order", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_ImageOrder), 0, NULL, HFILL }}, +{ &hf_x11_struct_ImageFormatInfo_guid, { "guid", "x11.struct.ImageFormatInfo.guid", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_ImageFormatInfo_bpp, { "bpp", "x11.struct.ImageFormatInfo.bpp", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_ImageFormatInfo_num_planes, { "num_planes", "x11.struct.ImageFormatInfo.num_planes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_ImageFormatInfo_depth, { "depth", "x11.struct.ImageFormatInfo.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ImageFormatInfo_red_mask, { "red_mask", "x11.struct.ImageFormatInfo.red_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ImageFormatInfo_green_mask, { "green_mask", "x11.struct.ImageFormatInfo.green_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ImageFormatInfo_blue_mask, { "blue_mask", "x11.struct.ImageFormatInfo.blue_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_ImageFormatInfo_format, { "format", "x11.struct.ImageFormatInfo.format", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_ImageFormatInfo_format, { "format", "x11.struct.ImageFormatInfo.format", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_ImageFormatInfoFormat), 0, NULL, HFILL }}, { &hf_x11_struct_ImageFormatInfo_y_sample_bits, { "y_sample_bits", "x11.struct.ImageFormatInfo.y_sample_bits", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ImageFormatInfo_u_sample_bits, { "u_sample_bits", "x11.struct.ImageFormatInfo.u_sample_bits", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ImageFormatInfo_v_sample_bits, { "v_sample_bits", "x11.struct.ImageFormatInfo.v_sample_bits", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3922,9 +4142,9 @@ { &hf_x11_struct_ImageFormatInfo_vvert_y_period, { "vvert_y_period", "x11.struct.ImageFormatInfo.vvert_y_period", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ImageFormatInfo_vvert_u_period, { "vvert_u_period", "x11.struct.ImageFormatInfo.vvert_u_period", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_ImageFormatInfo_vvert_v_period, { "vvert_v_period", "x11.struct.ImageFormatInfo.vvert_v_period", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_ImageFormatInfo_vcomp_order, { "vcomp_order", "x11.struct.ImageFormatInfo.vcomp_order", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_ImageFormatInfo_vscanline_order, { "vscanline_order", "x11.struct.ImageFormatInfo.vscanline_order", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xv_VideoNotify_reason, { "reason", "x11.xv.VideoNotify.reason", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_ImageFormatInfo_vcomp_order, { "vcomp_order", "x11.struct.ImageFormatInfo.vcomp_order", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_ImageFormatInfo_vscanline_order, { "vscanline_order", "x11.struct.ImageFormatInfo.vscanline_order", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_ScanlineOrder), 0, NULL, HFILL }}, +{ &hf_x11_xv_VideoNotify_reason, { "reason", "x11.xv.VideoNotify.reason", FT_UINT8, BASE_DEC, VALS(x11_enum_VideoNotifyReason), 0, NULL, HFILL }}, { &hf_x11_xv_VideoNotify_time, { "time", "x11.xv.VideoNotify.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_VideoNotify_drawable, { "drawable", "x11.xv.VideoNotify.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_VideoNotify_port, { "port", "x11.xv.VideoNotify.port", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -3941,10 +4161,10 @@ { &hf_x11_xv_QueryEncodings_reply_num_encodings, { "num_encodings", "x11.xv.QueryEncodings.reply.num_encodings", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_QueryEncodings_reply_info, { "info", "x11.xv.QueryEncodings.reply.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_GrabPort_port, { "port", "x11.xv.GrabPort.port", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xv_GrabPort_time, { "time", "x11.xv.GrabPort.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xv_GrabPort_reply_result, { "result", "x11.xv.GrabPort.reply.result", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xv_GrabPort_time, { "time", "x11.xv.GrabPort.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_Time), 0, NULL, HFILL }}, +{ &hf_x11_xv_GrabPort_reply_result, { "result", "x11.xv.GrabPort.reply.result", FT_UINT8, BASE_DEC, VALS(x11_enum_GrabPortStatus), 0, NULL, HFILL }}, { &hf_x11_xv_UngrabPort_port, { "port", "x11.xv.UngrabPort.port", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xv_UngrabPort_time, { "time", "x11.xv.UngrabPort.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xv_UngrabPort_time, { "time", "x11.xv.UngrabPort.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_Time), 0, NULL, HFILL }}, { &hf_x11_xv_PutVideo_port, { "port", "x11.xv.PutVideo.port", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_PutVideo_drawable, { "drawable", "x11.xv.PutVideo.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_PutVideo_gc, { "gc", "x11.xv.PutVideo.gc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -4043,7 +4263,7 @@ { &hf_x11_xv_PutImage_drw_h, { "drw_h", "x11.xv.PutImage.drw_h", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_PutImage_width, { "width", "x11.xv.PutImage.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_PutImage_height, { "height", "x11.xv.PutImage.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xv_PutImage_data, { "data", "x11.xv.PutImage.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xv_PutImage_data, { "data", "x11.xv.PutImage.data", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_ShmPutImage_port, { "port", "x11.xv.ShmPutImage.port", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_ShmPutImage_drawable, { "drawable", "x11.xv.ShmPutImage.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_ShmPutImage_gc, { "gc", "x11.xv.ShmPutImage.gc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -4060,7 +4280,7 @@ { &hf_x11_xv_ShmPutImage_drw_h, { "drw_h", "x11.xv.ShmPutImage.drw_h", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_ShmPutImage_width, { "width", "x11.xv.ShmPutImage.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_ShmPutImage_height, { "height", "x11.xv.ShmPutImage.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xv_ShmPutImage_send_event, { "send_event", "x11.xv.ShmPutImage.send_event", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xv_ShmPutImage_send_event, { "send_event", "x11.xv.ShmPutImage.send_event", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xv_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(xv_extension_minor), 0, "minor opcode", HFILL }}, { &hf_x11_struct_SurfaceInfo, { "SurfaceInfo", "x11.struct.SurfaceInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -4105,7 +4325,7 @@ { &hf_x11_xvmc_CreateSubpicture_reply_height_actual, { "height_actual", "x11.xvmc.CreateSubpicture.reply.height_actual", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xvmc_CreateSubpicture_reply_num_palette_entries, { "num_palette_entries", "x11.xvmc.CreateSubpicture.reply.num_palette_entries", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xvmc_CreateSubpicture_reply_entry_bytes, { "entry_bytes", "x11.xvmc.CreateSubpicture.reply.entry_bytes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xvmc_CreateSubpicture_reply_component_order, { "component_order", "x11.xvmc.CreateSubpicture.reply.component_order", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xvmc_CreateSubpicture_reply_component_order, { "component_order", "x11.xvmc.CreateSubpicture.reply.component_order", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xvmc_CreateSubpicture_reply_priv_data, { "priv_data", "x11.xvmc.CreateSubpicture.reply.priv_data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xvmc_CreateSubpicture_reply_priv_data_item, { "priv_data", "x11.xvmc.CreateSubpicture.reply.priv_data", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xvmc_DestroySubpicture_subpicture_id, { "subpicture_id", "x11.xvmc.DestroySubpicture.subpicture_id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, diff --git a/tools/process-x11-xcb.pl b/tools/process-x11-xcb.pl index ff2f479836..a68a4b070a 100755 --- a/tools/process-x11-xcb.pl +++ b/tools/process-x11-xcb.pl @@ -48,10 +48,10 @@ my %basictype = ( char => { size => 1, type => 'FT_STRING', base => 'BASE_NONE', get => 'VALUE8', list => 'listOfByte', }, void => { size => 1, type => 'FT_BYTES', base => 'BASE_NONE', get => 'VALUE8', list => 'listOfByte', }, BYTE => { size => 1, type => 'FT_BYTES', base => 'BASE_NONE', get => 'VALUE8', list => 'listOfByte', }, - CARD8 => { size => 1, type => 'FT_BYTES', base => 'BASE_NONE', get => 'VALUE8', list => 'listOfByte', }, + CARD8 => { size => 1, type => 'FT_UINT8', base => 'BASE_HEX_DEC', get => 'VALUE8', list => 'listOfByte', }, CARD16 => { size => 2, type => 'FT_UINT16', base => 'BASE_HEX_DEC', get => 'VALUE16', list => 'listOfCard16', }, CARD32 => { size => 4, type => 'FT_UINT32', base => 'BASE_HEX_DEC', get => 'VALUE32', list => 'listOfCard32', }, - INT8 => { size => 1, type => 'FT_BYTES', base => 'BASE_NONE', get => 'VALUE8', list => 'listOfByte', }, + INT8 => { size => 1, type => 'FT_INT8', base => 'BASE_DEC', get => 'VALUE8', list => 'listOfByte', }, INT16 => { size => 2, type => 'FT_INT16', base => 'BASE_DEC', get => 'VALUE16', list => 'listOfInt16', }, INT32 => { size => 4, type => 'FT_INT32', base => 'BASE_DEC', get => 'VALUE32', list => 'listOfInt32', }, float => { size => 4, type => 'FT_FLOAT', base => 'BASE_NONE', get => 'FLOAT', list => 'listOfFloat', }, @@ -127,6 +127,7 @@ my %struct = # Not reset; contains structures already defined. # structures defined by xv, but never used (bug in xcb?) Image => 1, ); +my %enum; # Not reset; contains enums already defined. my $header; my $extname; my $parentclass; @@ -409,6 +410,29 @@ sub get_op($;$) { return "($left " . $op->att('op') . " $right)"; } +sub dump_enum_values($) +{ + my $e = shift; + + defined($enum{$e}) or die("Enum $e not found"); + + my $enumname = "x11_enum_$e"; + return $enumname if (defined $enum{$e}{done}); + + say $enum 'static const value_string '.$enumname.'[] = {'; + + my $value = $enum{$e}{value}; + for my $val (sort { $a <=> $b } keys %$value) { + say $enum sprintf("\t{ %3d, \"%s\" },", $val, $$value{$val}); + } + say $enum sprintf("\t{ %3d, NULL },", 0); + say $enum '};'; + say $enum ''; + + $enum{$e}{done} = 1; + return $enumname; +} + sub register_element($$$;$) { my $e = shift; @@ -430,6 +454,40 @@ sub register_element($$$;$) my $info = $basictype{$type} // $simpletype{$type} // $struct{$type}; my $ft = $info->{'type'} // 'FT_NONE'; my $base = $info->{'base'} // 'BASE_NONE'; + my $vals = 'NULL'; + + my $enum = $e->att('enum') // $e->att('altenum'); + if (defined $enum) { + my $enumname = dump_enum_values($enum); + $vals = "VALS($enumname)"; + + # Wireshark does not allow FT_BYTES or BASE_NONE to have an enum + $ft =~ s/FT_BYTES/FT_UINT8/; + $base =~ s/BASE_NONE/BASE_DEC/; + } + + $enum = $e->att('mask'); + if (defined $enum) { + # Create subtree items: + defined($enum{$enum}) or die("Enum $enum not found"); + + # Wireshark does not allow FT_BYTES or BASE_NONE to have an enum + $ft =~ s/FT_BYTES/FT_UINT8/; + $base =~ s/BASE_NONE/BASE_DEC/; + + my $bitsize = $info->{'size'} * 8; + + my $bit = $enum{$enum}{bit}; + for my $val (sort { $a <=> $b } keys %$bit) { + my $itemname = $$bit{$val}; + my $item = $regname . '_mask_' . $itemname; + my $itemhuman = $humanname . '.' . $itemname; + my $bitshift = "1 << $val"; + + say $decl "static int $item = -1;"; + say $reg "{ &$item, { \"$itemname\", \"$itemhuman\", FT_BOOLEAN, $bitsize, NULL, $bitshift, NULL, HFILL }},"; + } + } print $decl "static int $regname = -1;\n"; if ($e->name() eq 'list' and $info->{'size'} > 1) { @@ -437,7 +495,7 @@ sub register_element($$$;$) $regname .= '_item'; print $decl "static int $regname = -1;\n"; } - print $reg "{ &$regname, { \"$fieldname\", \"$humanname\", $ft, $base, NULL, 0, NULL, HFILL }},\n"; + print $reg "{ &$regname, { \"$fieldname\", \"$humanname\", $ft, $base, $vals, 0, NULL, HFILL }},\n"; if ($e->name() eq 'field') { if ($basictype{$type} or $simpletype{$type}) { @@ -476,9 +534,30 @@ sub dissect_element($$$;$$) my $size = $info->{'size'}; my $get = $info->{'get'}; - print $impl $indent."f_$fieldname = $get(tvb, *offsetp);\n"; - print $impl $indent."proto_tree_add_item(t, $regname, tvb, *offsetp, $size, little_endian);\n"; - print $impl $indent."*offsetp += $size;\n"; + if ($e->att('enum') // $e->att('altenum')) { + my $fieldsize = $size * 8; + say $impl $indent."f_$fieldname = field$fieldsize(tvb, offsetp, t, $regname, little_endian);"; + } elsif ($e->att('mask')) { + say $impl $indent."f_$fieldname = $get(tvb, *offsetp);"; + say $impl $indent."{"; + say $impl $indent." proto_item *ti = proto_tree_add_item(t, $regname, tvb, *offsetp, $size, little_endian);"; + say $impl $indent." proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle);"; + + my $bytesize = $info->{'size'}; + my $bit = $enum{$e->att('mask')}{bit}; + for my $val (sort { $a <=> $b } keys %$bit) { + my $item = $regname . '_mask_' . $$bit{$val}; + + say $impl "$indent proto_tree_add_item(bitmask_tree, $item, tvb, *offsetp, $bytesize, little_endian);"; + } + + say $impl $indent."}"; + say $impl $indent."*offsetp += $size;"; + } else { + print $impl $indent."f_$fieldname = $get(tvb, *offsetp);\n"; + print $impl $indent."proto_tree_add_item(t, $regname, tvb, *offsetp, $size, little_endian);\n"; + print $impl $indent."*offsetp += $size;\n"; + } $length += $size; } elsif ($struct{$type}) { # TODO: variable-lengths (when $info->{'size'} == 0 ) @@ -750,6 +829,48 @@ eot $t->purge; } +sub enum { + my ($t, $elt) = @_; + my $name = $elt->att('name'); + + if (defined $enum{$name}) { + $t->purge; + return; + } + + my @elements = $elt->children('item'); + + print(" - Enum $name\n"); + + my $value = {}; + my $bit = {}; + $enum{$name} = { value => $value, bit => $bit }; + + my $nextvalue = 0; + + foreach my $e (@elements) { + my $n = $e->att('name'); + my $valtype = $e->first_child(qr/value|bit/); + if (defined $valtype) { + my $val = int($valtype->text()); + given ($valtype->name()) { + when ('value') { + $$value{$val} = $n; + $nextvalue = $val + 1; + } + when ('bit') { + $$bit{$val} = $n; + } + } + } else { + $$value{$nextvalue} = $n; + $nextvalue++; + } + } + + $t->purge; +} + sub request { my ($t, $elt) = @_; my $name = $elt->att('name'); @@ -947,6 +1068,7 @@ sub include 'xidtype' => \&xidtype, 'xidunion' => \&xidtype, 'typedef' => \&typedef, + 'enum' => \&enum, }); $xml->parsefile("xcbproto/src/$include.xml") or die ("Cannot open $include.xml\n"); @@ -1212,6 +1334,11 @@ eot print $impl " }\n}\n"; } +$enum = new IO::File '> x11-enum.h' + or die ("Cannot open x11-enum.h for writing\n"); +add_generated_header($enum, 'xcbproto'); +print $impl '#include "x11-enum.h"'."\n\n"; + # XCB foreach my $ext (@reslist) { my $xml = XML::Twig->new( @@ -1230,6 +1357,7 @@ foreach my $ext (@reslist) { 'error' => \&error, 'errorcopy' => \&error, 'event' => \&event, + 'enum' => \&enum, }); $xml->parsefile($ext) or die ("Cannot open $ext\n"); } |