From Peter Harris:

An enum name collision was recently added to the upstream XCB/proto.
Avoid the collision by putting enum names into their proper namespace.


After applying that, regenerate the X11 dissector.

svn path=/trunk/; revision=41514

6 files changed, 1284 insertions, 742 deletions

diff --git a/epan/dissectors/x11-declarations.h b/epan/dissectors/x11-declarations.h
index 0953f2faed..b455ee79cc 100644
--- a/epan/dissectors/x11-declarations.h
+++ b/epan/dissectors/x11-declarations.h
@@ -1422,9 +1422,6 @@ static int hf_x11_glx_render_ProgramLocalParameter4fvARB_params_item = -1;
 static int hf_x11_glx_render_BeginQueryARB_target = -1;
 static int hf_x11_glx_render_BeginQueryARB_id = -1;
 static int hf_x11_glx_render_EndQueryARB_target = -1;
-static int hf_x11_glx_render_DrawBuffersARB_n = -1;
-static int hf_x11_glx_render_DrawBuffersARB_bufs = -1;
-static int hf_x11_glx_render_DrawBuffersARB_bufs_item = -1;
 static int hf_x11_glx_render_PolygonOffsetEXT_factor = -1;
 static int hf_x11_glx_render_PolygonOffsetEXT_bias = -1;
 static int hf_x11_glx_render_TexFilterFuncSGIS_target = -1;
@@ -1889,6 +1886,54 @@ static int hf_x11_dri2_GetBuffersWithFormat_reply_height = -1;
 static int hf_x11_dri2_GetBuffersWithFormat_reply_count = -1;
 static int hf_x11_dri2_GetBuffersWithFormat_reply_buffers = -1;
 static int hf_x11_dri2_GetBuffersWithFormat_reply_buffers_item = -1;
+static int hf_x11_dri2_SwapBuffers_drawable = -1;
+static int hf_x11_dri2_SwapBuffers_target_msc_hi = -1;
+static int hf_x11_dri2_SwapBuffers_target_msc_lo = -1;
+static int hf_x11_dri2_SwapBuffers_divisor_hi = -1;
+static int hf_x11_dri2_SwapBuffers_divisor_lo = -1;
+static int hf_x11_dri2_SwapBuffers_remainder_hi = -1;
+static int hf_x11_dri2_SwapBuffers_remainder_lo = -1;
+static int hf_x11_dri2_SwapBuffers_reply_swap_hi = -1;
+static int hf_x11_dri2_SwapBuffers_reply_swap_lo = -1;
+static int hf_x11_dri2_GetMSC_drawable = -1;
+static int hf_x11_dri2_GetMSC_reply_ust_hi = -1;
+static int hf_x11_dri2_GetMSC_reply_ust_lo = -1;
+static int hf_x11_dri2_GetMSC_reply_msc_hi = -1;
+static int hf_x11_dri2_GetMSC_reply_msc_lo = -1;
+static int hf_x11_dri2_GetMSC_reply_sbc_hi = -1;
+static int hf_x11_dri2_GetMSC_reply_sbc_lo = -1;
+static int hf_x11_dri2_WaitMSC_drawable = -1;
+static int hf_x11_dri2_WaitMSC_target_msc_hi = -1;
+static int hf_x11_dri2_WaitMSC_target_msc_lo = -1;
+static int hf_x11_dri2_WaitMSC_divisor_hi = -1;
+static int hf_x11_dri2_WaitMSC_divisor_lo = -1;
+static int hf_x11_dri2_WaitMSC_remainder_hi = -1;
+static int hf_x11_dri2_WaitMSC_remainder_lo = -1;
+static int hf_x11_dri2_WaitMSC_reply_ust_hi = -1;
+static int hf_x11_dri2_WaitMSC_reply_ust_lo = -1;
+static int hf_x11_dri2_WaitMSC_reply_msc_hi = -1;
+static int hf_x11_dri2_WaitMSC_reply_msc_lo = -1;
+static int hf_x11_dri2_WaitMSC_reply_sbc_hi = -1;
+static int hf_x11_dri2_WaitMSC_reply_sbc_lo = -1;
+static int hf_x11_dri2_WaitSBC_drawable = -1;
+static int hf_x11_dri2_WaitSBC_target_sbc_hi = -1;
+static int hf_x11_dri2_WaitSBC_target_sbc_lo = -1;
+static int hf_x11_dri2_WaitSBC_reply_ust_hi = -1;
+static int hf_x11_dri2_WaitSBC_reply_ust_lo = -1;
+static int hf_x11_dri2_WaitSBC_reply_msc_hi = -1;
+static int hf_x11_dri2_WaitSBC_reply_msc_lo = -1;
+static int hf_x11_dri2_WaitSBC_reply_sbc_hi = -1;
+static int hf_x11_dri2_WaitSBC_reply_sbc_lo = -1;
+static int hf_x11_dri2_SwapInterval_drawable = -1;
+static int hf_x11_dri2_SwapInterval_interval = -1;
+static int hf_x11_dri2_BufferSwapComplete_event_type = -1;
+static int hf_x11_dri2_BufferSwapComplete_drawable = -1;
+static int hf_x11_dri2_BufferSwapComplete_ust_hi = -1;
+static int hf_x11_dri2_BufferSwapComplete_ust_lo = -1;
+static int hf_x11_dri2_BufferSwapComplete_msc_hi = -1;
+static int hf_x11_dri2_BufferSwapComplete_msc_lo = -1;
+static int hf_x11_dri2_BufferSwapComplete_sbc = -1;
+static int hf_x11_dri2_InvalidateBuffers_drawable = -1;
 static int hf_x11_dri2_extension_minor = -1;
 
 static int hf_x11_ge_QueryVersion_client_major_version = -1;
@@ -1991,8 +2036,6 @@ static int hf_x11_glx_CreateNewContext_screen = -1;
 static int hf_x11_glx_CreateNewContext_render_type = -1;
 static int hf_x11_glx_CreateNewContext_share_list = -1;
 static int hf_x11_glx_CreateNewContext_is_direct = -1;
-static int hf_x11_glx_CreateNewContext_reserved1 = -1;
-static int hf_x11_glx_CreateNewContext_reserved2 = -1;
 static int hf_x11_glx_QueryContext_context = -1;
 static int hf_x11_glx_QueryContext_reply_num_attribs = -1;
 static int hf_x11_glx_QueryContext_reply_attribs = -1;
@@ -2025,6 +2068,32 @@ static int hf_x11_glx_CreateWindow_num_attribs = -1;
 static int hf_x11_glx_CreateWindow_attribs = -1;
 static int hf_x11_glx_CreateWindow_attribs_item = -1;
 static int hf_x11_glx_DeleteWindow_glxwindow = -1;
+static int hf_x11_glx_SetClientInfoARB_major_version = -1;
+static int hf_x11_glx_SetClientInfoARB_minor_version = -1;
+static int hf_x11_glx_SetClientInfoARB_num_versions = -1;
+static int hf_x11_glx_SetClientInfoARB_gl_str_len = -1;
+static int hf_x11_glx_SetClientInfoARB_glx_str_len = -1;
+static int hf_x11_glx_SetClientInfoARB_gl_versions = -1;
+static int hf_x11_glx_SetClientInfoARB_gl_versions_item = -1;
+static int hf_x11_glx_SetClientInfoARB_gl_extension_string = -1;
+static int hf_x11_glx_SetClientInfoARB_glx_extension_string = -1;
+static int hf_x11_glx_CreateContextAttribsARB_context = -1;
+static int hf_x11_glx_CreateContextAttribsARB_fbconfig = -1;
+static int hf_x11_glx_CreateContextAttribsARB_screen = -1;
+static int hf_x11_glx_CreateContextAttribsARB_share_list = -1;
+static int hf_x11_glx_CreateContextAttribsARB_is_direct = -1;
+static int hf_x11_glx_CreateContextAttribsARB_num_attribs = -1;
+static int hf_x11_glx_CreateContextAttribsARB_attribs = -1;
+static int hf_x11_glx_CreateContextAttribsARB_attribs_item = -1;
+static int hf_x11_glx_SetClientInfo2ARB_major_version = -1;
+static int hf_x11_glx_SetClientInfo2ARB_minor_version = -1;
+static int hf_x11_glx_SetClientInfo2ARB_num_versions = -1;
+static int hf_x11_glx_SetClientInfo2ARB_gl_str_len = -1;
+static int hf_x11_glx_SetClientInfo2ARB_glx_str_len = -1;
+static int hf_x11_glx_SetClientInfo2ARB_gl_versions = -1;
+static int hf_x11_glx_SetClientInfo2ARB_gl_versions_item = -1;
+static int hf_x11_glx_SetClientInfo2ARB_gl_extension_string = -1;
+static int hf_x11_glx_SetClientInfo2ARB_glx_extension_string = -1;
 static int hf_x11_glx_NewList_context_tag = -1;
 static int hf_x11_glx_NewList_list = -1;
 static int hf_x11_glx_NewList_mode = -1;
@@ -3344,20 +3413,19 @@ 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_Positive_HSync = -1;
+static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Negative_HSync = -1;
+static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Positive_VSync = -1;
+static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Negative_VSync = -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_mask_Composite_Sync = -1;
+static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Positive_CSync = -1;
+static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Negative_CSync = -1;
+static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HSkew = -1;
+static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Broadcast = -1;
+static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Pixmux = -1;
+static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Double_Clock = -1;
+static int hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Half_Clock = -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;
@@ -3371,20 +3439,19 @@ 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_Positive_HSync = -1;
+static int hf_x11_xf86vidmode_ModModeLine_flags_mask_Negative_HSync = -1;
+static int hf_x11_xf86vidmode_ModModeLine_flags_mask_Positive_VSync = -1;
+static int hf_x11_xf86vidmode_ModModeLine_flags_mask_Negative_VSync = -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_mask_Composite_Sync = -1;
+static int hf_x11_xf86vidmode_ModModeLine_flags_mask_Positive_CSync = -1;
+static int hf_x11_xf86vidmode_ModModeLine_flags_mask_Negative_CSync = -1;
+static int hf_x11_xf86vidmode_ModModeLine_flags_mask_HSkew = -1;
+static int hf_x11_xf86vidmode_ModModeLine_flags_mask_Broadcast = -1;
+static int hf_x11_xf86vidmode_ModModeLine_flags_mask_Pixmux = -1;
+static int hf_x11_xf86vidmode_ModModeLine_flags_mask_Double_Clock = -1;
+static int hf_x11_xf86vidmode_ModModeLine_flags_mask_Half_Clock = -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;
@@ -3419,20 +3486,19 @@ 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_Positive_HSync = -1;
+static int hf_x11_xf86vidmode_AddModeLine_flags_mask_Negative_HSync = -1;
+static int hf_x11_xf86vidmode_AddModeLine_flags_mask_Positive_VSync = -1;
+static int hf_x11_xf86vidmode_AddModeLine_flags_mask_Negative_VSync = -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_mask_Composite_Sync = -1;
+static int hf_x11_xf86vidmode_AddModeLine_flags_mask_Positive_CSync = -1;
+static int hf_x11_xf86vidmode_AddModeLine_flags_mask_Negative_CSync = -1;
+static int hf_x11_xf86vidmode_AddModeLine_flags_mask_HSkew = -1;
+static int hf_x11_xf86vidmode_AddModeLine_flags_mask_Broadcast = -1;
+static int hf_x11_xf86vidmode_AddModeLine_flags_mask_Pixmux = -1;
+static int hf_x11_xf86vidmode_AddModeLine_flags_mask_Double_Clock = -1;
+static int hf_x11_xf86vidmode_AddModeLine_flags_mask_Half_Clock = -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;
@@ -3445,20 +3511,19 @@ 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_Positive_HSync = -1;
+static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Negative_HSync = -1;
+static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Positive_VSync = -1;
+static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Negative_VSync = -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_mask_Composite_Sync = -1;
+static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Positive_CSync = -1;
+static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Negative_CSync = -1;
+static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HSkew = -1;
+static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Broadcast = -1;
+static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Pixmux = -1;
+static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Double_Clock = -1;
+static int hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Half_Clock = -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;
@@ -3472,20 +3537,19 @@ 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_Positive_HSync = -1;
+static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Negative_HSync = -1;
+static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Positive_VSync = -1;
+static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Negative_VSync = -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_mask_Composite_Sync = -1;
+static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Positive_CSync = -1;
+static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Negative_CSync = -1;
+static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HSkew = -1;
+static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Broadcast = -1;
+static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Pixmux = -1;
+static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Double_Clock = -1;
+static int hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Half_Clock = -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;
@@ -3500,20 +3564,19 @@ 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_Positive_HSync = -1;
+static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Negative_HSync = -1;
+static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Positive_VSync = -1;
+static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Negative_VSync = -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_mask_Composite_Sync = -1;
+static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Positive_CSync = -1;
+static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Negative_CSync = -1;
+static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HSkew = -1;
+static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Broadcast = -1;
+static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Pixmux = -1;
+static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Double_Clock = -1;
+static int hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Half_Clock = -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;
@@ -3529,20 +3592,19 @@ 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_Positive_HSync = -1;
+static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_Negative_HSync = -1;
+static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_Positive_VSync = -1;
+static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_Negative_VSync = -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_mask_Composite_Sync = -1;
+static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_Positive_CSync = -1;
+static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_Negative_CSync = -1;
+static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_HSkew = -1;
+static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_Broadcast = -1;
+static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_Pixmux = -1;
+static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_Double_Clock = -1;
+static int hf_x11_xf86vidmode_SwitchToMode_flags_mask_Half_Clock = -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;
@@ -4931,6 +4993,16 @@ static int hf_x11_xkb_GetState_reply_compatGrabMods_mask_4 = -1;
 static int hf_x11_xkb_GetState_reply_compatGrabMods_mask_5 = -1;
 static int hf_x11_xkb_GetState_reply_compatGrabMods_mask_Any = -1;
 static int hf_x11_xkb_GetState_reply_compatGrabMods = -1;
+static int hf_x11_xkb_GetState_reply_lookupMods_mask_Shift = -1;
+static int hf_x11_xkb_GetState_reply_lookupMods_mask_Lock = -1;
+static int hf_x11_xkb_GetState_reply_lookupMods_mask_Control = -1;
+static int hf_x11_xkb_GetState_reply_lookupMods_mask_1 = -1;
+static int hf_x11_xkb_GetState_reply_lookupMods_mask_2 = -1;
+static int hf_x11_xkb_GetState_reply_lookupMods_mask_3 = -1;
+static int hf_x11_xkb_GetState_reply_lookupMods_mask_4 = -1;
+static int hf_x11_xkb_GetState_reply_lookupMods_mask_5 = -1;
+static int hf_x11_xkb_GetState_reply_lookupMods_mask_Any = -1;
+static int hf_x11_xkb_GetState_reply_lookupMods = -1;
 static int hf_x11_xkb_GetState_reply_compatLookupMods_mask_Shift = -1;
 static int hf_x11_xkb_GetState_reply_compatLookupMods_mask_Lock = -1;
 static int hf_x11_xkb_GetState_reply_compatLookupMods_mask_Control = -1;
@@ -5097,16 +5169,16 @@ static int hf_x11_xkb_SetControls_affectInternalRealMods_mask_4 = -1;
 static int hf_x11_xkb_SetControls_affectInternalRealMods_mask_5 = -1;
 static int hf_x11_xkb_SetControls_affectInternalRealMods_mask_Any = -1;
 static int hf_x11_xkb_SetControls_affectInternalRealMods = -1;
-static int hf_x11_xkb_SetControls_interanlRealMods_mask_Shift = -1;
-static int hf_x11_xkb_SetControls_interanlRealMods_mask_Lock = -1;
-static int hf_x11_xkb_SetControls_interanlRealMods_mask_Control = -1;
-static int hf_x11_xkb_SetControls_interanlRealMods_mask_1 = -1;
-static int hf_x11_xkb_SetControls_interanlRealMods_mask_2 = -1;
-static int hf_x11_xkb_SetControls_interanlRealMods_mask_3 = -1;
-static int hf_x11_xkb_SetControls_interanlRealMods_mask_4 = -1;
-static int hf_x11_xkb_SetControls_interanlRealMods_mask_5 = -1;
-static int hf_x11_xkb_SetControls_interanlRealMods_mask_Any = -1;
-static int hf_x11_xkb_SetControls_interanlRealMods = -1;
+static int hf_x11_xkb_SetControls_internalRealMods_mask_Shift = -1;
+static int hf_x11_xkb_SetControls_internalRealMods_mask_Lock = -1;
+static int hf_x11_xkb_SetControls_internalRealMods_mask_Control = -1;
+static int hf_x11_xkb_SetControls_internalRealMods_mask_1 = -1;
+static int hf_x11_xkb_SetControls_internalRealMods_mask_2 = -1;
+static int hf_x11_xkb_SetControls_internalRealMods_mask_3 = -1;
+static int hf_x11_xkb_SetControls_internalRealMods_mask_4 = -1;
+static int hf_x11_xkb_SetControls_internalRealMods_mask_5 = -1;
+static int hf_x11_xkb_SetControls_internalRealMods_mask_Any = -1;
+static int hf_x11_xkb_SetControls_internalRealMods = -1;
 static int hf_x11_xkb_SetControls_affectIgnoreLockRealMods_mask_Shift = -1;
 static int hf_x11_xkb_SetControls_affectIgnoreLockRealMods_mask_Lock = -1;
 static int hf_x11_xkb_SetControls_affectIgnoreLockRealMods_mask_Control = -1;
@@ -5161,40 +5233,40 @@ static int hf_x11_xkb_SetControls_internalVirtualMods_mask_13 = -1;
 static int hf_x11_xkb_SetControls_internalVirtualMods_mask_14 = -1;
 static int hf_x11_xkb_SetControls_internalVirtualMods_mask_15 = -1;
 static int hf_x11_xkb_SetControls_internalVirtualMods = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_0 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_1 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_2 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_3 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_4 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_5 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_6 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_7 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_8 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_9 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_10 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_11 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_12 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_13 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_14 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_15 = -1;
-static int hf_x11_xkb_SetControls_affectInternalLockVirtualMods = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_0 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_1 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_2 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_3 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_4 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_5 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_6 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_7 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_8 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_9 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_10 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_11 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_12 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_13 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_14 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods_mask_15 = -1;
-static int hf_x11_xkb_SetControls_internalLockVirtualMods = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_0 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_1 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_2 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_3 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_4 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_5 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_6 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_7 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_8 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_9 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_10 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_11 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_12 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_13 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_14 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_15 = -1;
+static int hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_0 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_1 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_2 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_3 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_4 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_5 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_6 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_7 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_8 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_9 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_10 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_11 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_12 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_13 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_14 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_15 = -1;
+static int hf_x11_xkb_SetControls_ignoreLockVirtualMods = -1;
 static int hf_x11_xkb_SetControls_mouseKeysDfltBtn = -1;
 static int hf_x11_xkb_SetControls_groupsWrap = -1;
 static int hf_x11_xkb_SetControls_accessXOptions = -1;
diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h
index 889f981efa..e259353779 100644
--- a/epan/dissectors/x11-enum.h
+++ b/epan/dissectors/x11-enum.h
@@ -1,6 +1,6 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using xcbproto version 1.6-26-gfb2af7c */
+   using xcbproto version 1.7-3-g12cb81c */
 /* $Id$ */
 
 /*
@@ -25,19 +25,19 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-static const value_string x11_enum_PictType[] = {
+static const value_string x11_enum_render_PictType[] = {
 	{   0, "Indexed" },
 	{   1, "Direct" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_Redirect[] = {
+static const value_string x11_enum_composite_Redirect[] = {
 	{   0, "Automatic" },
 	{   1, "Manual" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_ReportLevel[] = {
+static const value_string x11_enum_damage_ReportLevel[] = {
 	{   0, "RawRectangles" },
 	{   1, "DeltaRectangles" },
 	{   2, "BoundingBox" },
@@ -45,12 +45,12 @@ static const value_string x11_enum_ReportLevel[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_Region[] = {
+static const value_string x11_enum_xfixes_Region[] = {
 	{   0, "None" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_DPMSMode[] = {
+static const value_string x11_enum_dpms_DPMSMode[] = {
 	{   0, "On" },
 	{   1, "Standby" },
 	{   2, "Suspend" },
@@ -58,7 +58,7 @@ static const value_string x11_enum_DPMSMode[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_Attachment[] = {
+static const value_string x11_enum_dri2_Attachment[] = {
 	{   0, "BufferFrontLeft" },
 	{   1, "BufferBackLeft" },
 	{   2, "BufferFrontRight" },
@@ -69,15 +69,24 @@ static const value_string x11_enum_Attachment[] = {
 	{   7, "BufferFakeFrontLeft" },
 	{   8, "BufferFakeFrontRight" },
 	{   9, "BufferDepthStencil" },
+	{  10, "BufferHiz" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_DriverType[] = {
+static const value_string x11_enum_dri2_DriverType[] = {
 	{   0, "DRI" },
+	{   1, "VDPAU" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_SetConfig[] = {
+static const value_string x11_enum_dri2_EventType[] = {
+	{   1, "ExchangeComplete" },
+	{   2, "BlitComplete" },
+	{   3, "FlipComplete" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_randr_SetConfig[] = {
 	{   0, "Success" },
 	{   1, "InvalidConfigTime" },
 	{   2, "InvalidTime" },
@@ -85,7 +94,7 @@ static const value_string x11_enum_SetConfig[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_SubPixel[] = {
+static const value_string x11_enum_render_SubPixel[] = {
 	{   0, "Unknown" },
 	{   1, "HorizontalRGB" },
 	{   2, "HorizontalBGR" },
@@ -95,26 +104,26 @@ static const value_string x11_enum_SubPixel[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_Connection[] = {
+static const value_string x11_enum_randr_Connection[] = {
 	{   0, "Connected" },
 	{   1, "Disconnected" },
 	{   2, "Unknown" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_PropMode[] = {
+static const value_string x11_enum_xproto_PropMode[] = {
 	{   0, "Replace" },
 	{   1, "Prepend" },
 	{   2, "Append" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_GetPropertyType[] = {
+static const value_string x11_enum_xproto_GetPropertyType[] = {
 	{   0, "Any" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_Atom[] = {
+static const value_string x11_enum_xproto_Atom[] = {
 	{   0, "Any" },
 	{   1, "PRIMARY" },
 	{   2, "SECONDARY" },
@@ -187,20 +196,20 @@ static const value_string x11_enum_Atom[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_Property[] = {
+static const value_string x11_enum_xproto_Property[] = {
 	{   0, "NewValue" },
 	{   1, "Delete" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_Notify[] = {
+static const value_string x11_enum_randr_Notify[] = {
 	{   0, "CrtcChange" },
 	{   1, "OutputChange" },
 	{   2, "OutputProperty" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_PictOp[] = {
+static const value_string x11_enum_render_PictOp[] = {
 	{   0, "Clear" },
 	{   1, "Src" },
 	{   2, "Dst" },
@@ -239,22 +248,37 @@ static const value_string x11_enum_PictOp[] = {
 	{  41, "ConjointAtop" },
 	{  42, "ConjointAtopReverse" },
 	{  43, "ConjointXor" },
-	{   0, NULL },
-};
-
-static const value_string x11_enum_Picture[] = {
+	{  48, "Multiply" },
+	{  49, "Screen" },
+	{  50, "Overlay" },
+	{  51, "Darken" },
+	{  52, "Lighten" },
+	{  53, "ColorDodge" },
+	{  54, "ColorBurn" },
+	{  55, "HardLight" },
+	{  56, "SoftLight" },
+	{  57, "Difference" },
+	{  58, "Exclusion" },
+	{  59, "HSLHue" },
+	{  60, "HSLSaturation" },
+	{  61, "HSLColor" },
+	{  62, "HSLLuminosity" },
+	{   0, NULL },
+};
+
+static const value_string x11_enum_render_Picture[] = {
 	{   0, "None" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_SK[] = {
+static const value_string x11_enum_shape_SK[] = {
 	{   0, "Bounding" },
 	{   1, "Clip" },
 	{   2, "Input" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_SO[] = {
+static const value_string x11_enum_shape_SO[] = {
 	{   0, "Set" },
 	{   1, "Union" },
 	{   2, "Intersect" },
@@ -263,7 +287,7 @@ static const value_string x11_enum_SO[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_ClipOrdering[] = {
+static const value_string x11_enum_xproto_ClipOrdering[] = {
 	{   0, "Unsorted" },
 	{   1, "YSorted" },
 	{   2, "YXSorted" },
@@ -271,18 +295,18 @@ static const value_string x11_enum_ClipOrdering[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_Pixmap[] = {
+static const value_string x11_enum_xproto_Pixmap[] = {
 	{   0, "None" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_VALUETYPE[] = {
+static const value_string x11_enum_sync_VALUETYPE[] = {
 	{   0, "Absolute" },
 	{   1, "Relative" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_TESTTYPE[] = {
+static const value_string x11_enum_sync_TESTTYPE[] = {
 	{   0, "PositiveTransition" },
 	{   1, "NegativeTransition" },
 	{   2, "PositiveComparison" },
@@ -290,44 +314,44 @@ static const value_string x11_enum_TESTTYPE[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_ALARMSTATE[] = {
+static const value_string x11_enum_sync_ALARMSTATE[] = {
 	{   0, "Active" },
 	{   1, "Inactive" },
 	{   2, "Destroyed" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_SaveSetMode[] = {
+static const value_string x11_enum_xfixes_SaveSetMode[] = {
 	{   0, "Insert" },
 	{   1, "Delete" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_SaveSetTarget[] = {
+static const value_string x11_enum_xfixes_SaveSetTarget[] = {
 	{   0, "Nearest" },
 	{   1, "Root" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_SaveSetMapping[] = {
+static const value_string x11_enum_xfixes_SaveSetMapping[] = {
 	{   0, "Map" },
 	{   1, "Unmap" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_SelectionEvent[] = {
+static const value_string x11_enum_xfixes_SelectionEvent[] = {
 	{   0, "SetSelectionOwner" },
 	{   1, "SelectionWindowDestroy" },
 	{   2, "SelectionClientClose" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_CursorNotify[] = {
+static const value_string x11_enum_xfixes_CursorNotify[] = {
 	{   0, "DisplayCursor" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_DeviceUse[] = {
+static const value_string x11_enum_xinput_DeviceUse[] = {
 	{   0, "IsXPointer" },
 	{   1, "IsXKeyboard" },
 	{   2, "IsXExtensionDevice" },
@@ -336,7 +360,7 @@ static const value_string x11_enum_DeviceUse[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_InputClass[] = {
+static const value_string x11_enum_xinput_InputClass[] = {
 	{   0, "Key" },
 	{   1, "Button" },
 	{   2, "Valuator" },
@@ -347,13 +371,13 @@ static const value_string x11_enum_InputClass[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_ValuatorMode[] = {
+static const value_string x11_enum_xinput_ValuatorMode[] = {
 	{   0, "Relative" },
 	{   1, "Absolute" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_GrabStatus[] = {
+static const value_string x11_enum_xproto_GrabStatus[] = {
 	{   0, "Success" },
 	{   1, "AlreadyGrabbed" },
 	{   2, "InvalidTime" },
@@ -362,29 +386,29 @@ static const value_string x11_enum_GrabStatus[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_PropagateMode[] = {
+static const value_string x11_enum_xinput_PropagateMode[] = {
 	{   0, "AddToList" },
 	{   1, "DeleteFromList" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_Time[] = {
+static const value_string x11_enum_xproto_Time[] = {
 	{   0, "CurrentTime" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_GrabMode[] = {
+static const value_string x11_enum_xproto_GrabMode[] = {
 	{   0, "Sync" },
 	{   1, "Async" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_Grab[] = {
+static const value_string x11_enum_xproto_Grab[] = {
 	{   0, "Any" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_DeviceInputMode[] = {
+static const value_string x11_enum_xinput_DeviceInputMode[] = {
 	{   0, "AsyncThisDevice" },
 	{   1, "SyncThisDevice" },
 	{   2, "ReplayThisDevice" },
@@ -394,7 +418,7 @@ static const value_string x11_enum_DeviceInputMode[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_InputFocus[] = {
+static const value_string x11_enum_xproto_InputFocus[] = {
 	{   0, "None" },
 	{   1, "PointerRoot" },
 	{   2, "Parent" },
@@ -402,19 +426,19 @@ static const value_string x11_enum_InputFocus[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_MappingStatus[] = {
+static const value_string x11_enum_xproto_MappingStatus[] = {
 	{   0, "Success" },
 	{   1, "Busy" },
 	{   2, "Failure" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_Window[] = {
+static const value_string x11_enum_xproto_Window[] = {
 	{   0, "None" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_NotifyDetail[] = {
+static const value_string x11_enum_xproto_NotifyDetail[] = {
 	{   0, "Ancestor" },
 	{   1, "Virtual" },
 	{   2, "Inferior" },
@@ -426,7 +450,7 @@ static const value_string x11_enum_NotifyDetail[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_NotifyMode[] = {
+static const value_string x11_enum_xproto_NotifyMode[] = {
 	{   0, "Normal" },
 	{   1, "Grab" },
 	{   2, "Ungrab" },
@@ -434,35 +458,35 @@ static const value_string x11_enum_NotifyMode[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_AXFBOpt[] = {
+static const value_string x11_enum_xkb_AXFBOpt[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_AXSKOpt[] = {
+static const value_string x11_enum_xkb_AXSKOpt[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_IMFlag[] = {
+static const value_string x11_enum_xkb_IMFlag[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_IMGroupsWhich[] = {
+static const value_string x11_enum_xkb_IMGroupsWhich[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_SetOfGroup[] = {
+static const value_string x11_enum_xkb_SetOfGroup[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_IMModsWhich[] = {
+static const value_string x11_enum_xkb_IMModsWhich[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_BoolCtrl[] = {
+static const value_string x11_enum_xkb_BoolCtrl[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_DoodadType[] = {
+static const value_string x11_enum_xkb_DoodadType[] = {
 	{   1, "Outline" },
 	{   2, "Solid" },
 	{   3, "Text" },
@@ -471,13 +495,13 @@ static const value_string x11_enum_DoodadType[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_LedClass[] = {
+static const value_string x11_enum_xkb_LedClass[] = {
 	{ 768, "DfltXIClass" },
 	{ 1280, "AllXIClasses" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_ID[] = {
+static const value_string x11_enum_xkb_ID[] = {
 	{ 256, "UseCoreKbd" },
 	{ 512, "UseCorePtr" },
 	{ 768, "DfltXIClass" },
@@ -488,7 +512,7 @@ static const value_string x11_enum_ID[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_SAType[] = {
+static const value_string x11_enum_xkb_SAType[] = {
 	{   0, "NoAction" },
 	{   1, "SetMods" },
 	{   2, "LatchMods" },
@@ -513,7 +537,7 @@ static const value_string x11_enum_SAType[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_SAValWhat[] = {
+static const value_string x11_enum_xkb_SAValWhat[] = {
 	{   0, "IgnoreVal" },
 	{   1, "SetValMin" },
 	{   2, "SetValCenter" },
@@ -523,15 +547,15 @@ static const value_string x11_enum_SAValWhat[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_EventType[] = {
+static const value_string x11_enum_xkb_EventType[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_MapPart[] = {
+static const value_string x11_enum_xkb_MapPart[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_Group[] = {
+static const value_string x11_enum_xkb_Group[] = {
 	{   0, "1" },
 	{   1, "2" },
 	{   2, "3" },
@@ -539,43 +563,43 @@ static const value_string x11_enum_Group[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_BellClassResult[] = {
+static const value_string x11_enum_xkb_BellClassResult[] = {
 	{   0, "KbdFeedbackClass" },
 	{   5, "BellFeedbackClass" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_LedClassResult[] = {
+static const value_string x11_enum_xkb_LedClassResult[] = {
 	{   0, "KbdFeedbackClass" },
 	{   4, "LedFeedbackClass" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_ImageFormatInfoType[] = {
+static const value_string x11_enum_xv_ImageFormatInfoType[] = {
 	{   0, "RGB" },
 	{   1, "YUV" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_ImageOrder[] = {
+static const value_string x11_enum_xproto_ImageOrder[] = {
 	{   0, "LSBFirst" },
 	{   1, "MSBFirst" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_ImageFormatInfoFormat[] = {
+static const value_string x11_enum_xv_ImageFormatInfoFormat[] = {
 	{   0, "Packed" },
 	{   1, "Planar" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_ScanlineOrder[] = {
+static const value_string x11_enum_xv_ScanlineOrder[] = {
 	{   0, "TopToBottom" },
 	{   1, "BottomToTop" },
 	{   0, NULL },
 };
 
-static const value_string x11_enum_VideoNotifyReason[] = {
+static const value_string x11_enum_xv_VideoNotifyReason[] = {
 	{   0, "Started" },
 	{   1, "Stopped" },
 	{   2, "Busy" },
@@ -584,7 +608,7 @@ static const value_string x11_enum_VideoNotifyReason[] = {
 	{   0, NULL },
 };
 
-static const value_string x11_enum_GrabPortStatus[] = {
+static const value_string x11_enum_xv_GrabPortStatus[] = {
 	{   0, "Success" },
 	{   1, "BadExtension" },
 	{   2, "AlreadyGrabbed" },
diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h
index 6fd05e5ecb..b4e8a0d04a 100644
--- a/epan/dissectors/x11-extension-errors.h
+++ b/epan/dissectors/x11-extension-errors.h
@@ -1,6 +1,6 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using xcbproto version 1.6-26-gfb2af7c */
+   using xcbproto version 1.7-3-g12cb81c */
 /* $Id$ */
 
 /*
@@ -64,6 +64,7 @@ const char *glx_errors[] = {
   "glx-BadPbuffer",
   "glx-BadCurrentDrawable",
   "glx-BadWindow",
+  "glx-GLXBadProfileARB",
   NULL
 };
 
diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h
index c8ff70e01b..ba4f7fb9df 100644
--- a/epan/dissectors/x11-extension-implementation.h
+++ b/epan/dissectors/x11-extension-implementation.h
@@ -1,6 +1,6 @@
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using xcbproto version 1.6-26-gfb2af7c */
+   using xcbproto version 1.7-3-g12cb81c */
 /* $Id$ */
 
 /*
@@ -2603,15 +2603,6 @@ static void mesa_EndQueryARB(tvbuff_t *tvb, int *offsetp, proto_tree *t, int lit
     *offsetp += 4;
 }
 
-static void mesa_DrawBuffersARB(tvbuff_t *tvb, int *offsetp, proto_tree *t, int little_endian, int length _U_)
-{
-    int n;
-    n = VALUE32(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_render_DrawBuffersARB_n, tvb, *offsetp, 4, little_endian);
-    *offsetp += 4;
-    listOfCard32(tvb, offsetp, t, hf_x11_glx_render_DrawBuffersARB_bufs, hf_x11_glx_render_DrawBuffersARB_bufs_item, n, little_endian);
-}
-
 static void mesa_PolygonOffsetEXT(tvbuff_t *tvb, int *offsetp, proto_tree *t, int little_endian, int length _U_)
 {
     proto_tree_add_item(t, hf_x11_glx_render_PolygonOffsetEXT_factor, tvb, *offsetp, 4, little_endian);
@@ -3557,7 +3548,6 @@ static const value_string glx_render_op_name[] = {
     { 230, "glWindowPos3fvMESA" },
     { 231, "glBeginQueryARB" },
     { 232, "glEndQueryARB" },
-    { 233, "glDrawBuffersARB" },
     { 2048, "glSampleMaskSGIS" },
     { 2049, "glSamplePatternSGIS" },
     { 2050, "glTagSampleBufferSGIX" },
@@ -4395,9 +4385,6 @@ static void dispatch_glx_render(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
 	case 232:
 	    mesa_EndQueryARB(tvb, offsetp, tt, little_endian, len);
 	    break;
-	case 233:
-	    mesa_DrawBuffersARB(tvb, offsetp, tt, little_endian, len);
-	    break;
 	case 2048:
 	    mesa_SampleMaskSGIS(tvb, offsetp, tt, little_endian, len);
 	    break;
@@ -6272,6 +6259,297 @@ static void dri2GetBuffersWithFormat_Reply(tvbuff_t *tvb, packet_info *pinfo, in
     UNUSED(12);
     struct_DRI2Buffer(tvb, offsetp, t, little_endian, f_count);
 }
+
+static void dri2SwapBuffers(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+    int f_drawable;
+    int f_target_msc_hi;
+    int f_target_msc_lo;
+    int f_divisor_hi;
+    int f_divisor_lo;
+    int f_remainder_hi;
+    int f_remainder_lo;
+    f_drawable = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_drawable, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_target_msc_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_target_msc_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_target_msc_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_target_msc_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_divisor_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_divisor_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_divisor_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_divisor_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_remainder_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_remainder_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_remainder_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_remainder_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+}
+static void dri2SwapBuffers_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, int little_endian)
+{
+    int f_length, length, sequence_number;
+    int f_swap_hi;
+    int f_swap_lo;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-SwapBuffers");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (dri2-SwapBuffers)", sequence_number);
+    *offsetp += 2;
+    f_length = VALUE32(tvb, *offsetp);
+    length = f_length * 4 + 32;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_swap_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_reply_swap_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_swap_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_SwapBuffers_reply_swap_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+}
+
+static void dri2GetMSC(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+    int f_drawable;
+    f_drawable = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_GetMSC_drawable, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+}
+static void dri2GetMSC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, int little_endian)
+{
+    int f_length, length, sequence_number;
+    int f_ust_hi;
+    int f_ust_lo;
+    int f_msc_hi;
+    int f_msc_lo;
+    int f_sbc_hi;
+    int f_sbc_lo;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-GetMSC");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (dri2-GetMSC)", sequence_number);
+    *offsetp += 2;
+    f_length = VALUE32(tvb, *offsetp);
+    length = f_length * 4 + 32;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_ust_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_GetMSC_reply_ust_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_ust_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_GetMSC_reply_ust_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_msc_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_GetMSC_reply_msc_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_msc_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_GetMSC_reply_msc_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_sbc_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_GetMSC_reply_sbc_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_sbc_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_GetMSC_reply_sbc_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+}
+
+static void dri2WaitMSC(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+    int f_drawable;
+    int f_target_msc_hi;
+    int f_target_msc_lo;
+    int f_divisor_hi;
+    int f_divisor_lo;
+    int f_remainder_hi;
+    int f_remainder_lo;
+    f_drawable = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_drawable, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_target_msc_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_target_msc_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_target_msc_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_target_msc_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_divisor_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_divisor_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_divisor_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_divisor_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_remainder_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_remainder_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_remainder_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_remainder_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+}
+static void dri2WaitMSC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, int little_endian)
+{
+    int f_length, length, sequence_number;
+    int f_ust_hi;
+    int f_ust_lo;
+    int f_msc_hi;
+    int f_msc_lo;
+    int f_sbc_hi;
+    int f_sbc_lo;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-WaitMSC");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (dri2-WaitMSC)", sequence_number);
+    *offsetp += 2;
+    f_length = VALUE32(tvb, *offsetp);
+    length = f_length * 4 + 32;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_ust_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_reply_ust_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_ust_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_reply_ust_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_msc_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_reply_msc_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_msc_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_reply_msc_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_sbc_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_reply_sbc_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_sbc_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitMSC_reply_sbc_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+}
+
+static void dri2WaitSBC(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+    int f_drawable;
+    int f_target_sbc_hi;
+    int f_target_sbc_lo;
+    f_drawable = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitSBC_drawable, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_target_sbc_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitSBC_target_sbc_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_target_sbc_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitSBC_target_sbc_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+}
+static void dri2WaitSBC_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, int little_endian)
+{
+    int f_length, length, sequence_number;
+    int f_ust_hi;
+    int f_ust_lo;
+    int f_msc_hi;
+    int f_msc_lo;
+    int f_sbc_hi;
+    int f_sbc_lo;
+
+    col_append_fstr(pinfo->cinfo, COL_INFO, "-WaitSBC");
+
+    REPLY(reply);
+    UNUSED(1);
+    sequence_number = VALUE16(tvb, *offsetp);
+    proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number,
+            "sequencenumber: %d (dri2-WaitSBC)", sequence_number);
+    *offsetp += 2;
+    f_length = VALUE32(tvb, *offsetp);
+    length = f_length * 4 + 32;
+    proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_ust_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitSBC_reply_ust_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_ust_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitSBC_reply_ust_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_msc_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitSBC_reply_msc_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_msc_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitSBC_reply_msc_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_sbc_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitSBC_reply_sbc_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_sbc_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_WaitSBC_reply_sbc_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+}
+
+static void dri2SwapInterval(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+    int f_drawable;
+    int f_interval;
+    f_drawable = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_SwapInterval_drawable, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_interval = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_SwapInterval_interval, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+}
+
+static void dri2BufferSwapComplete(tvbuff_t *tvb, int *offsetp, proto_tree *t, int little_endian)
+{
+    int f_event_type;
+    int f_drawable;
+    int f_ust_hi;
+    int f_ust_lo;
+    int f_msc_hi;
+    int f_msc_lo;
+    int f_sbc;
+    UNUSED(1);
+    CARD16(event_sequencenumber);
+    f_event_type = field16(tvb, offsetp, t, hf_x11_dri2_BufferSwapComplete_event_type, little_endian);
+    UNUSED(2);
+    f_drawable = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_BufferSwapComplete_drawable, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_ust_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_BufferSwapComplete_ust_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_ust_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_BufferSwapComplete_ust_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_msc_hi = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_BufferSwapComplete_msc_hi, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_msc_lo = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_BufferSwapComplete_msc_lo, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_sbc = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_BufferSwapComplete_sbc, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+}
+
+static void dri2InvalidateBuffers(tvbuff_t *tvb, int *offsetp, proto_tree *t, int little_endian)
+{
+    int f_drawable;
+    UNUSED(1);
+    CARD16(event_sequencenumber);
+    f_drawable = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_dri2_InvalidateBuffers_drawable, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+}
 static const value_string dri2_extension_minor[] = {
     { 0, "QueryVersion" },
     { 1, "Connect" },
@@ -6281,9 +6559,16 @@ static const value_string dri2_extension_minor[] = {
     { 5, "GetBuffers" },
     { 6, "CopyRegion" },
     { 7, "GetBuffersWithFormat" },
+    { 8, "SwapBuffers" },
+    { 9, "GetMSC" },
+    { 10, "WaitMSC" },
+    { 11, "WaitSBC" },
+    { 12, "SwapInterval" },
     { 0, NULL }
 };
 const x11_event_info dri2_events[] = {
+    { "dri2-BufferSwapComplete", dri2BufferSwapComplete },
+    { "dri2-InvalidateBuffers", dri2InvalidateBuffers },
     { NULL, NULL }
 };
 static x11_reply_info dri2_replies[] = {
@@ -6293,6 +6578,10 @@ static x11_reply_info dri2_replies[] = {
     { 5, dri2GetBuffers_Reply },
     { 6, dri2CopyRegion_Reply },
     { 7, dri2GetBuffersWithFormat_Reply },
+    { 8, dri2SwapBuffers_Reply },
+    { 9, dri2GetMSC_Reply },
+    { 10, dri2WaitMSC_Reply },
+    { 11, dri2WaitSBC_Reply },
     { 0, NULL }
 };
 
@@ -6330,6 +6619,21 @@ static void dispatch_dri2(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto
     case 7:
 	dri2GetBuffersWithFormat(tvb, pinfo, offsetp, t, little_endian, length);
 	break;
+    case 8:
+	dri2SwapBuffers(tvb, pinfo, offsetp, t, little_endian, length);
+	break;
+    case 9:
+	dri2GetMSC(tvb, pinfo, offsetp, t, little_endian, length);
+	break;
+    case 10:
+	dri2WaitMSC(tvb, pinfo, offsetp, t, little_endian, length);
+	break;
+    case 11:
+	dri2WaitSBC(tvb, pinfo, offsetp, t, little_endian, length);
+	break;
+    case 12:
+	dri2SwapInterval(tvb, pinfo, offsetp, t, little_endian, length);
+	break;
     /* No need for a default case here, since Unknown is printed above,
        and UNDECODED() is taken care of by dissect_x11_request */
     }
@@ -6975,8 +7279,6 @@ static void glxCreateNewContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
     int f_render_type;
     int f_share_list;
     int f_is_direct;
-    int f_reserved1;
-    int f_reserved2;
     f_context = VALUE32(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateNewContext_context, tvb, *offsetp, 4, little_endian);
     *offsetp += 4;
@@ -6995,12 +7297,7 @@ static void glxCreateNewContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs
     f_is_direct = VALUE8(tvb, *offsetp);
     proto_tree_add_item(t, hf_x11_glx_CreateNewContext_is_direct, tvb, *offsetp, 1, little_endian);
     *offsetp += 1;
-    f_reserved1 = VALUE8(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_CreateNewContext_reserved1, tvb, *offsetp, 1, little_endian);
-    *offsetp += 1;
-    f_reserved2 = VALUE16(tvb, *offsetp);
-    proto_tree_add_item(t, hf_x11_glx_CreateNewContext_reserved2, tvb, *offsetp, 2, little_endian);
-    *offsetp += 2;
+    UNUSED(3);
 }
 
 static void glxQueryContext(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
@@ -7185,6 +7482,97 @@ static void glxDeleteWindow(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
     *offsetp += 4;
 }
 
+static void glxSetClientInfoARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+    int f_major_version;
+    int f_minor_version;
+    int f_num_versions;
+    int f_gl_str_len;
+    int f_glx_str_len;
+    f_major_version = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_SetClientInfoARB_major_version, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_minor_version = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_SetClientInfoARB_minor_version, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_num_versions = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_SetClientInfoARB_num_versions, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_gl_str_len = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_SetClientInfoARB_gl_str_len, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_glx_str_len = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_SetClientInfoARB_glx_str_len, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    listOfCard32(tvb, offsetp, t, hf_x11_glx_SetClientInfoARB_gl_versions, hf_x11_glx_SetClientInfoARB_gl_versions_item, (f_num_versions * 2), little_endian);
+    length -= (f_num_versions * 2) * 4;
+    listOfByte(tvb, offsetp, t, hf_x11_glx_SetClientInfoARB_gl_extension_string, f_gl_str_len, little_endian);
+    length -= f_gl_str_len * 1;
+    listOfByte(tvb, offsetp, t, hf_x11_glx_SetClientInfoARB_glx_extension_string, f_glx_str_len, little_endian);
+    length -= f_glx_str_len * 1;
+}
+
+static void glxCreateContextAttribsARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+    int f_context;
+    int f_fbconfig;
+    int f_screen;
+    int f_share_list;
+    int f_is_direct;
+    int f_num_attribs;
+    f_context = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_CreateContextAttribsARB_context, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_fbconfig = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_CreateContextAttribsARB_fbconfig, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_screen = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_CreateContextAttribsARB_screen, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_share_list = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_CreateContextAttribsARB_share_list, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_is_direct = VALUE8(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_CreateContextAttribsARB_is_direct, tvb, *offsetp, 1, little_endian);
+    *offsetp += 1;
+    UNUSED(3);
+    f_num_attribs = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_CreateContextAttribsARB_num_attribs, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    listOfCard32(tvb, offsetp, t, hf_x11_glx_CreateContextAttribsARB_attribs, hf_x11_glx_CreateContextAttribsARB_attribs_item, (f_num_attribs * 2), little_endian);
+    length -= (f_num_attribs * 2) * 4;
+}
+
+static void glxSetClientInfo2ARB(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
+{
+    int f_major_version;
+    int f_minor_version;
+    int f_num_versions;
+    int f_gl_str_len;
+    int f_glx_str_len;
+    f_major_version = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_SetClientInfo2ARB_major_version, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_minor_version = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_SetClientInfo2ARB_minor_version, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_num_versions = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_SetClientInfo2ARB_num_versions, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_gl_str_len = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_SetClientInfo2ARB_gl_str_len, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    f_glx_str_len = VALUE32(tvb, *offsetp);
+    proto_tree_add_item(t, hf_x11_glx_SetClientInfo2ARB_glx_str_len, tvb, *offsetp, 4, little_endian);
+    *offsetp += 4;
+    listOfCard32(tvb, offsetp, t, hf_x11_glx_SetClientInfo2ARB_gl_versions, hf_x11_glx_SetClientInfo2ARB_gl_versions_item, (f_num_versions * 3), little_endian);
+    length -= (f_num_versions * 3) * 4;
+    listOfByte(tvb, offsetp, t, hf_x11_glx_SetClientInfo2ARB_gl_extension_string, f_gl_str_len, little_endian);
+    length -= f_gl_str_len * 1;
+    listOfByte(tvb, offsetp, t, hf_x11_glx_SetClientInfo2ARB_glx_extension_string, f_glx_str_len, little_endian);
+    length -= f_glx_str_len * 1;
+}
+
 static void glxNewList(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, int little_endian, int length _U_)
 {
     int f_context_tag;
@@ -9665,6 +10053,9 @@ static const value_string glx_extension_minor[] = {
     { 30, "ChangeDrawableAttributes" },
     { 31, "CreateWindow" },
     { 32, "DeleteWindow" },
+    { 33, "SetClientInfoARB" },
+    { 34, "CreateContextAttribsARB" },
+    { 35, "SetClientInfo2ARB" },
     { 101, "NewList" },
     { 102, "EndList" },
     { 103, "DeleteLists" },
@@ -9912,6 +10303,15 @@ static void dispatch_glx(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_
     case 32:
 	glxDeleteWindow(tvb, pinfo, offsetp, t, little_endian, length);
 	break;
+    case 33:
+	glxSetClientInfoARB(tvb, pinfo, offsetp, t, little_endian, length);
+	break;
+    case 34:
+	glxCreateContextAttribsARB(tvb, pinfo, offsetp, t, little_endian, length);
+	break;
+    case 35:
+	glxSetClientInfo2ARB(tvb, pinfo, offsetp, t, little_endian, length);
+	break;
     case 101:
 	glxNewList(tvb, pinfo, offsetp, t, little_endian, length);
 	break;
@@ -15774,20 +16174,19 @@ static void xf86vidmodeGetModeLine_Reply(tvbuff_t *tvb, packet_info *pinfo, int
     {
         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_Positive_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Negative_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Positive_VSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Negative_VSync, 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);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Composite_Sync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Positive_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Negative_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HSkew, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Broadcast, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Pixmux, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Double_Clock, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Half_Clock, tvb, *offsetp, 4, little_endian);
     }
     *offsetp += 4;
     UNUSED(12);
@@ -15846,20 +16245,19 @@ static void xf86vidmodeModModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
     {
         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_Positive_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Negative_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Positive_VSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Negative_VSync, 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);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Composite_Sync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Positive_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Negative_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_HSkew, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Broadcast, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Pixmux, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Double_Clock, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ModModeLine_flags_mask_Half_Clock, tvb, *offsetp, 4, little_endian);
     }
     *offsetp += 4;
     UNUSED(12);
@@ -16038,20 +16436,19 @@ static void xf86vidmodeAddModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
     {
         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_Positive_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Negative_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Positive_VSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Negative_VSync, 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);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Composite_Sync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Positive_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Negative_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_HSkew, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Broadcast, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Pixmux, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Double_Clock, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_flags_mask_Half_Clock, tvb, *offsetp, 4, little_endian);
     }
     *offsetp += 4;
     UNUSED(12);
@@ -16093,20 +16490,19 @@ static void xf86vidmodeAddModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int *o
     {
         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_Positive_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Negative_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Positive_VSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Negative_VSync, 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);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Composite_Sync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Positive_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Negative_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HSkew, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Broadcast, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Pixmux, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Double_Clock, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Half_Clock, tvb, *offsetp, 4, little_endian);
     }
     *offsetp += 4;
     UNUSED(12);
@@ -16167,20 +16563,19 @@ static void xf86vidmodeDeleteModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, int
     {
         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_Positive_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Negative_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Positive_VSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Negative_VSync, 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);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Composite_Sync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Positive_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Negative_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HSkew, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Broadcast, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Pixmux, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Double_Clock, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Half_Clock, tvb, *offsetp, 4, little_endian);
     }
     *offsetp += 4;
     UNUSED(12);
@@ -16244,20 +16639,19 @@ static void xf86vidmodeValidateModeLine(tvbuff_t *tvb, packet_info *pinfo _U_, i
     {
         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_Positive_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Negative_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Positive_VSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Negative_VSync, 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);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Composite_Sync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Positive_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Negative_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HSkew, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Broadcast, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Pixmux, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Double_Clock, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Half_Clock, tvb, *offsetp, 4, little_endian);
     }
     *offsetp += 4;
     UNUSED(12);
@@ -16343,20 +16737,19 @@ static void xf86vidmodeSwitchToMode(tvbuff_t *tvb, packet_info *pinfo _U_, int *
     {
         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_Positive_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Negative_HSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Positive_VSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Negative_VSync, 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);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Composite_Sync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Positive_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Negative_CSync, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_HSkew, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Broadcast, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Pixmux, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Double_Clock, tvb, *offsetp, 4, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xf86vidmode_SwitchToMode_flags_mask_Half_Clock, tvb, *offsetp, 4, little_endian);
     }
     *offsetp += 4;
     UNUSED(12);
@@ -21918,6 +22311,7 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
     int f_compatState;
     int f_grabMods;
     int f_compatGrabMods;
+    int f_lookupMods;
     int f_compatLookupMods;
     int f_ptrBtnState;
 
@@ -22048,6 +22442,21 @@ static void xkbGetState_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, p
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_compatGrabMods_mask_Any, tvb, *offsetp, 1, little_endian);
     }
     *offsetp += 1;
+    f_lookupMods = VALUE8(tvb, *offsetp);
+    {
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetState_reply_lookupMods, 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_xkb_GetState_reply_lookupMods_mask_Shift, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_lookupMods_mask_Lock, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_lookupMods_mask_Control, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_lookupMods_mask_1, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_lookupMods_mask_2, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_lookupMods_mask_3, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_lookupMods_mask_4, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_lookupMods_mask_5, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_GetState_reply_lookupMods_mask_Any, tvb, *offsetp, 1, little_endian);
+    }
+    *offsetp += 1;
     f_compatLookupMods = VALUE8(tvb, *offsetp);
     {
         proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_GetState_reply_compatLookupMods, tvb, *offsetp, 1, little_endian);
@@ -22364,13 +22773,13 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
 {
     int f_deviceSpec;
     int f_affectInternalRealMods;
-    int f_interanlRealMods;
+    int f_internalRealMods;
     int f_affectIgnoreLockRealMods;
     int f_ignoreLockRealMods;
     int f_affectInternalVirtualMods;
     int f_internalVirtualMods;
-    int f_affectInternalLockVirtualMods;
-    int f_internalLockVirtualMods;
+    int f_affectIgnoreLockVirtualMods;
+    int f_ignoreLockVirtualMods;
     int f_mouseKeysDfltBtn;
     int f_groupsWrap;
     int f_affectEnabledControls;
@@ -22406,19 +22815,19 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalRealMods_mask_Any, tvb, *offsetp, 1, little_endian);
     }
     *offsetp += 1;
-    f_interanlRealMods = VALUE8(tvb, *offsetp);
+    f_internalRealMods = VALUE8(tvb, *offsetp);
     {
-        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_interanlRealMods, tvb, *offsetp, 1, little_endian);
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_internalRealMods, 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_xkb_SetControls_interanlRealMods_mask_Shift, tvb, *offsetp, 1, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_interanlRealMods_mask_Lock, tvb, *offsetp, 1, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_interanlRealMods_mask_Control, tvb, *offsetp, 1, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_interanlRealMods_mask_1, tvb, *offsetp, 1, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_interanlRealMods_mask_2, tvb, *offsetp, 1, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_interanlRealMods_mask_3, tvb, *offsetp, 1, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_interanlRealMods_mask_4, tvb, *offsetp, 1, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_interanlRealMods_mask_5, tvb, *offsetp, 1, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_interanlRealMods_mask_Any, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalRealMods_mask_Shift, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalRealMods_mask_Lock, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalRealMods_mask_Control, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalRealMods_mask_1, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalRealMods_mask_2, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalRealMods_mask_3, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalRealMods_mask_4, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalRealMods_mask_5, tvb, *offsetp, 1, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalRealMods_mask_Any, tvb, *offsetp, 1, little_endian);
     }
     *offsetp += 1;
     f_affectIgnoreLockRealMods = VALUE8(tvb, *offsetp);
@@ -22495,48 +22904,48 @@ static void xkbSetControls(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp,
         proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalVirtualMods_mask_15, tvb, *offsetp, 2, little_endian);
     }
     *offsetp += 2;
-    f_affectInternalLockVirtualMods = VALUE16(tvb, *offsetp);
+    f_affectIgnoreLockVirtualMods = VALUE16(tvb, *offsetp);
     {
-        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_affectInternalLockVirtualMods, tvb, *offsetp, 2, little_endian);
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods, 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_xkb_SetControls_affectInternalLockVirtualMods_mask_0, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_1, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_2, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_3, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_4, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_5, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_6, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_7, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_8, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_9, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_10, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_11, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_12, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_13, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_14, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_15, tvb, *offsetp, 2, little_endian);
-    }
-    *offsetp += 2;
-    f_internalLockVirtualMods = VALUE16(tvb, *offsetp);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_0, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_1, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_2, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_3, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_4, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_5, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_6, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_7, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_8, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_9, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_10, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_11, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_12, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_13, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_14, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_15, tvb, *offsetp, 2, little_endian);
+    }
+    *offsetp += 2;
+    f_ignoreLockVirtualMods = VALUE16(tvb, *offsetp);
     {
-        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_internalLockVirtualMods, tvb, *offsetp, 2, little_endian);
+        proto_item *ti = proto_tree_add_item(t, hf_x11_xkb_SetControls_ignoreLockVirtualMods, 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_xkb_SetControls_internalLockVirtualMods_mask_0, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_1, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_2, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_3, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_4, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_5, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_6, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_7, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_8, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_9, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_10, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_11, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_12, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_13, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_14, tvb, *offsetp, 2, little_endian);
-        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_internalLockVirtualMods_mask_15, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_0, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_1, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_2, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_3, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_4, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_5, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_6, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_7, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_8, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_9, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_10, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_11, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_12, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_13, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_14, tvb, *offsetp, 2, little_endian);
+        proto_tree_add_item(bitmask_tree, hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_15, tvb, *offsetp, 2, little_endian);
     }
     *offsetp += 2;
     f_mouseKeysDfltBtn = VALUE8(tvb, *offsetp);
diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h
index b62572216f..c6bd012cac 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 snb-magic-3282-g51095f7 */
+   using mesa version snb-magic-9264-gcc5b0ff */
 /* $Id$ */
 
 /*
@@ -1293,24 +1293,6 @@ static const value_string mesa_enum[] = {
   { 0x8861, "POINT_SPRITE_ARB" },
   { 0x8862, "COORD_REPLACE_ARB" },
 /* OpenGL extension GL_ARB_fragment_program_shadow */
-/* OpenGL extension GL_ARB_draw_buffers */
-  { 0x8824, "MAX_DRAW_BUFFERS_ARB" },
-  { 0x8825, "DRAW_BUFFER0_ARB" },
-  { 0x8826, "DRAW_BUFFER1_ARB" },
-  { 0x8827, "DRAW_BUFFER2_ARB" },
-  { 0x8828, "DRAW_BUFFER3_ARB" },
-  { 0x8829, "DRAW_BUFFER4_ARB" },
-  { 0x882A, "DRAW_BUFFER5_ARB" },
-  { 0x882B, "DRAW_BUFFER6_ARB" },
-  { 0x882C, "DRAW_BUFFER7_ARB" },
-  { 0x882D, "DRAW_BUFFER8_ARB" },
-  { 0x882E, "DRAW_BUFFER9_ARB" },
-  { 0x882F, "DRAW_BUFFER10_ARB" },
-  { 0x8830, "DRAW_BUFFER11_ARB" },
-  { 0x8831, "DRAW_BUFFER12_ARB" },
-  { 0x8832, "DRAW_BUFFER13_ARB" },
-  { 0x8833, "DRAW_BUFFER14_ARB" },
-  { 0x8834, "DRAW_BUFFER15_ARB" },
 /* OpenGL extension GL_ARB_texture_rectangle */
   { 0x84F5, "TEXTURE_RECTANGLE_ARB" },
   { 0x84F6, "TEXTURE_BINDING_RECTANGLE_ARB" },
@@ -1788,24 +1770,6 @@ static const value_string mesa_enum[] = {
   { 0x83A3, "RGBA4_S3TC" },
   { 0x83A4, "RGBA_DXT5_S3TC" },
   { 0x83A5, "RGBA4_DXT5_S3TC" },
-/* OpenGL extension GL_ATI_draw_buffers */
-  { 0x8824, "MAX_DRAW_BUFFERS_ATI" },
-  { 0x8825, "DRAW_BUFFER0_ATI" },
-  { 0x8826, "DRAW_BUFFER1_ATI" },
-  { 0x8827, "DRAW_BUFFER2_ATI" },
-  { 0x8828, "DRAW_BUFFER3_ATI" },
-  { 0x8829, "DRAW_BUFFER4_ATI" },
-  { 0x882A, "DRAW_BUFFER5_ATI" },
-  { 0x882B, "DRAW_BUFFER6_ATI" },
-  { 0x882C, "DRAW_BUFFER7_ATI" },
-  { 0x882D, "DRAW_BUFFER8_ATI" },
-  { 0x882E, "DRAW_BUFFER9_ATI" },
-  { 0x882F, "DRAW_BUFFER10_ATI" },
-  { 0x8830, "DRAW_BUFFER11_ATI" },
-  { 0x8831, "DRAW_BUFFER12_ATI" },
-  { 0x8832, "DRAW_BUFFER13_ATI" },
-  { 0x8833, "DRAW_BUFFER14_ATI" },
-  { 0x8834, "DRAW_BUFFER15_ATI" },
 /* OpenGL extension GL_ATI_texture_env_combine3 */
   { 0x8744, "MODULATE_ADD_ATI" },
   { 0x8745, "MODULATE_SIGNED_ADD_ATI" },
diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h
index ca881090b8..237fe91c3f 100644
--- a/epan/dissectors/x11-register-info.h
+++ b/epan/dissectors/x11-register-info.h
@@ -1422,9 +1422,6 @@
 { &hf_x11_glx_render_BeginQueryARB_target, { "target", "x11.glx.render.BeginQueryARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
 { &hf_x11_glx_render_BeginQueryARB_id, { "id", "x11.glx.render.BeginQueryARB.id", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_EndQueryARB_target, { "target", "x11.glx.render.EndQueryARB.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
-{ &hf_x11_glx_render_DrawBuffersARB_n, { "n", "x11.glx.render.DrawBuffersARB.n", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_DrawBuffersARB_bufs, { "bufs", "x11.glx.render.DrawBuffersARB.bufs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_render_DrawBuffersARB_bufs_item, { "bufs", "x11.glx.render.DrawBuffersARB.bufs", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
 { &hf_x11_glx_render_PolygonOffsetEXT_factor, { "factor", "x11.glx.render.PolygonOffsetEXT.factor", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_PolygonOffsetEXT_bias, { "bias", "x11.glx.render.PolygonOffsetEXT.bias", FT_FLOAT, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_render_TexFilterFuncSGIS_target, { "target", "x11.glx.render.TexFilterFuncSGIS.target", FT_UINT32, BASE_HEX, VALS(mesa_enum), 0, NULL, HFILL }},
@@ -1715,7 +1712,7 @@
 { &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_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictType), 0, NULL, HFILL }},
+{ &hf_x11_struct_PICTFORMINFO_type, { "type", "x11.struct.PICTFORMINFO.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_render_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 }},
@@ -1789,13 +1786,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_Redirect), 0, NULL, HFILL }},
+{ &hf_x11_composite_RedirectWindow_update, { "update", "x11.composite.RedirectWindow.update", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_composite_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_UINT8, BASE_HEX_DEC, VALS(x11_enum_Redirect), 0, NULL, HFILL }},
+{ &hf_x11_composite_RedirectSubwindows_update, { "update", "x11.composite.RedirectSubwindows.update", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_composite_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_UINT8, BASE_HEX_DEC, VALS(x11_enum_Redirect), 0, NULL, HFILL }},
+{ &hf_x11_composite_UnredirectWindow_update, { "update", "x11.composite.UnredirectWindow.update", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_composite_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_UINT8, BASE_HEX_DEC, VALS(x11_enum_Redirect), 0, NULL, HFILL }},
+{ &hf_x11_composite_UnredirectSubwindows_update, { "update", "x11.composite.UnredirectSubwindows.update", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_composite_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 }},
@@ -1811,14 +1808,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_ReportLevel), 0, NULL, HFILL }},
+{ &hf_x11_damage_Create_level, { "level", "x11.damage.Create.level", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_damage_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, 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_Subtract_repair, { "repair", "x11.damage.Subtract.repair", FT_UINT32, BASE_HEX, VALS(x11_enum_xfixes_Region), 0, NULL, HFILL }},
+{ &hf_x11_damage_Subtract_parts, { "parts", "x11.damage.Subtract.parts", FT_UINT32, BASE_HEX, VALS(x11_enum_xfixes_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_UINT8, BASE_HEX_DEC, VALS(x11_enum_ReportLevel), 0, NULL, HFILL }},
+{ &hf_x11_damage_Notify_level, { "level", "x11.damage.Notify.level", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_damage_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 }},
@@ -1837,26 +1834,26 @@
 { &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, 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_ForceLevel_power_level, { "power_level", "x11.dpms.ForceLevel.power_level", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_dpms_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_dpms_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 }},
 
 { &hf_x11_struct_DRI2Buffer, { "DRI2Buffer", "x11.struct.DRI2Buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_DRI2Buffer_attachment, { "attachment", "x11.struct.DRI2Buffer.attachment", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_Attachment), 0, NULL, HFILL }},
+{ &hf_x11_struct_DRI2Buffer_attachment, { "attachment", "x11.struct.DRI2Buffer.attachment", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_dri2_Attachment), 0, NULL, HFILL }},
 { &hf_x11_struct_DRI2Buffer_name, { "name", "x11.struct.DRI2Buffer.name", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_DRI2Buffer_pitch, { "pitch", "x11.struct.DRI2Buffer.pitch", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_DRI2Buffer_cpp, { "cpp", "x11.struct.DRI2Buffer.cpp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_DRI2Buffer_flags, { "flags", "x11.struct.DRI2Buffer.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_AttachFormat, { "AttachFormat", "x11.struct.AttachFormat", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_AttachFormat_attachment, { "attachment", "x11.struct.AttachFormat.attachment", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_Attachment), 0, NULL, HFILL }},
+{ &hf_x11_struct_AttachFormat_attachment, { "attachment", "x11.struct.AttachFormat.attachment", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_dri2_Attachment), 0, NULL, HFILL }},
 { &hf_x11_struct_AttachFormat_format, { "format", "x11.struct.AttachFormat.format", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri2_QueryVersion_major_version, { "major_version", "x11.dri2.QueryVersion.major_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri2_QueryVersion_minor_version, { "minor_version", "x11.dri2.QueryVersion.minor_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri2_QueryVersion_reply_major_version, { "major_version", "x11.dri2.QueryVersion.reply.major_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri2_QueryVersion_reply_minor_version, { "minor_version", "x11.dri2.QueryVersion.reply.minor_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri2_Connect_window, { "window", "x11.dri2.Connect.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-{ &hf_x11_dri2_Connect_driver_type, { "driver_type", "x11.dri2.Connect.driver_type", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_DriverType), 0, NULL, HFILL }},
+{ &hf_x11_dri2_Connect_driver_type, { "driver_type", "x11.dri2.Connect.driver_type", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_dri2_DriverType), 0, NULL, HFILL }},
 { &hf_x11_dri2_Connect_reply_driver_name_length, { "driver_name_length", "x11.dri2.Connect.reply.driver_name_length", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri2_Connect_reply_device_name_length, { "device_name_length", "x11.dri2.Connect.reply.device_name_length", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri2_Connect_reply_driver_name, { "driver_name", "x11.dri2.Connect.reply.driver_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1889,6 +1886,54 @@
 { &hf_x11_dri2_GetBuffersWithFormat_reply_count, { "count", "x11.dri2.GetBuffersWithFormat.reply.count", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri2_GetBuffersWithFormat_reply_buffers, { "buffers", "x11.dri2.GetBuffersWithFormat.reply.buffers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri2_GetBuffersWithFormat_reply_buffers_item, { "buffers", "x11.dri2.GetBuffersWithFormat.reply.buffers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_SwapBuffers_drawable, { "drawable", "x11.dri2.SwapBuffers.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_SwapBuffers_target_msc_hi, { "target_msc_hi", "x11.dri2.SwapBuffers.target_msc_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_SwapBuffers_target_msc_lo, { "target_msc_lo", "x11.dri2.SwapBuffers.target_msc_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_SwapBuffers_divisor_hi, { "divisor_hi", "x11.dri2.SwapBuffers.divisor_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_SwapBuffers_divisor_lo, { "divisor_lo", "x11.dri2.SwapBuffers.divisor_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_SwapBuffers_remainder_hi, { "remainder_hi", "x11.dri2.SwapBuffers.remainder_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_SwapBuffers_remainder_lo, { "remainder_lo", "x11.dri2.SwapBuffers.remainder_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_SwapBuffers_reply_swap_hi, { "swap_hi", "x11.dri2.SwapBuffers.reply.swap_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_SwapBuffers_reply_swap_lo, { "swap_lo", "x11.dri2.SwapBuffers.reply.swap_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_GetMSC_drawable, { "drawable", "x11.dri2.GetMSC.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_GetMSC_reply_ust_hi, { "ust_hi", "x11.dri2.GetMSC.reply.ust_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_GetMSC_reply_ust_lo, { "ust_lo", "x11.dri2.GetMSC.reply.ust_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_GetMSC_reply_msc_hi, { "msc_hi", "x11.dri2.GetMSC.reply.msc_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_GetMSC_reply_msc_lo, { "msc_lo", "x11.dri2.GetMSC.reply.msc_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_GetMSC_reply_sbc_hi, { "sbc_hi", "x11.dri2.GetMSC.reply.sbc_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_GetMSC_reply_sbc_lo, { "sbc_lo", "x11.dri2.GetMSC.reply.sbc_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_drawable, { "drawable", "x11.dri2.WaitMSC.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_target_msc_hi, { "target_msc_hi", "x11.dri2.WaitMSC.target_msc_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_target_msc_lo, { "target_msc_lo", "x11.dri2.WaitMSC.target_msc_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_divisor_hi, { "divisor_hi", "x11.dri2.WaitMSC.divisor_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_divisor_lo, { "divisor_lo", "x11.dri2.WaitMSC.divisor_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_remainder_hi, { "remainder_hi", "x11.dri2.WaitMSC.remainder_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_remainder_lo, { "remainder_lo", "x11.dri2.WaitMSC.remainder_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_reply_ust_hi, { "ust_hi", "x11.dri2.WaitMSC.reply.ust_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_reply_ust_lo, { "ust_lo", "x11.dri2.WaitMSC.reply.ust_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_reply_msc_hi, { "msc_hi", "x11.dri2.WaitMSC.reply.msc_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_reply_msc_lo, { "msc_lo", "x11.dri2.WaitMSC.reply.msc_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_reply_sbc_hi, { "sbc_hi", "x11.dri2.WaitMSC.reply.sbc_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitMSC_reply_sbc_lo, { "sbc_lo", "x11.dri2.WaitMSC.reply.sbc_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitSBC_drawable, { "drawable", "x11.dri2.WaitSBC.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitSBC_target_sbc_hi, { "target_sbc_hi", "x11.dri2.WaitSBC.target_sbc_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitSBC_target_sbc_lo, { "target_sbc_lo", "x11.dri2.WaitSBC.target_sbc_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitSBC_reply_ust_hi, { "ust_hi", "x11.dri2.WaitSBC.reply.ust_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitSBC_reply_ust_lo, { "ust_lo", "x11.dri2.WaitSBC.reply.ust_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitSBC_reply_msc_hi, { "msc_hi", "x11.dri2.WaitSBC.reply.msc_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitSBC_reply_msc_lo, { "msc_lo", "x11.dri2.WaitSBC.reply.msc_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitSBC_reply_sbc_hi, { "sbc_hi", "x11.dri2.WaitSBC.reply.sbc_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_WaitSBC_reply_sbc_lo, { "sbc_lo", "x11.dri2.WaitSBC.reply.sbc_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_SwapInterval_drawable, { "drawable", "x11.dri2.SwapInterval.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_SwapInterval_interval, { "interval", "x11.dri2.SwapInterval.interval", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_BufferSwapComplete_event_type, { "event_type", "x11.dri2.BufferSwapComplete.event_type", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_dri2_EventType), 0, NULL, HFILL }},
+{ &hf_x11_dri2_BufferSwapComplete_drawable, { "drawable", "x11.dri2.BufferSwapComplete.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_BufferSwapComplete_ust_hi, { "ust_hi", "x11.dri2.BufferSwapComplete.ust_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_BufferSwapComplete_ust_lo, { "ust_lo", "x11.dri2.BufferSwapComplete.ust_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_BufferSwapComplete_msc_hi, { "msc_hi", "x11.dri2.BufferSwapComplete.msc_hi", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_BufferSwapComplete_msc_lo, { "msc_lo", "x11.dri2.BufferSwapComplete.msc_lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_BufferSwapComplete_sbc, { "sbc", "x11.dri2.BufferSwapComplete.sbc", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri2_InvalidateBuffers_drawable, { "drawable", "x11.dri2.InvalidateBuffers.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri2_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(dri2_extension_minor), 0, "minor opcode", HFILL }},
 
 { &hf_x11_ge_QueryVersion_client_major_version, { "client_major_version", "x11.ge.QueryVersion.client_major_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -1978,7 +2023,7 @@
 { &hf_x11_glx_GetFBConfigs_reply_property_list, { "property_list", "x11.glx.GetFBConfigs.reply.property_list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_GetFBConfigs_reply_property_list_item, { "property_list", "x11.glx.GetFBConfigs.reply.property_list", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_CreatePixmap_screen, { "screen", "x11.glx.CreatePixmap.screen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_CreatePixmap_fbconfig, { "fbconfig", "x11.glx.CreatePixmap.fbconfig", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_CreatePixmap_fbconfig, { "fbconfig", "x11.glx.CreatePixmap.fbconfig", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_CreatePixmap_pixmap, { "pixmap", "x11.glx.CreatePixmap.pixmap", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_CreatePixmap_glx_pixmap, { "glx_pixmap", "x11.glx.CreatePixmap.glx_pixmap", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_CreatePixmap_num_attribs, { "num_attribs", "x11.glx.CreatePixmap.num_attribs", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -1986,13 +2031,11 @@
 { &hf_x11_glx_CreatePixmap_attribs_item, { "attribs", "x11.glx.CreatePixmap.attribs", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_DestroyPixmap_glx_pixmap, { "glx_pixmap", "x11.glx.DestroyPixmap.glx_pixmap", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_CreateNewContext_context, { "context", "x11.glx.CreateNewContext.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-{ &hf_x11_glx_CreateNewContext_fbconfig, { "fbconfig", "x11.glx.CreateNewContext.fbconfig", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_CreateNewContext_fbconfig, { "fbconfig", "x11.glx.CreateNewContext.fbconfig", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_CreateNewContext_screen, { "screen", "x11.glx.CreateNewContext.screen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &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_share_list, { "share_list", "x11.glx.CreateNewContext.share_list", FT_UINT32, BASE_HEX, 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_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 }},
 { &hf_x11_glx_QueryContext_reply_attribs, { "attribs", "x11.glx.QueryContext.reply.attribs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -2025,6 +2068,32 @@
 { &hf_x11_glx_CreateWindow_attribs, { "attribs", "x11.glx.CreateWindow.attribs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_CreateWindow_attribs_item, { "attribs", "x11.glx.CreateWindow.attribs", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_DeleteWindow_glxwindow, { "glxwindow", "x11.glx.DeleteWindow.glxwindow", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfoARB_major_version, { "major_version", "x11.glx.SetClientInfoARB.major_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfoARB_minor_version, { "minor_version", "x11.glx.SetClientInfoARB.minor_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfoARB_num_versions, { "num_versions", "x11.glx.SetClientInfoARB.num_versions", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfoARB_gl_str_len, { "gl_str_len", "x11.glx.SetClientInfoARB.gl_str_len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfoARB_glx_str_len, { "glx_str_len", "x11.glx.SetClientInfoARB.glx_str_len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfoARB_gl_versions, { "gl_versions", "x11.glx.SetClientInfoARB.gl_versions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfoARB_gl_versions_item, { "gl_versions", "x11.glx.SetClientInfoARB.gl_versions", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfoARB_gl_extension_string, { "gl_extension_string", "x11.glx.SetClientInfoARB.gl_extension_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfoARB_glx_extension_string, { "glx_extension_string", "x11.glx.SetClientInfoARB.glx_extension_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_CreateContextAttribsARB_context, { "context", "x11.glx.CreateContextAttribsARB.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_CreateContextAttribsARB_fbconfig, { "fbconfig", "x11.glx.CreateContextAttribsARB.fbconfig", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_CreateContextAttribsARB_screen, { "screen", "x11.glx.CreateContextAttribsARB.screen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_CreateContextAttribsARB_share_list, { "share_list", "x11.glx.CreateContextAttribsARB.share_list", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_CreateContextAttribsARB_is_direct, { "is_direct", "x11.glx.CreateContextAttribsARB.is_direct", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_CreateContextAttribsARB_num_attribs, { "num_attribs", "x11.glx.CreateContextAttribsARB.num_attribs", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_CreateContextAttribsARB_attribs, { "attribs", "x11.glx.CreateContextAttribsARB.attribs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_CreateContextAttribsARB_attribs_item, { "attribs", "x11.glx.CreateContextAttribsARB.attribs", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfo2ARB_major_version, { "major_version", "x11.glx.SetClientInfo2ARB.major_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfo2ARB_minor_version, { "minor_version", "x11.glx.SetClientInfo2ARB.minor_version", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfo2ARB_num_versions, { "num_versions", "x11.glx.SetClientInfo2ARB.num_versions", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfo2ARB_gl_str_len, { "gl_str_len", "x11.glx.SetClientInfo2ARB.gl_str_len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfo2ARB_glx_str_len, { "glx_str_len", "x11.glx.SetClientInfo2ARB.glx_str_len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfo2ARB_gl_versions, { "gl_versions", "x11.glx.SetClientInfo2ARB.gl_versions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfo2ARB_gl_versions_item, { "gl_versions", "x11.glx.SetClientInfo2ARB.gl_versions", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfo2ARB_gl_extension_string, { "gl_extension_string", "x11.glx.SetClientInfo2ARB.gl_extension_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_glx_SetClientInfo2ARB_glx_extension_string, { "glx_extension_string", "x11.glx.SetClientInfo2ARB.glx_extension_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_NewList_context_tag, { "context_tag", "x11.glx.NewList.context_tag", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_NewList_list, { "list", "x11.glx.NewList.list", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_glx_NewList_mode, { "mode", "x11.glx.NewList.mode", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -2421,11 +2490,11 @@
 { &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_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetConfig), 0, NULL, HFILL }},
+{ &hf_x11_randr_SetScreenConfig_reply_status, { "status", "x11.randr.SetScreenConfig.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_randr_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, VALS(x11_enum_SubPixel), 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_render_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 }},
@@ -2511,13 +2580,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetConfig), 0, NULL, HFILL }},
+{ &hf_x11_randr_GetOutputInfo_reply_status, { "status", "x11.randr.GetOutputInfo.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_randr_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_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_connection, { "connection", "x11.randr.GetOutputInfo.reply.connection", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_randr_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_render_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 }},
@@ -2551,20 +2620,20 @@
 { &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_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_mode, { "mode", "x11.randr.ChangeOutputProperty.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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, VALS(x11_enum_GetPropertyType), 0, NULL, HFILL }},
+{ &hf_x11_randr_GetOutputProperty_type, { "type", "x11.randr.GetOutputProperty.type", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_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_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_type, { "type", "x11.randr.GetOutputProperty.reply.type", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_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 }},
@@ -2579,7 +2648,7 @@
 { &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_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetConfig), 0, NULL, HFILL }},
+{ &hf_x11_randr_GetCrtcInfo_reply_status, { "status", "x11.randr.GetCrtcInfo.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_randr_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 }},
@@ -2621,7 +2690,7 @@
 { &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_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetConfig), 0, NULL, HFILL }},
+{ &hf_x11_randr_SetCrtcConfig_reply_status, { "status", "x11.randr.SetCrtcConfig.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_randr_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 }},
@@ -2676,7 +2745,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetConfig), 0, NULL, HFILL }},
+{ &hf_x11_randr_GetPanning_reply_status, { "status", "x11.randr.GetPanning.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_randr_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 }},
@@ -2704,7 +2773,7 @@
 { &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_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetConfig), 0, NULL, HFILL }},
+{ &hf_x11_randr_SetPanning_reply_status, { "status", "x11.randr.SetPanning.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_randr_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 }},
@@ -2722,7 +2791,7 @@
 { &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, VALS(x11_enum_SubPixel), 0, NULL, HFILL }},
+{ &hf_x11_randr_ScreenChangeNotify_subpixel_order, { "subpixel_order", "x11.randr.ScreenChangeNotify.subpixel_order", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_render_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 }},
@@ -2757,19 +2826,19 @@
 { &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_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_OutputChange_connection, { "connection", "x11.struct.OutputChange.connection", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_randr_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_render_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_UINT8, BASE_HEX_DEC, VALS(x11_enum_Property), 0, NULL, HFILL }},
+{ &hf_x11_struct_OutputProperty_status, { "status", "x11.struct.OutputProperty.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_Property), 0, NULL, HFILL }},
 { &hf_x11_union_NotifyData, { "NotifyData", "x11.union.NotifyData", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_union_NotifyData_cc, { "cc", "x11.union.NotifyData.cc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_union_NotifyData_oc, { "oc", "x11.union.NotifyData.oc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_union_NotifyData_op, { "op", "x11.union.NotifyData.op", FT_NONE, 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_subCode, { "subCode", "x11.randr.Notify.subCode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_randr_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 }},
 
@@ -2851,7 +2920,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, VALS(x11_enum_SubPixel), 0, NULL, HFILL }},
+{ &hf_x11_render_QueryPictFormats_reply_subpixels_item, { "subpixels", "x11.render.QueryPictFormats.reply.subpixels", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_render_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 }},
@@ -2866,9 +2935,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }},
+{ &hf_x11_render_Composite_op, { "op", "x11.render.Composite.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_render_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, VALS(x11_enum_Picture), 0, NULL, HFILL }},
+{ &hf_x11_render_Composite_mask, { "mask", "x11.render.Composite.mask", FT_UINT32, BASE_HEX, VALS(x11_enum_render_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 }},
@@ -2878,7 +2947,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }},
+{ &hf_x11_render_Trapezoids_op, { "op", "x11.render.Trapezoids.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_render_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 }},
@@ -2886,7 +2955,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }},
+{ &hf_x11_render_Triangles_op, { "op", "x11.render.Triangles.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_render_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 }},
@@ -2894,7 +2963,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }},
+{ &hf_x11_render_TriStrip_op, { "op", "x11.render.TriStrip.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_render_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 }},
@@ -2902,7 +2971,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }},
+{ &hf_x11_render_TriFan_op, { "op", "x11.render.TriFan.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_render_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 }},
@@ -2925,7 +2994,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }},
+{ &hf_x11_render_CompositeGlyphs8_op, { "op", "x11.render.CompositeGlyphs8.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_render_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 }},
@@ -2933,7 +3002,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }},
+{ &hf_x11_render_CompositeGlyphs16_op, { "op", "x11.render.CompositeGlyphs16.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_render_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 }},
@@ -2941,7 +3010,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }},
+{ &hf_x11_render_CompositeGlyphs32_op, { "op", "x11.render.CompositeGlyphs32.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_render_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 }},
@@ -2949,7 +3018,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_PictOp), 0, NULL, HFILL }},
+{ &hf_x11_render_FillRectangles_op, { "op", "x11.render.FillRectangles.op", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_render_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 }},
@@ -3065,7 +3134,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }},
+{ &hf_x11_shape_Notify_shape_kind, { "shape_kind", "x11.shape.Notify.shape_kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_shape_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 }},
@@ -3075,28 +3144,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_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_operation, { "operation", "x11.shape.Rectangles.operation", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_shape_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_shape_SK), 0, NULL, HFILL }},
+{ &hf_x11_shape_Rectangles_ordering, { "ordering", "x11.shape.Rectangles.ordering", FT_UINT8, BASE_DEC, VALS(x11_enum_xproto_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_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_operation, { "operation", "x11.shape.Mask.operation", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_shape_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_shape_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, 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_Mask_source_bitmap, { "source_bitmap", "x11.shape.Mask.source_bitmap", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_Pixmap), 0, NULL, HFILL }},
+{ &hf_x11_shape_Combine_operation, { "operation", "x11.shape.Combine.operation", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_shape_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_shape_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_shape_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_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }},
+{ &hf_x11_shape_Offset_destination_kind, { "destination_kind", "x11.shape.Offset.destination_kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_shape_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 }},
@@ -3116,8 +3185,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_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_source_kind, { "source_kind", "x11.shape.GetRectangles.source_kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_shape_SK), 0, NULL, HFILL }},
+{ &hf_x11_shape_GetRectangles_reply_ordering, { "ordering", "x11.shape.GetRectangles.reply.ordering", FT_UINT8, BASE_DEC, VALS(x11_enum_xproto_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 }},
@@ -3184,9 +3253,9 @@
 { &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, VALS(x11_enum_VALUETYPE), 0, NULL, HFILL }},
+{ &hf_x11_struct_TRIGGER_wait_type, { "wait_type", "x11.struct.TRIGGER.wait_type", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_sync_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, VALS(x11_enum_TESTTYPE), 0, NULL, HFILL }},
+{ &hf_x11_struct_TRIGGER_test_type, { "test_type", "x11.struct.TRIGGER.test_type", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_sync_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 }},
@@ -3214,7 +3283,7 @@
 { &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_UINT8, BASE_HEX_DEC, VALS(x11_enum_ALARMSTATE), 0, NULL, HFILL }},
+{ &hf_x11_sync_QueryAlarm_reply_state, { "state", "x11.sync.QueryAlarm.reply.state", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_sync_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 }},
@@ -3241,7 +3310,7 @@
 { &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_UINT8, BASE_HEX_DEC, VALS(x11_enum_ALARMSTATE), 0, NULL, HFILL }},
+{ &hf_x11_sync_AlarmNotify_state, { "state", "x11.sync.AlarmNotify.state", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_sync_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 }},
@@ -3344,20 +3413,19 @@
 { &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_Positive_HSync, { "Positive_HSync", "x11.xf86vidmode.GetModeLine.reply.flags.Positive_HSync", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Negative_HSync, { "Negative_HSync", "x11.xf86vidmode.GetModeLine.reply.flags.Negative_HSync", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Positive_VSync, { "Positive_VSync", "x11.xf86vidmode.GetModeLine.reply.flags.Positive_VSync", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Negative_VSync, { "Negative_VSync", "x11.xf86vidmode.GetModeLine.reply.flags.Negative_VSync", 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_mask_Composite_Sync, { "Composite_Sync", "x11.xf86vidmode.GetModeLine.reply.flags.Composite_Sync", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Positive_CSync, { "Positive_CSync", "x11.xf86vidmode.GetModeLine.reply.flags.Positive_CSync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Negative_CSync, { "Negative_CSync", "x11.xf86vidmode.GetModeLine.reply.flags.Negative_CSync", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_HSkew, { "HSkew", "x11.xf86vidmode.GetModeLine.reply.flags.HSkew", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Broadcast, { "Broadcast", "x11.xf86vidmode.GetModeLine.reply.flags.Broadcast", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Pixmux, { "Pixmux", "x11.xf86vidmode.GetModeLine.reply.flags.Pixmux", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Double_Clock, { "Double_Clock", "x11.xf86vidmode.GetModeLine.reply.flags.Double_Clock", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_GetModeLine_reply_flags_mask_Half_Clock, { "Half_Clock", "x11.xf86vidmode.GetModeLine.reply.flags.Half_Clock", FT_BOOLEAN, 32, NULL, 1 << 12, 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_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -3371,20 +3439,19 @@
 { &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_Positive_HSync, { "Positive_HSync", "x11.xf86vidmode.ModModeLine.flags.Positive_HSync", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_Negative_HSync, { "Negative_HSync", "x11.xf86vidmode.ModModeLine.flags.Negative_HSync", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_Positive_VSync, { "Positive_VSync", "x11.xf86vidmode.ModModeLine.flags.Positive_VSync", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_Negative_VSync, { "Negative_VSync", "x11.xf86vidmode.ModModeLine.flags.Negative_VSync", 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_mask_Composite_Sync, { "Composite_Sync", "x11.xf86vidmode.ModModeLine.flags.Composite_Sync", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_Positive_CSync, { "Positive_CSync", "x11.xf86vidmode.ModModeLine.flags.Positive_CSync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_Negative_CSync, { "Negative_CSync", "x11.xf86vidmode.ModModeLine.flags.Negative_CSync", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_HSkew, { "HSkew", "x11.xf86vidmode.ModModeLine.flags.HSkew", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_Broadcast, { "Broadcast", "x11.xf86vidmode.ModModeLine.flags.Broadcast", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_Pixmux, { "Pixmux", "x11.xf86vidmode.ModModeLine.flags.Pixmux", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_Double_Clock, { "Double_Clock", "x11.xf86vidmode.ModModeLine.flags.Double_Clock", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ModModeLine_flags_mask_Half_Clock, { "Half_Clock", "x11.xf86vidmode.ModModeLine.flags.Half_Clock", FT_BOOLEAN, 32, NULL, 1 << 12, 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_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -3419,20 +3486,19 @@
 { &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_Positive_HSync, { "Positive_HSync", "x11.xf86vidmode.AddModeLine.flags.Positive_HSync", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_Negative_HSync, { "Negative_HSync", "x11.xf86vidmode.AddModeLine.flags.Negative_HSync", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_Positive_VSync, { "Positive_VSync", "x11.xf86vidmode.AddModeLine.flags.Positive_VSync", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_Negative_VSync, { "Negative_VSync", "x11.xf86vidmode.AddModeLine.flags.Negative_VSync", 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_mask_Composite_Sync, { "Composite_Sync", "x11.xf86vidmode.AddModeLine.flags.Composite_Sync", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_Positive_CSync, { "Positive_CSync", "x11.xf86vidmode.AddModeLine.flags.Positive_CSync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_Negative_CSync, { "Negative_CSync", "x11.xf86vidmode.AddModeLine.flags.Negative_CSync", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_HSkew, { "HSkew", "x11.xf86vidmode.AddModeLine.flags.HSkew", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_Broadcast, { "Broadcast", "x11.xf86vidmode.AddModeLine.flags.Broadcast", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_Pixmux, { "Pixmux", "x11.xf86vidmode.AddModeLine.flags.Pixmux", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_Double_Clock, { "Double_Clock", "x11.xf86vidmode.AddModeLine.flags.Double_Clock", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_flags_mask_Half_Clock, { "Half_Clock", "x11.xf86vidmode.AddModeLine.flags.Half_Clock", FT_BOOLEAN, 32, NULL, 1 << 12, 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 }},
@@ -3445,20 +3511,19 @@
 { &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_Positive_HSync, { "Positive_HSync", "x11.xf86vidmode.AddModeLine.after_flags.Positive_HSync", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Negative_HSync, { "Negative_HSync", "x11.xf86vidmode.AddModeLine.after_flags.Negative_HSync", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Positive_VSync, { "Positive_VSync", "x11.xf86vidmode.AddModeLine.after_flags.Positive_VSync", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Negative_VSync, { "Negative_VSync", "x11.xf86vidmode.AddModeLine.after_flags.Negative_VSync", 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_mask_Composite_Sync, { "Composite_Sync", "x11.xf86vidmode.AddModeLine.after_flags.Composite_Sync", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Positive_CSync, { "Positive_CSync", "x11.xf86vidmode.AddModeLine.after_flags.Positive_CSync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Negative_CSync, { "Negative_CSync", "x11.xf86vidmode.AddModeLine.after_flags.Negative_CSync", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_HSkew, { "HSkew", "x11.xf86vidmode.AddModeLine.after_flags.HSkew", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Broadcast, { "Broadcast", "x11.xf86vidmode.AddModeLine.after_flags.Broadcast", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Pixmux, { "Pixmux", "x11.xf86vidmode.AddModeLine.after_flags.Pixmux", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Double_Clock, { "Double_Clock", "x11.xf86vidmode.AddModeLine.after_flags.Double_Clock", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_AddModeLine_after_flags_mask_Half_Clock, { "Half_Clock", "x11.xf86vidmode.AddModeLine.after_flags.Half_Clock", FT_BOOLEAN, 32, NULL, 1 << 12, 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_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 }},
@@ -3472,20 +3537,19 @@
 { &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_Positive_HSync, { "Positive_HSync", "x11.xf86vidmode.DeleteModeLine.flags.Positive_HSync", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Negative_HSync, { "Negative_HSync", "x11.xf86vidmode.DeleteModeLine.flags.Negative_HSync", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Positive_VSync, { "Positive_VSync", "x11.xf86vidmode.DeleteModeLine.flags.Positive_VSync", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Negative_VSync, { "Negative_VSync", "x11.xf86vidmode.DeleteModeLine.flags.Negative_VSync", 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_mask_Composite_Sync, { "Composite_Sync", "x11.xf86vidmode.DeleteModeLine.flags.Composite_Sync", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Positive_CSync, { "Positive_CSync", "x11.xf86vidmode.DeleteModeLine.flags.Positive_CSync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Negative_CSync, { "Negative_CSync", "x11.xf86vidmode.DeleteModeLine.flags.Negative_CSync", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_HSkew, { "HSkew", "x11.xf86vidmode.DeleteModeLine.flags.HSkew", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Broadcast, { "Broadcast", "x11.xf86vidmode.DeleteModeLine.flags.Broadcast", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Pixmux, { "Pixmux", "x11.xf86vidmode.DeleteModeLine.flags.Pixmux", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Double_Clock, { "Double_Clock", "x11.xf86vidmode.DeleteModeLine.flags.Double_Clock", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_DeleteModeLine_flags_mask_Half_Clock, { "Half_Clock", "x11.xf86vidmode.DeleteModeLine.flags.Half_Clock", FT_BOOLEAN, 32, NULL, 1 << 12, 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_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -3500,20 +3564,19 @@
 { &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_Positive_HSync, { "Positive_HSync", "x11.xf86vidmode.ValidateModeLine.flags.Positive_HSync", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Negative_HSync, { "Negative_HSync", "x11.xf86vidmode.ValidateModeLine.flags.Negative_HSync", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Positive_VSync, { "Positive_VSync", "x11.xf86vidmode.ValidateModeLine.flags.Positive_VSync", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Negative_VSync, { "Negative_VSync", "x11.xf86vidmode.ValidateModeLine.flags.Negative_VSync", 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_mask_Composite_Sync, { "Composite_Sync", "x11.xf86vidmode.ValidateModeLine.flags.Composite_Sync", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Positive_CSync, { "Positive_CSync", "x11.xf86vidmode.ValidateModeLine.flags.Positive_CSync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Negative_CSync, { "Negative_CSync", "x11.xf86vidmode.ValidateModeLine.flags.Negative_CSync", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_HSkew, { "HSkew", "x11.xf86vidmode.ValidateModeLine.flags.HSkew", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Broadcast, { "Broadcast", "x11.xf86vidmode.ValidateModeLine.flags.Broadcast", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Pixmux, { "Pixmux", "x11.xf86vidmode.ValidateModeLine.flags.Pixmux", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Double_Clock, { "Double_Clock", "x11.xf86vidmode.ValidateModeLine.flags.Double_Clock", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_ValidateModeLine_flags_mask_Half_Clock, { "Half_Clock", "x11.xf86vidmode.ValidateModeLine.flags.Half_Clock", FT_BOOLEAN, 32, NULL, 1 << 12, 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_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -3529,20 +3592,19 @@
 { &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_Positive_HSync, { "Positive_HSync", "x11.xf86vidmode.SwitchToMode.flags.Positive_HSync", FT_BOOLEAN, 32, NULL, 1 << 0, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Negative_HSync, { "Negative_HSync", "x11.xf86vidmode.SwitchToMode.flags.Negative_HSync", FT_BOOLEAN, 32, NULL, 1 << 1, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Positive_VSync, { "Positive_VSync", "x11.xf86vidmode.SwitchToMode.flags.Positive_VSync", FT_BOOLEAN, 32, NULL, 1 << 2, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Negative_VSync, { "Negative_VSync", "x11.xf86vidmode.SwitchToMode.flags.Negative_VSync", 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_mask_Composite_Sync, { "Composite_Sync", "x11.xf86vidmode.SwitchToMode.flags.Composite_Sync", FT_BOOLEAN, 32, NULL, 1 << 5, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Positive_CSync, { "Positive_CSync", "x11.xf86vidmode.SwitchToMode.flags.Positive_CSync", FT_BOOLEAN, 32, NULL, 1 << 6, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Negative_CSync, { "Negative_CSync", "x11.xf86vidmode.SwitchToMode.flags.Negative_CSync", FT_BOOLEAN, 32, NULL, 1 << 7, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_HSkew, { "HSkew", "x11.xf86vidmode.SwitchToMode.flags.HSkew", FT_BOOLEAN, 32, NULL, 1 << 8, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Broadcast, { "Broadcast", "x11.xf86vidmode.SwitchToMode.flags.Broadcast", FT_BOOLEAN, 32, NULL, 1 << 9, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Pixmux, { "Pixmux", "x11.xf86vidmode.SwitchToMode.flags.Pixmux", FT_BOOLEAN, 32, NULL, 1 << 10, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Double_Clock, { "Double_Clock", "x11.xf86vidmode.SwitchToMode.flags.Double_Clock", FT_BOOLEAN, 32, NULL, 1 << 11, NULL, HFILL }},
+{ &hf_x11_xf86vidmode_SwitchToMode_flags_mask_Half_Clock, { "Half_Clock", "x11.xf86vidmode.SwitchToMode.flags.Half_Clock", FT_BOOLEAN, 32, NULL, 1 << 12, 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_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -3598,11 +3660,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_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_mode, { "mode", "x11.xfixes.ChangeSaveSet.mode", FT_UINT8, BASE_DEC, VALS(x11_enum_xfixes_SaveSetMode), 0, NULL, HFILL }},
+{ &hf_x11_xfixes_ChangeSaveSet_target, { "target", "x11.xfixes.ChangeSaveSet.target", FT_UINT8, BASE_DEC, VALS(x11_enum_xfixes_SaveSetTarget), 0, NULL, HFILL }},
+{ &hf_x11_xfixes_ChangeSaveSet_map, { "map", "x11.xfixes.ChangeSaveSet.map", FT_UINT8, BASE_DEC, VALS(x11_enum_xfixes_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_UINT8, BASE_HEX_DEC, VALS(x11_enum_SelectionEvent), 0, NULL, HFILL }},
+{ &hf_x11_xfixes_SelectionNotify_subtype, { "subtype", "x11.xfixes.SelectionNotify.subtype", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xfixes_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 }},
@@ -3614,11 +3676,11 @@
 { &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_UINT8, BASE_HEX_DEC, VALS(x11_enum_CursorNotify), 0, NULL, HFILL }},
+{ &hf_x11_xfixes_CursorNotify_subtype, { "subtype", "x11.xfixes.CursorNotify.subtype", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xfixes_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, VALS(x11_enum_Atom), 0, NULL, HFILL }},
+{ &hf_x11_xfixes_CursorNotify_name, { "name", "x11.xfixes.CursorNotify.name", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_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 }},
@@ -3638,7 +3700,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }},
+{ &hf_x11_xfixes_CreateRegionFromWindow_kind, { "kind", "x11.xfixes.CreateRegionFromWindow.kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_shape_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 }},
@@ -3671,23 +3733,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, VALS(x11_enum_Region), 0, NULL, HFILL }},
+{ &hf_x11_xfixes_SetGCClipRegion_region, { "region", "x11.xfixes.SetGCClipRegion.region", FT_UINT32, BASE_HEX, VALS(x11_enum_xfixes_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_UINT8, BASE_HEX_DEC, VALS(x11_enum_SK), 0, NULL, HFILL }},
+{ &hf_x11_xfixes_SetWindowShapeRegion_dest_kind, { "dest_kind", "x11.xfixes.SetWindowShapeRegion.dest_kind", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_shape_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, VALS(x11_enum_Region), 0, NULL, HFILL }},
+{ &hf_x11_xfixes_SetWindowShapeRegion_region, { "region", "x11.xfixes.SetWindowShapeRegion.region", FT_UINT32, BASE_HEX, VALS(x11_enum_xfixes_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, VALS(x11_enum_Region), 0, NULL, HFILL }},
+{ &hf_x11_xfixes_SetPictureClipRegion_region, { "region", "x11.xfixes.SetPictureClipRegion.region", FT_UINT32, BASE_HEX, VALS(x11_enum_xfixes_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, VALS(x11_enum_Atom), 0, NULL, HFILL }},
+{ &hf_x11_xfixes_GetCursorName_reply_atom, { "atom", "x11.xfixes.GetCursorName.reply.atom", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_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 }},
@@ -3697,7 +3759,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, VALS(x11_enum_Atom), 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_xproto_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 }},
@@ -3753,12 +3815,12 @@
 { &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_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_struct_DeviceInfo_device_use, { "device_use", "x11.struct.DeviceInfo.device_use", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_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_UINT8, BASE_HEX_DEC, VALS(x11_enum_InputClass), 0, NULL, HFILL }},
+{ &hf_x11_struct_InputClassInfo_class_id, { "class_id", "x11.struct.InputClassInfo.class_id", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_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 }},
@@ -3766,8 +3828,8 @@
 { &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_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_SetDeviceMode_mode, { "mode", "x11.xinput.SetDeviceMode.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_ValuatorMode), 0, NULL, HFILL }},
+{ &hf_x11_xinput_SetDeviceMode_reply_status, { "status", "x11.xinput.SetDeviceMode.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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 }},
@@ -3781,7 +3843,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_UINT8, BASE_HEX_DEC, VALS(x11_enum_PropagateMode), 0, NULL, HFILL }},
+{ &hf_x11_xinput_ChangeDeviceDontPropagateList_mode, { "mode", "x11.xinput.ChangeDeviceDontPropagateList.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_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 }},
@@ -3789,28 +3851,28 @@
 { &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, VALS(x11_enum_Time), 0, NULL, HFILL }},
+{ &hf_x11_xinput_GetDeviceMotionEvents_stop, { "stop", "x11.xinput.GetDeviceMotionEvents.stop", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_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_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_GetDeviceMotionEvents_reply_device_mode, { "device_mode", "x11.xinput.GetDeviceMotionEvents.reply.device_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_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_ChangeKeyboardDevice_reply_status, { "status", "x11.xinput.ChangeKeyboardDevice.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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_ChangePointerDevice_reply_status, { "status", "x11.xinput.ChangePointerDevice.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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, VALS(x11_enum_Time), 0, NULL, HFILL }},
+{ &hf_x11_xinput_GrabDevice_time, { "time", "x11.xinput.GrabDevice.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_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_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_this_device_mode, { "this_device_mode", "x11.xinput.GrabDevice.this_device_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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_xproto_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_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_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_GrabDevice_reply_status, { "status", "x11.xinput.GrabDevice.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_GrabStatus), 0, NULL, HFILL }},
+{ &hf_x11_xinput_UngrabDevice_time, { "time", "x11.xinput.UngrabDevice.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_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 }},
@@ -3826,9 +3888,9 @@
 { &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_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_key, { "key", "x11.xinput.GrabDeviceKey.key", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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_xproto_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_xproto_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 }},
@@ -3844,7 +3906,7 @@
 { &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_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_key, { "key", "x11.xinput.UngrabDeviceKey.key", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -3860,9 +3922,9 @@
 { &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_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_this_device_mode, { "this_device_mode", "x11.xinput.GrabDeviceButton.this_device_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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_xproto_GrabMode), 0, NULL, HFILL }},
+{ &hf_x11_xinput_GrabDeviceButton_button, { "button", "x11.xinput.GrabDeviceButton.button", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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 }},
@@ -3878,18 +3940,18 @@
 { &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_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_button, { "button", "x11.xinput.UngrabDeviceButton.button", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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_time, { "time", "x11.xinput.AllowDeviceEvents.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_Time), 0, NULL, HFILL }},
+{ &hf_x11_xinput_AllowDeviceEvents_mode, { "mode", "x11.xinput.AllowDeviceEvents.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_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_focus, { "focus", "x11.xinput.GetDeviceFocus.reply.focus", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_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_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_GetDeviceFocus_reply_revert_to, { "revert_to", "x11.xinput.GetDeviceFocus.reply.revert_to", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_InputFocus), 0, NULL, HFILL }},
+{ &hf_x11_xinput_SetDeviceFocus_focus, { "focus", "x11.xinput.SetDeviceFocus.focus", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_InputFocus), 0, NULL, HFILL }},
+{ &hf_x11_xinput_SetDeviceFocus_time, { "time", "x11.xinput.SetDeviceFocus.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_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_xproto_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 }},
@@ -3911,14 +3973,14 @@
 { &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_SetDeviceModifierMapping_reply_status, { "status", "x11.xinput.SetDeviceModifierMapping.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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_SetDeviceButtonMapping_reply_status, { "status", "x11.xinput.SetDeviceButtonMapping.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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 }},
@@ -3938,10 +4000,10 @@
 { &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_UINT8, BASE_HEX_DEC, VALS(x11_enum_GrabStatus), 0, NULL, HFILL }},
+{ &hf_x11_xinput_SetDeviceValuators_reply_status, { "status", "x11.xinput.SetDeviceValuators.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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_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_GetDeviceControl_reply_status, { "status", "x11.xinput.GetDeviceControl.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_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_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -3952,7 +4014,7 @@
 { &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, VALS(x11_enum_Window), 0, NULL, HFILL }},
+{ &hf_x11_xinput_DeviceKeyPress_child, { "child", "x11.xinput.DeviceKeyPress.child", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_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 }},
@@ -3960,10 +4022,10 @@
 { &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_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_detail, { "detail", "x11.xinput.FocusIn.detail", FT_UINT8, BASE_DEC, VALS(x11_enum_xproto_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_UINT8, BASE_DEC, VALS(x11_enum_NotifyMode), 0, NULL, HFILL }},
+{ &hf_x11_xinput_FocusIn_mode, { "mode", "x11.xinput.FocusIn.mode", FT_UINT8, BASE_DEC, VALS(x11_enum_xproto_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 }},
@@ -3994,13 +4056,13 @@
 { &hf_x11_xinput_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(xinput_extension_minor), 0, "minor opcode", HFILL }},
 
 { &hf_x11_union_AXOption, { "AXOption", "x11.union.AXOption", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_union_AXOption_fbopt, { "fbopt", "x11.union.AXOption.fbopt", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_AXFBOpt), 0, NULL, HFILL }},
-{ &hf_x11_union_AXOption_skopt, { "skopt", "x11.union.AXOption.skopt", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_AXSKOpt), 0, NULL, HFILL }},
+{ &hf_x11_union_AXOption_fbopt, { "fbopt", "x11.union.AXOption.fbopt", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_AXFBOpt), 0, NULL, HFILL }},
+{ &hf_x11_union_AXOption_skopt, { "skopt", "x11.union.AXOption.skopt", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_AXSKOpt), 0, NULL, HFILL }},
 { &hf_x11_struct_IndicatorMap, { "IndicatorMap", "x11.struct.IndicatorMap", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_IndicatorMap_flags, { "flags", "x11.struct.IndicatorMap.flags", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_IMFlag), 0, NULL, HFILL }},
-{ &hf_x11_struct_IndicatorMap_whichGroups, { "whichGroups", "x11.struct.IndicatorMap.whichGroups", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_IMGroupsWhich), 0, NULL, HFILL }},
-{ &hf_x11_struct_IndicatorMap_groups, { "groups", "x11.struct.IndicatorMap.groups", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SetOfGroup), 0, NULL, HFILL }},
-{ &hf_x11_struct_IndicatorMap_whichMods, { "whichMods", "x11.struct.IndicatorMap.whichMods", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_IMModsWhich), 0, NULL, HFILL }},
+{ &hf_x11_struct_IndicatorMap_flags, { "flags", "x11.struct.IndicatorMap.flags", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_IMFlag), 0, NULL, HFILL }},
+{ &hf_x11_struct_IndicatorMap_whichGroups, { "whichGroups", "x11.struct.IndicatorMap.whichGroups", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_IMGroupsWhich), 0, NULL, HFILL }},
+{ &hf_x11_struct_IndicatorMap_groups, { "groups", "x11.struct.IndicatorMap.groups", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SetOfGroup), 0, NULL, HFILL }},
+{ &hf_x11_struct_IndicatorMap_whichMods, { "whichMods", "x11.struct.IndicatorMap.whichMods", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_IMModsWhich), 0, NULL, HFILL }},
 { &hf_x11_struct_IndicatorMap_mods_mask_Shift, { "Shift", "x11.struct.IndicatorMap.mods.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_struct_IndicatorMap_mods_mask_Lock, { "Lock", "x11.struct.IndicatorMap.mods.Lock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_struct_IndicatorMap_mods_mask_Control, { "Control", "x11.struct.IndicatorMap.mods.Control", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
@@ -4038,7 +4100,7 @@
 { &hf_x11_struct_IndicatorMap_vmods_mask_14, { "14", "x11.struct.IndicatorMap.vmods.14", FT_BOOLEAN, 16, NULL, 1 << 14, NULL, HFILL }},
 { &hf_x11_struct_IndicatorMap_vmods_mask_15, { "15", "x11.struct.IndicatorMap.vmods.15", FT_BOOLEAN, 16, NULL, 1 << 15, NULL, HFILL }},
 { &hf_x11_struct_IndicatorMap_vmods, { "vmods", "x11.struct.IndicatorMap.vmods", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_IndicatorMap_ctrls, { "ctrls", "x11.struct.IndicatorMap.ctrls", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_BoolCtrl), 0, NULL, HFILL }},
+{ &hf_x11_struct_IndicatorMap_ctrls, { "ctrls", "x11.struct.IndicatorMap.ctrls", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xkb_BoolCtrl), 0, NULL, HFILL }},
 { &hf_x11_struct_ModDef, { "ModDef", "x11.struct.ModDef", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_ModDef_mask_mask_Shift, { "Shift", "x11.struct.ModDef.mask.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_struct_ModDef_mask_mask_Lock, { "Lock", "x11.struct.ModDef.mask.Lock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
@@ -4364,14 +4426,14 @@
 { &hf_x11_struct_Row_keys_item, { "keys", "x11.struct.Row.keys", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_CommonDoodad, { "CommonDoodad", "x11.struct.CommonDoodad", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_CommonDoodad_name, { "name", "x11.struct.CommonDoodad.name", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_CommonDoodad_type, { "type", "x11.struct.CommonDoodad.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_DoodadType), 0, NULL, HFILL }},
+{ &hf_x11_struct_CommonDoodad_type, { "type", "x11.struct.CommonDoodad.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_DoodadType), 0, NULL, HFILL }},
 { &hf_x11_struct_CommonDoodad_priority, { "priority", "x11.struct.CommonDoodad.priority", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_CommonDoodad_top, { "top", "x11.struct.CommonDoodad.top", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_CommonDoodad_left, { "left", "x11.struct.CommonDoodad.left", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_CommonDoodad_angle, { "angle", "x11.struct.CommonDoodad.angle", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_ShapeDoodad, { "ShapeDoodad", "x11.struct.ShapeDoodad", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_ShapeDoodad_name, { "name", "x11.struct.ShapeDoodad.name", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_ShapeDoodad_type, { "type", "x11.struct.ShapeDoodad.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_DoodadType), 0, NULL, HFILL }},
+{ &hf_x11_struct_ShapeDoodad_type, { "type", "x11.struct.ShapeDoodad.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_DoodadType), 0, NULL, HFILL }},
 { &hf_x11_struct_ShapeDoodad_priority, { "priority", "x11.struct.ShapeDoodad.priority", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_ShapeDoodad_top, { "top", "x11.struct.ShapeDoodad.top", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_ShapeDoodad_left, { "left", "x11.struct.ShapeDoodad.left", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -4380,7 +4442,7 @@
 { &hf_x11_struct_ShapeDoodad_shapeNdx, { "shapeNdx", "x11.struct.ShapeDoodad.shapeNdx", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_TextDoodad, { "TextDoodad", "x11.struct.TextDoodad", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_TextDoodad_name, { "name", "x11.struct.TextDoodad.name", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_TextDoodad_type, { "type", "x11.struct.TextDoodad.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_DoodadType), 0, NULL, HFILL }},
+{ &hf_x11_struct_TextDoodad_type, { "type", "x11.struct.TextDoodad.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_DoodadType), 0, NULL, HFILL }},
 { &hf_x11_struct_TextDoodad_priority, { "priority", "x11.struct.TextDoodad.priority", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_TextDoodad_top, { "top", "x11.struct.TextDoodad.top", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_TextDoodad_left, { "left", "x11.struct.TextDoodad.left", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -4392,7 +4454,7 @@
 { &hf_x11_struct_TextDoodad_font, { "font", "x11.struct.TextDoodad.font", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_IndicatorDoodad, { "IndicatorDoodad", "x11.struct.IndicatorDoodad", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_IndicatorDoodad_name, { "name", "x11.struct.IndicatorDoodad.name", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_IndicatorDoodad_type, { "type", "x11.struct.IndicatorDoodad.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_DoodadType), 0, NULL, HFILL }},
+{ &hf_x11_struct_IndicatorDoodad_type, { "type", "x11.struct.IndicatorDoodad.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_DoodadType), 0, NULL, HFILL }},
 { &hf_x11_struct_IndicatorDoodad_priority, { "priority", "x11.struct.IndicatorDoodad.priority", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_IndicatorDoodad_top, { "top", "x11.struct.IndicatorDoodad.top", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_IndicatorDoodad_left, { "left", "x11.struct.IndicatorDoodad.left", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -4402,7 +4464,7 @@
 { &hf_x11_struct_IndicatorDoodad_offColorNdx, { "offColorNdx", "x11.struct.IndicatorDoodad.offColorNdx", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_LogoDoodad, { "LogoDoodad", "x11.struct.LogoDoodad", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_LogoDoodad_name, { "name", "x11.struct.LogoDoodad.name", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_LogoDoodad_type, { "type", "x11.struct.LogoDoodad.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_DoodadType), 0, NULL, HFILL }},
+{ &hf_x11_struct_LogoDoodad_type, { "type", "x11.struct.LogoDoodad.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_DoodadType), 0, NULL, HFILL }},
 { &hf_x11_struct_LogoDoodad_priority, { "priority", "x11.struct.LogoDoodad.priority", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_LogoDoodad_top, { "top", "x11.struct.LogoDoodad.top", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_LogoDoodad_left, { "left", "x11.struct.LogoDoodad.left", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -4436,8 +4498,8 @@
 { &hf_x11_struct_Listing_length, { "length", "x11.struct.Listing.length", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_Listing_string, { "string", "x11.struct.Listing.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_DeviceLedInfo, { "DeviceLedInfo", "x11.struct.DeviceLedInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_DeviceLedInfo_ledClass, { "ledClass", "x11.struct.DeviceLedInfo.ledClass", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_LedClass), 0, NULL, HFILL }},
-{ &hf_x11_struct_DeviceLedInfo_ledID, { "ledID", "x11.struct.DeviceLedInfo.ledID", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_ID), 0, NULL, HFILL }},
+{ &hf_x11_struct_DeviceLedInfo_ledClass, { "ledClass", "x11.struct.DeviceLedInfo.ledClass", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_LedClass), 0, NULL, HFILL }},
+{ &hf_x11_struct_DeviceLedInfo_ledID, { "ledID", "x11.struct.DeviceLedInfo.ledID", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_ID), 0, NULL, HFILL }},
 { &hf_x11_struct_DeviceLedInfo_namesPresent, { "namesPresent", "x11.struct.DeviceLedInfo.namesPresent", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_DeviceLedInfo_mapsPresent, { "mapsPresent", "x11.struct.DeviceLedInfo.mapsPresent", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_DeviceLedInfo_physIndicators, { "physIndicators", "x11.struct.DeviceLedInfo.physIndicators", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -4447,9 +4509,9 @@
 { &hf_x11_struct_DeviceLedInfo_maps, { "maps", "x11.struct.DeviceLedInfo.maps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_DeviceLedInfo_maps_item, { "maps", "x11.struct.DeviceLedInfo.maps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SANoAction, { "SANoAction", "x11.struct.SANoAction", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SANoAction_type, { "type", "x11.struct.SANoAction.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SANoAction_type, { "type", "x11.struct.SANoAction.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SASetMods, { "SASetMods", "x11.struct.SASetMods", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SASetMods_type, { "type", "x11.struct.SASetMods.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SASetMods_type, { "type", "x11.struct.SASetMods.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SASetMods_flags_mask_ClearLocks, { "ClearLocks", "x11.struct.SASetMods.flags.ClearLocks", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_struct_SASetMods_flags_mask_LatchToLock, { "LatchToLock", "x11.struct.SASetMods.flags.LatchToLock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_struct_SASetMods_flags_mask_GroupAbsolute, { "GroupAbsolute", "x11.struct.SASetMods.flags.GroupAbsolute", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
@@ -4493,14 +4555,14 @@
 { &hf_x11_struct_SASetMods_vmodsLow_mask_7, { "7", "x11.struct.SASetMods.vmodsLow.7", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
 { &hf_x11_struct_SASetMods_vmodsLow, { "vmodsLow", "x11.struct.SASetMods.vmodsLow", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SASetGroup, { "SASetGroup", "x11.struct.SASetGroup", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SASetGroup_type, { "type", "x11.struct.SASetGroup.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SASetGroup_type, { "type", "x11.struct.SASetGroup.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SASetGroup_flags_mask_ClearLocks, { "ClearLocks", "x11.struct.SASetGroup.flags.ClearLocks", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_struct_SASetGroup_flags_mask_LatchToLock, { "LatchToLock", "x11.struct.SASetGroup.flags.LatchToLock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_struct_SASetGroup_flags_mask_GroupAbsolute, { "GroupAbsolute", "x11.struct.SASetGroup.flags.GroupAbsolute", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
 { &hf_x11_struct_SASetGroup_flags, { "flags", "x11.struct.SASetGroup.flags", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SASetGroup_group, { "group", "x11.struct.SASetGroup.group", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SAMovePtr, { "SAMovePtr", "x11.struct.SAMovePtr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SAMovePtr_type, { "type", "x11.struct.SAMovePtr.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SAMovePtr_type, { "type", "x11.struct.SAMovePtr.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SAMovePtr_flags_mask_NoAcceleration, { "NoAcceleration", "x11.struct.SAMovePtr.flags.NoAcceleration", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_struct_SAMovePtr_flags_mask_MoveAbsoluteX, { "MoveAbsoluteX", "x11.struct.SAMovePtr.flags.MoveAbsoluteX", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_struct_SAMovePtr_flags_mask_MoveAbsoluteY, { "MoveAbsoluteY", "x11.struct.SAMovePtr.flags.MoveAbsoluteY", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
@@ -4510,16 +4572,16 @@
 { &hf_x11_struct_SAMovePtr_yHigh, { "yHigh", "x11.struct.SAMovePtr.yHigh", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SAMovePtr_yLow, { "yLow", "x11.struct.SAMovePtr.yLow", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SAPtrBtn, { "SAPtrBtn", "x11.struct.SAPtrBtn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SAPtrBtn_type, { "type", "x11.struct.SAPtrBtn.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SAPtrBtn_type, { "type", "x11.struct.SAPtrBtn.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SAPtrBtn_flags, { "flags", "x11.struct.SAPtrBtn.flags", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SAPtrBtn_count, { "count", "x11.struct.SAPtrBtn.count", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SAPtrBtn_button, { "button", "x11.struct.SAPtrBtn.button", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SALockPtrBtn, { "SALockPtrBtn", "x11.struct.SALockPtrBtn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SALockPtrBtn_type, { "type", "x11.struct.SALockPtrBtn.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SALockPtrBtn_type, { "type", "x11.struct.SALockPtrBtn.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SALockPtrBtn_flags, { "flags", "x11.struct.SALockPtrBtn.flags", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SALockPtrBtn_button, { "button", "x11.struct.SALockPtrBtn.button", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SASetPtrDflt, { "SASetPtrDflt", "x11.struct.SASetPtrDflt", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SASetPtrDflt_type, { "type", "x11.struct.SASetPtrDflt.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SASetPtrDflt_type, { "type", "x11.struct.SASetPtrDflt.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SASetPtrDflt_flags_mask_AffectDfltButton, { "AffectDfltButton", "x11.struct.SASetPtrDflt.flags.AffectDfltButton", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_struct_SASetPtrDflt_flags_mask_DfltBtnAbsolute, { "DfltBtnAbsolute", "x11.struct.SASetPtrDflt.flags.DfltBtnAbsolute", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_struct_SASetPtrDflt_flags, { "flags", "x11.struct.SASetPtrDflt.flags", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -4528,7 +4590,7 @@
 { &hf_x11_struct_SASetPtrDflt_affect, { "affect", "x11.struct.SASetPtrDflt.affect", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SASetPtrDflt_value, { "value", "x11.struct.SASetPtrDflt.value", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SAIsoLock, { "SAIsoLock", "x11.struct.SAIsoLock", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SAIsoLock_type, { "type", "x11.struct.SAIsoLock.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SAIsoLock_type, { "type", "x11.struct.SAIsoLock.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SAIsoLock_flags_mask_NoLock, { "NoLock", "x11.struct.SAIsoLock.flags.NoLock", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_struct_SAIsoLock_flags_mask_NoUnlock, { "NoUnlock", "x11.struct.SAIsoLock.flags.NoUnlock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_struct_SAIsoLock_flags_mask_GroupAbsolute, { "GroupAbsolute", "x11.struct.SAIsoLock.flags.GroupAbsolute", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
@@ -4579,13 +4641,13 @@
 { &hf_x11_struct_SAIsoLock_vmodsLow_mask_7, { "7", "x11.struct.SAIsoLock.vmodsLow.7", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
 { &hf_x11_struct_SAIsoLock_vmodsLow, { "vmodsLow", "x11.struct.SAIsoLock.vmodsLow", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SATerminate, { "SATerminate", "x11.struct.SATerminate", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SATerminate_type, { "type", "x11.struct.SATerminate.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SATerminate_type, { "type", "x11.struct.SATerminate.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SASwitchScreen, { "SASwitchScreen", "x11.struct.SASwitchScreen", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SASwitchScreen_type, { "type", "x11.struct.SASwitchScreen.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SASwitchScreen_type, { "type", "x11.struct.SASwitchScreen.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SASwitchScreen_flags, { "flags", "x11.struct.SASwitchScreen.flags", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SASwitchScreen_newScreen, { "newScreen", "x11.struct.SASwitchScreen.newScreen", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SASetControls, { "SASetControls", "x11.struct.SASetControls", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SASetControls_type, { "type", "x11.struct.SASetControls.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SASetControls_type, { "type", "x11.struct.SASetControls.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SASetControls_boolCtrlsHigh_mask_AccessXFeedback, { "AccessXFeedback", "x11.struct.SASetControls.boolCtrlsHigh.AccessXFeedback", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_struct_SASetControls_boolCtrlsHigh_mask_AudibleBell, { "AudibleBell", "x11.struct.SASetControls.boolCtrlsHigh.AudibleBell", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_struct_SASetControls_boolCtrlsHigh_mask_Overlay1, { "Overlay1", "x11.struct.SASetControls.boolCtrlsHigh.Overlay1", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
@@ -4602,14 +4664,14 @@
 { &hf_x11_struct_SASetControls_boolCtrlsLow_mask_AccessXTimeout, { "AccessXTimeout", "x11.struct.SASetControls.boolCtrlsLow.AccessXTimeout", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
 { &hf_x11_struct_SASetControls_boolCtrlsLow, { "boolCtrlsLow", "x11.struct.SASetControls.boolCtrlsLow", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SAActionMessage, { "SAActionMessage", "x11.struct.SAActionMessage", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SAActionMessage_type, { "type", "x11.struct.SAActionMessage.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SAActionMessage_type, { "type", "x11.struct.SAActionMessage.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SAActionMessage_flags_mask_OnPress, { "OnPress", "x11.struct.SAActionMessage.flags.OnPress", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_struct_SAActionMessage_flags_mask_OnRelease, { "OnRelease", "x11.struct.SAActionMessage.flags.OnRelease", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_struct_SAActionMessage_flags_mask_GenKeyEvent, { "GenKeyEvent", "x11.struct.SAActionMessage.flags.GenKeyEvent", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
 { &hf_x11_struct_SAActionMessage_flags, { "flags", "x11.struct.SAActionMessage.flags", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SAActionMessage_message, { "message", "x11.struct.SAActionMessage.message", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SARedirectKey, { "SARedirectKey", "x11.struct.SARedirectKey", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SARedirectKey_type, { "type", "x11.struct.SARedirectKey.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SARedirectKey_type, { "type", "x11.struct.SARedirectKey.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SARedirectKey_newkey, { "newkey", "x11.struct.SARedirectKey.newkey", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SARedirectKey_mask_mask_Shift, { "Shift", "x11.struct.SARedirectKey.mask.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_struct_SARedirectKey_mask_mask_Lock, { "Lock", "x11.struct.SARedirectKey.mask.Lock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
@@ -4668,25 +4730,25 @@
 { &hf_x11_struct_SARedirectKey_vmodsLow_mask_7, { "7", "x11.struct.SARedirectKey.vmodsLow.7", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
 { &hf_x11_struct_SARedirectKey_vmodsLow, { "vmodsLow", "x11.struct.SARedirectKey.vmodsLow", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SADeviceBtn, { "SADeviceBtn", "x11.struct.SADeviceBtn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SADeviceBtn_type, { "type", "x11.struct.SADeviceBtn.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SADeviceBtn_type, { "type", "x11.struct.SADeviceBtn.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SADeviceBtn_flags, { "flags", "x11.struct.SADeviceBtn.flags", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SADeviceBtn_count, { "count", "x11.struct.SADeviceBtn.count", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SADeviceBtn_button, { "button", "x11.struct.SADeviceBtn.button", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SADeviceBtn_device, { "device", "x11.struct.SADeviceBtn.device", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SALockDeviceBtn, { "SALockDeviceBtn", "x11.struct.SALockDeviceBtn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SALockDeviceBtn_type, { "type", "x11.struct.SALockDeviceBtn.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SALockDeviceBtn_type, { "type", "x11.struct.SALockDeviceBtn.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SALockDeviceBtn_flags_mask_NoLock, { "NoLock", "x11.struct.SALockDeviceBtn.flags.NoLock", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_struct_SALockDeviceBtn_flags_mask_NoUnlock, { "NoUnlock", "x11.struct.SALockDeviceBtn.flags.NoUnlock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_struct_SALockDeviceBtn_flags, { "flags", "x11.struct.SALockDeviceBtn.flags", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SALockDeviceBtn_button, { "button", "x11.struct.SALockDeviceBtn.button", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SALockDeviceBtn_device, { "device", "x11.struct.SALockDeviceBtn.device", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SADeviceValuator, { "SADeviceValuator", "x11.struct.SADeviceValuator", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SADeviceValuator_type, { "type", "x11.struct.SADeviceValuator.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_struct_SADeviceValuator_type, { "type", "x11.struct.SADeviceValuator.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_struct_SADeviceValuator_device, { "device", "x11.struct.SADeviceValuator.device", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SADeviceValuator_val1what, { "val1what", "x11.struct.SADeviceValuator.val1what", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAValWhat), 0, NULL, HFILL }},
+{ &hf_x11_struct_SADeviceValuator_val1what, { "val1what", "x11.struct.SADeviceValuator.val1what", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAValWhat), 0, NULL, HFILL }},
 { &hf_x11_struct_SADeviceValuator_val1index, { "val1index", "x11.struct.SADeviceValuator.val1index", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SADeviceValuator_val1value, { "val1value", "x11.struct.SADeviceValuator.val1value", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_struct_SADeviceValuator_val2what, { "val2what", "x11.struct.SADeviceValuator.val2what", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAValWhat), 0, NULL, HFILL }},
+{ &hf_x11_struct_SADeviceValuator_val2what, { "val2what", "x11.struct.SADeviceValuator.val2what", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAValWhat), 0, NULL, HFILL }},
 { &hf_x11_struct_SADeviceValuator_val2index, { "val2index", "x11.struct.SADeviceValuator.val2index", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_SADeviceValuator_val2value, { "val2value", "x11.struct.SADeviceValuator.val2value", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_union_Action, { "Action", "x11.union.Action", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -4711,18 +4773,18 @@
 { &hf_x11_union_Action_devbtn, { "devbtn", "x11.union.Action.devbtn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_union_Action_lockdevbtn, { "lockdevbtn", "x11.union.Action.lockdevbtn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_union_Action_devval, { "devval", "x11.union.Action.devval", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_union_Action_type, { "type", "x11.union.Action.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_SAType), 0, NULL, HFILL }},
+{ &hf_x11_union_Action_type, { "type", "x11.union.Action.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_SAType), 0, NULL, HFILL }},
 { &hf_x11_xkb_UseExtension_wantedMajor, { "wantedMajor", "x11.xkb.UseExtension.wantedMajor", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_UseExtension_wantedMinor, { "wantedMinor", "x11.xkb.UseExtension.wantedMinor", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_UseExtension_reply_supported, { "supported", "x11.xkb.UseExtension.reply.supported", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_UseExtension_reply_serverMajor, { "serverMajor", "x11.xkb.UseExtension.reply.serverMajor", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_UseExtension_reply_serverMinor, { "serverMinor", "x11.xkb.UseExtension.reply.serverMinor", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SelectEvents_deviceSpec, { "deviceSpec", "x11.xkb.SelectEvents.deviceSpec", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_SelectEvents_affectWhich, { "affectWhich", "x11.xkb.SelectEvents.affectWhich", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_EventType), 0, NULL, HFILL }},
-{ &hf_x11_xkb_SelectEvents_clear, { "clear", "x11.xkb.SelectEvents.clear", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_EventType), 0, NULL, HFILL }},
-{ &hf_x11_xkb_SelectEvents_selectAll, { "selectAll", "x11.xkb.SelectEvents.selectAll", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_EventType), 0, NULL, HFILL }},
-{ &hf_x11_xkb_SelectEvents_affectMap, { "affectMap", "x11.xkb.SelectEvents.affectMap", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_MapPart), 0, NULL, HFILL }},
-{ &hf_x11_xkb_SelectEvents_map, { "map", "x11.xkb.SelectEvents.map", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_MapPart), 0, NULL, HFILL }},
+{ &hf_x11_xkb_SelectEvents_affectWhich, { "affectWhich", "x11.xkb.SelectEvents.affectWhich", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_EventType), 0, NULL, HFILL }},
+{ &hf_x11_xkb_SelectEvents_clear, { "clear", "x11.xkb.SelectEvents.clear", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_EventType), 0, NULL, HFILL }},
+{ &hf_x11_xkb_SelectEvents_selectAll, { "selectAll", "x11.xkb.SelectEvents.selectAll", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_EventType), 0, NULL, HFILL }},
+{ &hf_x11_xkb_SelectEvents_affectMap, { "affectMap", "x11.xkb.SelectEvents.affectMap", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_MapPart), 0, NULL, HFILL }},
+{ &hf_x11_xkb_SelectEvents_map, { "map", "x11.xkb.SelectEvents.map", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_MapPart), 0, NULL, HFILL }},
 { &hf_x11_xkb_SelectEvents_NewKeyboardNotify_affectNewKeyboard_mask_Keycodes, { "Keycodes", "x11.xkb.SelectEvents.NewKeyboardNotify.affectNewKeyboard.Keycodes", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_xkb_SelectEvents_NewKeyboardNotify_affectNewKeyboard_mask_Geometry, { "Geometry", "x11.xkb.SelectEvents.NewKeyboardNotify.affectNewKeyboard.Geometry", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_xkb_SelectEvents_NewKeyboardNotify_affectNewKeyboard_mask_DeviceID, { "DeviceID", "x11.xkb.SelectEvents.NewKeyboardNotify.affectNewKeyboard.DeviceID", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }},
@@ -4897,8 +4959,8 @@
 { &hf_x11_xkb_GetState_reply_lockedMods_mask_5, { "5", "x11.xkb.GetState.reply.lockedMods.5", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
 { &hf_x11_xkb_GetState_reply_lockedMods_mask_Any, { "Any", "x11.xkb.GetState.reply.lockedMods.Any", FT_BOOLEAN, 8, NULL, 1 << 15, NULL, HFILL }},
 { &hf_x11_xkb_GetState_reply_lockedMods, { "lockedMods", "x11.xkb.GetState.reply.lockedMods", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetState_reply_group, { "group", "x11.xkb.GetState.reply.group", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Group), 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetState_reply_lockedGroup, { "lockedGroup", "x11.xkb.GetState.reply.lockedGroup", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Group), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetState_reply_group, { "group", "x11.xkb.GetState.reply.group", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_Group), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetState_reply_lockedGroup, { "lockedGroup", "x11.xkb.GetState.reply.lockedGroup", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_Group), 0, NULL, HFILL }},
 { &hf_x11_xkb_GetState_reply_baseGroup, { "baseGroup", "x11.xkb.GetState.reply.baseGroup", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetState_reply_latchedGroup, { "latchedGroup", "x11.xkb.GetState.reply.latchedGroup", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetState_reply_compatState_mask_Shift, { "Shift", "x11.xkb.GetState.reply.compatState.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
@@ -4931,6 +4993,16 @@
 { &hf_x11_xkb_GetState_reply_compatGrabMods_mask_5, { "5", "x11.xkb.GetState.reply.compatGrabMods.5", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
 { &hf_x11_xkb_GetState_reply_compatGrabMods_mask_Any, { "Any", "x11.xkb.GetState.reply.compatGrabMods.Any", FT_BOOLEAN, 8, NULL, 1 << 15, NULL, HFILL }},
 { &hf_x11_xkb_GetState_reply_compatGrabMods, { "compatGrabMods", "x11.xkb.GetState.reply.compatGrabMods", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetState_reply_lookupMods_mask_Shift, { "Shift", "x11.xkb.GetState.reply.lookupMods.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetState_reply_lookupMods_mask_Lock, { "Lock", "x11.xkb.GetState.reply.lookupMods.Lock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
+{ &hf_x11_xkb_GetState_reply_lookupMods_mask_Control, { "Control", "x11.xkb.GetState.reply.lookupMods.Control", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
+{ &hf_x11_xkb_GetState_reply_lookupMods_mask_1, { "1", "x11.xkb.GetState.reply.lookupMods.1", FT_BOOLEAN, 8, NULL, 1 << 3, NULL, HFILL }},
+{ &hf_x11_xkb_GetState_reply_lookupMods_mask_2, { "2", "x11.xkb.GetState.reply.lookupMods.2", FT_BOOLEAN, 8, NULL, 1 << 4, NULL, HFILL }},
+{ &hf_x11_xkb_GetState_reply_lookupMods_mask_3, { "3", "x11.xkb.GetState.reply.lookupMods.3", FT_BOOLEAN, 8, NULL, 1 << 5, NULL, HFILL }},
+{ &hf_x11_xkb_GetState_reply_lookupMods_mask_4, { "4", "x11.xkb.GetState.reply.lookupMods.4", FT_BOOLEAN, 8, NULL, 1 << 6, NULL, HFILL }},
+{ &hf_x11_xkb_GetState_reply_lookupMods_mask_5, { "5", "x11.xkb.GetState.reply.lookupMods.5", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
+{ &hf_x11_xkb_GetState_reply_lookupMods_mask_Any, { "Any", "x11.xkb.GetState.reply.lookupMods.Any", FT_BOOLEAN, 8, NULL, 1 << 15, NULL, HFILL }},
+{ &hf_x11_xkb_GetState_reply_lookupMods, { "lookupMods", "x11.xkb.GetState.reply.lookupMods", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetState_reply_compatLookupMods_mask_Shift, { "Shift", "x11.xkb.GetState.reply.compatLookupMods.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_xkb_GetState_reply_compatLookupMods_mask_Lock, { "Lock", "x11.xkb.GetState.reply.compatLookupMods.Lock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_xkb_GetState_reply_compatLookupMods_mask_Control, { "Control", "x11.xkb.GetState.reply.compatLookupMods.Control", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
@@ -4977,7 +5049,7 @@
 { &hf_x11_xkb_LatchLockState_modLocks_mask_Any, { "Any", "x11.xkb.LatchLockState.modLocks.Any", FT_BOOLEAN, 8, NULL, 1 << 15, NULL, HFILL }},
 { &hf_x11_xkb_LatchLockState_modLocks, { "modLocks", "x11.xkb.LatchLockState.modLocks", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_LatchLockState_lockGroup, { "lockGroup", "x11.xkb.LatchLockState.lockGroup", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_LatchLockState_groupLock, { "groupLock", "x11.xkb.LatchLockState.groupLock", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Group), 0, NULL, HFILL }},
+{ &hf_x11_xkb_LatchLockState_groupLock, { "groupLock", "x11.xkb.LatchLockState.groupLock", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_Group), 0, NULL, HFILL }},
 { &hf_x11_xkb_LatchLockState_affectModLatches_mask_Shift, { "Shift", "x11.xkb.LatchLockState.affectModLatches.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_xkb_LatchLockState_affectModLatches_mask_Lock, { "Lock", "x11.xkb.LatchLockState.affectModLatches.Lock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_xkb_LatchLockState_affectModLatches_mask_Control, { "Control", "x11.xkb.LatchLockState.affectModLatches.Control", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
@@ -5082,9 +5154,9 @@
 { &hf_x11_xkb_GetControls_reply_accessXTimeout, { "accessXTimeout", "x11.xkb.GetControls.reply.accessXTimeout", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsMask, { "accessXTimeoutOptionsMask", "x11.xkb.GetControls.reply.accessXTimeoutOptionsMask", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetControls_reply_accessXTimeoutOptionsValues, { "accessXTimeoutOptionsValues", "x11.xkb.GetControls.reply.accessXTimeoutOptionsValues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetControls_reply_accessXTimeoutMask, { "accessXTimeoutMask", "x11.xkb.GetControls.reply.accessXTimeoutMask", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_BoolCtrl), 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetControls_reply_accessXTimeoutValues, { "accessXTimeoutValues", "x11.xkb.GetControls.reply.accessXTimeoutValues", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_BoolCtrl), 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetControls_reply_enabledControls, { "enabledControls", "x11.xkb.GetControls.reply.enabledControls", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_BoolCtrl), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetControls_reply_accessXTimeoutMask, { "accessXTimeoutMask", "x11.xkb.GetControls.reply.accessXTimeoutMask", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xkb_BoolCtrl), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetControls_reply_accessXTimeoutValues, { "accessXTimeoutValues", "x11.xkb.GetControls.reply.accessXTimeoutValues", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xkb_BoolCtrl), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetControls_reply_enabledControls, { "enabledControls", "x11.xkb.GetControls.reply.enabledControls", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xkb_BoolCtrl), 0, NULL, HFILL }},
 { &hf_x11_xkb_GetControls_reply_perKeyRepeat, { "perKeyRepeat", "x11.xkb.GetControls.reply.perKeyRepeat", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_deviceSpec, { "deviceSpec", "x11.xkb.SetControls.deviceSpec", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_affectInternalRealMods_mask_Shift, { "Shift", "x11.xkb.SetControls.affectInternalRealMods.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
@@ -5097,16 +5169,16 @@
 { &hf_x11_xkb_SetControls_affectInternalRealMods_mask_5, { "5", "x11.xkb.SetControls.affectInternalRealMods.5", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_affectInternalRealMods_mask_Any, { "Any", "x11.xkb.SetControls.affectInternalRealMods.Any", FT_BOOLEAN, 8, NULL, 1 << 15, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_affectInternalRealMods, { "affectInternalRealMods", "x11.xkb.SetControls.affectInternalRealMods", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_interanlRealMods_mask_Shift, { "Shift", "x11.xkb.SetControls.interanlRealMods.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_interanlRealMods_mask_Lock, { "Lock", "x11.xkb.SetControls.interanlRealMods.Lock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_interanlRealMods_mask_Control, { "Control", "x11.xkb.SetControls.interanlRealMods.Control", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_interanlRealMods_mask_1, { "1", "x11.xkb.SetControls.interanlRealMods.1", FT_BOOLEAN, 8, NULL, 1 << 3, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_interanlRealMods_mask_2, { "2", "x11.xkb.SetControls.interanlRealMods.2", FT_BOOLEAN, 8, NULL, 1 << 4, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_interanlRealMods_mask_3, { "3", "x11.xkb.SetControls.interanlRealMods.3", FT_BOOLEAN, 8, NULL, 1 << 5, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_interanlRealMods_mask_4, { "4", "x11.xkb.SetControls.interanlRealMods.4", FT_BOOLEAN, 8, NULL, 1 << 6, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_interanlRealMods_mask_5, { "5", "x11.xkb.SetControls.interanlRealMods.5", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_interanlRealMods_mask_Any, { "Any", "x11.xkb.SetControls.interanlRealMods.Any", FT_BOOLEAN, 8, NULL, 1 << 15, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_interanlRealMods, { "interanlRealMods", "x11.xkb.SetControls.interanlRealMods", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_internalRealMods_mask_Shift, { "Shift", "x11.xkb.SetControls.internalRealMods.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_internalRealMods_mask_Lock, { "Lock", "x11.xkb.SetControls.internalRealMods.Lock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_internalRealMods_mask_Control, { "Control", "x11.xkb.SetControls.internalRealMods.Control", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_internalRealMods_mask_1, { "1", "x11.xkb.SetControls.internalRealMods.1", FT_BOOLEAN, 8, NULL, 1 << 3, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_internalRealMods_mask_2, { "2", "x11.xkb.SetControls.internalRealMods.2", FT_BOOLEAN, 8, NULL, 1 << 4, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_internalRealMods_mask_3, { "3", "x11.xkb.SetControls.internalRealMods.3", FT_BOOLEAN, 8, NULL, 1 << 5, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_internalRealMods_mask_4, { "4", "x11.xkb.SetControls.internalRealMods.4", FT_BOOLEAN, 8, NULL, 1 << 6, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_internalRealMods_mask_5, { "5", "x11.xkb.SetControls.internalRealMods.5", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_internalRealMods_mask_Any, { "Any", "x11.xkb.SetControls.internalRealMods.Any", FT_BOOLEAN, 8, NULL, 1 << 15, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_internalRealMods, { "internalRealMods", "x11.xkb.SetControls.internalRealMods", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_affectIgnoreLockRealMods_mask_Shift, { "Shift", "x11.xkb.SetControls.affectIgnoreLockRealMods.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_affectIgnoreLockRealMods_mask_Lock, { "Lock", "x11.xkb.SetControls.affectIgnoreLockRealMods.Lock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_affectIgnoreLockRealMods_mask_Control, { "Control", "x11.xkb.SetControls.affectIgnoreLockRealMods.Control", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
@@ -5161,45 +5233,45 @@
 { &hf_x11_xkb_SetControls_internalVirtualMods_mask_14, { "14", "x11.xkb.SetControls.internalVirtualMods.14", FT_BOOLEAN, 16, NULL, 1 << 14, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_internalVirtualMods_mask_15, { "15", "x11.xkb.SetControls.internalVirtualMods.15", FT_BOOLEAN, 16, NULL, 1 << 15, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_internalVirtualMods, { "internalVirtualMods", "x11.xkb.SetControls.internalVirtualMods", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_0, { "0", "x11.xkb.SetControls.affectInternalLockVirtualMods.0", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_1, { "1", "x11.xkb.SetControls.affectInternalLockVirtualMods.1", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_2, { "2", "x11.xkb.SetControls.affectInternalLockVirtualMods.2", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_3, { "3", "x11.xkb.SetControls.affectInternalLockVirtualMods.3", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_4, { "4", "x11.xkb.SetControls.affectInternalLockVirtualMods.4", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_5, { "5", "x11.xkb.SetControls.affectInternalLockVirtualMods.5", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_6, { "6", "x11.xkb.SetControls.affectInternalLockVirtualMods.6", FT_BOOLEAN, 16, NULL, 1 << 6, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_7, { "7", "x11.xkb.SetControls.affectInternalLockVirtualMods.7", FT_BOOLEAN, 16, NULL, 1 << 7, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_8, { "8", "x11.xkb.SetControls.affectInternalLockVirtualMods.8", FT_BOOLEAN, 16, NULL, 1 << 8, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_9, { "9", "x11.xkb.SetControls.affectInternalLockVirtualMods.9", FT_BOOLEAN, 16, NULL, 1 << 9, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_10, { "10", "x11.xkb.SetControls.affectInternalLockVirtualMods.10", FT_BOOLEAN, 16, NULL, 1 << 10, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_11, { "11", "x11.xkb.SetControls.affectInternalLockVirtualMods.11", FT_BOOLEAN, 16, NULL, 1 << 11, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_12, { "12", "x11.xkb.SetControls.affectInternalLockVirtualMods.12", FT_BOOLEAN, 16, NULL, 1 << 12, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_13, { "13", "x11.xkb.SetControls.affectInternalLockVirtualMods.13", FT_BOOLEAN, 16, NULL, 1 << 13, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_14, { "14", "x11.xkb.SetControls.affectInternalLockVirtualMods.14", FT_BOOLEAN, 16, NULL, 1 << 14, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods_mask_15, { "15", "x11.xkb.SetControls.affectInternalLockVirtualMods.15", FT_BOOLEAN, 16, NULL, 1 << 15, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectInternalLockVirtualMods, { "affectInternalLockVirtualMods", "x11.xkb.SetControls.affectInternalLockVirtualMods", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_0, { "0", "x11.xkb.SetControls.internalLockVirtualMods.0", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_1, { "1", "x11.xkb.SetControls.internalLockVirtualMods.1", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_2, { "2", "x11.xkb.SetControls.internalLockVirtualMods.2", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_3, { "3", "x11.xkb.SetControls.internalLockVirtualMods.3", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_4, { "4", "x11.xkb.SetControls.internalLockVirtualMods.4", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_5, { "5", "x11.xkb.SetControls.internalLockVirtualMods.5", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_6, { "6", "x11.xkb.SetControls.internalLockVirtualMods.6", FT_BOOLEAN, 16, NULL, 1 << 6, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_7, { "7", "x11.xkb.SetControls.internalLockVirtualMods.7", FT_BOOLEAN, 16, NULL, 1 << 7, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_8, { "8", "x11.xkb.SetControls.internalLockVirtualMods.8", FT_BOOLEAN, 16, NULL, 1 << 8, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_9, { "9", "x11.xkb.SetControls.internalLockVirtualMods.9", FT_BOOLEAN, 16, NULL, 1 << 9, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_10, { "10", "x11.xkb.SetControls.internalLockVirtualMods.10", FT_BOOLEAN, 16, NULL, 1 << 10, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_11, { "11", "x11.xkb.SetControls.internalLockVirtualMods.11", FT_BOOLEAN, 16, NULL, 1 << 11, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_12, { "12", "x11.xkb.SetControls.internalLockVirtualMods.12", FT_BOOLEAN, 16, NULL, 1 << 12, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_13, { "13", "x11.xkb.SetControls.internalLockVirtualMods.13", FT_BOOLEAN, 16, NULL, 1 << 13, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_14, { "14", "x11.xkb.SetControls.internalLockVirtualMods.14", FT_BOOLEAN, 16, NULL, 1 << 14, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods_mask_15, { "15", "x11.xkb.SetControls.internalLockVirtualMods.15", FT_BOOLEAN, 16, NULL, 1 << 15, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_internalLockVirtualMods, { "internalLockVirtualMods", "x11.xkb.SetControls.internalLockVirtualMods", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_0, { "0", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.0", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_1, { "1", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.1", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_2, { "2", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.2", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_3, { "3", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.3", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_4, { "4", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.4", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_5, { "5", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.5", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_6, { "6", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.6", FT_BOOLEAN, 16, NULL, 1 << 6, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_7, { "7", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.7", FT_BOOLEAN, 16, NULL, 1 << 7, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_8, { "8", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.8", FT_BOOLEAN, 16, NULL, 1 << 8, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_9, { "9", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.9", FT_BOOLEAN, 16, NULL, 1 << 9, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_10, { "10", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.10", FT_BOOLEAN, 16, NULL, 1 << 10, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_11, { "11", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.11", FT_BOOLEAN, 16, NULL, 1 << 11, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_12, { "12", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.12", FT_BOOLEAN, 16, NULL, 1 << 12, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_13, { "13", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.13", FT_BOOLEAN, 16, NULL, 1 << 13, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_14, { "14", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.14", FT_BOOLEAN, 16, NULL, 1 << 14, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods_mask_15, { "15", "x11.xkb.SetControls.affectIgnoreLockVirtualMods.15", FT_BOOLEAN, 16, NULL, 1 << 15, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectIgnoreLockVirtualMods, { "affectIgnoreLockVirtualMods", "x11.xkb.SetControls.affectIgnoreLockVirtualMods", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_0, { "0", "x11.xkb.SetControls.ignoreLockVirtualMods.0", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_1, { "1", "x11.xkb.SetControls.ignoreLockVirtualMods.1", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_2, { "2", "x11.xkb.SetControls.ignoreLockVirtualMods.2", FT_BOOLEAN, 16, NULL, 1 << 2, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_3, { "3", "x11.xkb.SetControls.ignoreLockVirtualMods.3", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_4, { "4", "x11.xkb.SetControls.ignoreLockVirtualMods.4", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_5, { "5", "x11.xkb.SetControls.ignoreLockVirtualMods.5", FT_BOOLEAN, 16, NULL, 1 << 5, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_6, { "6", "x11.xkb.SetControls.ignoreLockVirtualMods.6", FT_BOOLEAN, 16, NULL, 1 << 6, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_7, { "7", "x11.xkb.SetControls.ignoreLockVirtualMods.7", FT_BOOLEAN, 16, NULL, 1 << 7, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_8, { "8", "x11.xkb.SetControls.ignoreLockVirtualMods.8", FT_BOOLEAN, 16, NULL, 1 << 8, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_9, { "9", "x11.xkb.SetControls.ignoreLockVirtualMods.9", FT_BOOLEAN, 16, NULL, 1 << 9, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_10, { "10", "x11.xkb.SetControls.ignoreLockVirtualMods.10", FT_BOOLEAN, 16, NULL, 1 << 10, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_11, { "11", "x11.xkb.SetControls.ignoreLockVirtualMods.11", FT_BOOLEAN, 16, NULL, 1 << 11, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_12, { "12", "x11.xkb.SetControls.ignoreLockVirtualMods.12", FT_BOOLEAN, 16, NULL, 1 << 12, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_13, { "13", "x11.xkb.SetControls.ignoreLockVirtualMods.13", FT_BOOLEAN, 16, NULL, 1 << 13, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_14, { "14", "x11.xkb.SetControls.ignoreLockVirtualMods.14", FT_BOOLEAN, 16, NULL, 1 << 14, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods_mask_15, { "15", "x11.xkb.SetControls.ignoreLockVirtualMods.15", FT_BOOLEAN, 16, NULL, 1 << 15, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_ignoreLockVirtualMods, { "ignoreLockVirtualMods", "x11.xkb.SetControls.ignoreLockVirtualMods", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_mouseKeysDfltBtn, { "mouseKeysDfltBtn", "x11.xkb.SetControls.mouseKeysDfltBtn", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_groupsWrap, { "groupsWrap", "x11.xkb.SetControls.groupsWrap", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_accessXOptions, { "accessXOptions", "x11.xkb.SetControls.accessXOptions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_affectEnabledControls, { "affectEnabledControls", "x11.xkb.SetControls.affectEnabledControls", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_BoolCtrl), 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_enabledControls, { "enabledControls", "x11.xkb.SetControls.enabledControls", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_BoolCtrl), 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_affectEnabledControls, { "affectEnabledControls", "x11.xkb.SetControls.affectEnabledControls", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xkb_BoolCtrl), 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_enabledControls, { "enabledControls", "x11.xkb.SetControls.enabledControls", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xkb_BoolCtrl), 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_changeControls_mask_GroupsWrap, { "GroupsWrap", "x11.xkb.SetControls.changeControls.GroupsWrap", FT_BOOLEAN, 32, NULL, 1 << 27, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_changeControls_mask_InternalMods, { "InternalMods", "x11.xkb.SetControls.changeControls.InternalMods", FT_BOOLEAN, 32, NULL, 1 << 28, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_changeControls_mask_IgnoreLockMods, { "IgnoreLockMods", "x11.xkb.SetControls.changeControls.IgnoreLockMods", FT_BOOLEAN, 32, NULL, 1 << 29, NULL, HFILL }},
@@ -5216,14 +5288,14 @@
 { &hf_x11_xkb_SetControls_mouseKeysMaxSpeed, { "mouseKeysMaxSpeed", "x11.xkb.SetControls.mouseKeysMaxSpeed", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_mouseKeysCurve, { "mouseKeysCurve", "x11.xkb.SetControls.mouseKeysCurve", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_accessXTimeout, { "accessXTimeout", "x11.xkb.SetControls.accessXTimeout", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_accessXTimeoutMask, { "accessXTimeoutMask", "x11.xkb.SetControls.accessXTimeoutMask", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_BoolCtrl), 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetControls_accessXTimeoutValues, { "accessXTimeoutValues", "x11.xkb.SetControls.accessXTimeoutValues", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_BoolCtrl), 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_accessXTimeoutMask, { "accessXTimeoutMask", "x11.xkb.SetControls.accessXTimeoutMask", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xkb_BoolCtrl), 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetControls_accessXTimeoutValues, { "accessXTimeoutValues", "x11.xkb.SetControls.accessXTimeoutValues", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xkb_BoolCtrl), 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_accessXTimeoutOptionsMask, { "accessXTimeoutOptionsMask", "x11.xkb.SetControls.accessXTimeoutOptionsMask", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_accessXTimeoutOptionsValues, { "accessXTimeoutOptionsValues", "x11.xkb.SetControls.accessXTimeoutOptionsValues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetControls_perKeyRepeat, { "perKeyRepeat", "x11.xkb.SetControls.perKeyRepeat", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_deviceSpec, { "deviceSpec", "x11.xkb.GetMap.deviceSpec", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetMap_full, { "full", "x11.xkb.GetMap.full", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_MapPart), 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetMap_partial, { "partial", "x11.xkb.GetMap.partial", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_MapPart), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetMap_full, { "full", "x11.xkb.GetMap.full", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_MapPart), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetMap_partial, { "partial", "x11.xkb.GetMap.partial", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_MapPart), 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_firstType, { "firstType", "x11.xkb.GetMap.firstType", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_nTypes, { "nTypes", "x11.xkb.GetMap.nTypes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_firstKeySym, { "firstKeySym", "x11.xkb.GetMap.firstKeySym", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -5258,7 +5330,7 @@
 { &hf_x11_xkb_GetMap_reply_deviceID, { "deviceID", "x11.xkb.GetMap.reply.deviceID", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_minKeyCode, { "minKeyCode", "x11.xkb.GetMap.reply.minKeyCode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_maxKeyCode, { "maxKeyCode", "x11.xkb.GetMap.reply.maxKeyCode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetMap_reply_present, { "present", "x11.xkb.GetMap.reply.present", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_MapPart), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetMap_reply_present, { "present", "x11.xkb.GetMap.reply.present", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_MapPart), 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_firstType, { "firstType", "x11.xkb.GetMap.reply.firstType", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_nTypes, { "nTypes", "x11.xkb.GetMap.reply.nTypes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_totalTypes, { "totalTypes", "x11.xkb.GetMap.reply.totalTypes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -5321,7 +5393,7 @@
 { &hf_x11_xkb_GetMap_reply_VirtualModMap_vmodmap_rtrn, { "vmodmap_rtrn", "x11.xkb.GetMap.reply.VirtualModMap.vmodmap_rtrn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetMap_reply_VirtualModMap_vmodmap_rtrn_item, { "vmodmap_rtrn", "x11.xkb.GetMap.reply.VirtualModMap.vmodmap_rtrn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetMap_deviceSpec, { "deviceSpec", "x11.xkb.SetMap.deviceSpec", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetMap_present, { "present", "x11.xkb.SetMap.present", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_MapPart), 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetMap_present, { "present", "x11.xkb.SetMap.present", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_MapPart), 0, NULL, HFILL }},
 { &hf_x11_xkb_SetMap_flags_mask_ResizeTypes, { "ResizeTypes", "x11.xkb.SetMap.flags.ResizeTypes", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_xkb_SetMap_flags_mask_RecomputeActions, { "RecomputeActions", "x11.xkb.SetMap.flags.RecomputeActions", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_xkb_SetMap_flags, { "flags", "x11.xkb.SetMap.flags", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -5428,8 +5500,8 @@
 { &hf_x11_xkb_SetIndicatorMap_maps, { "maps", "x11.xkb.SetIndicatorMap.maps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetIndicatorMap_maps_item, { "maps", "x11.xkb.SetIndicatorMap.maps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetNamedIndicator_deviceSpec, { "deviceSpec", "x11.xkb.GetNamedIndicator.deviceSpec", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetNamedIndicator_ledClass, { "ledClass", "x11.xkb.GetNamedIndicator.ledClass", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_LedClass), 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetNamedIndicator_ledID, { "ledID", "x11.xkb.GetNamedIndicator.ledID", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_ID), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetNamedIndicator_ledClass, { "ledClass", "x11.xkb.GetNamedIndicator.ledClass", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_LedClass), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetNamedIndicator_ledID, { "ledID", "x11.xkb.GetNamedIndicator.ledID", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_ID), 0, NULL, HFILL }},
 { &hf_x11_xkb_GetNamedIndicator_indicator, { "indicator", "x11.xkb.GetNamedIndicator.indicator", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetNamedIndicator_reply_deviceID, { "deviceID", "x11.xkb.GetNamedIndicator.reply.deviceID", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetNamedIndicator_reply_indicator, { "indicator", "x11.xkb.GetNamedIndicator.reply.indicator", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
@@ -5507,8 +5579,8 @@
 { &hf_x11_xkb_GetNamedIndicator_reply_map_ctrls_mask_IgnoreGroupLockMask, { "IgnoreGroupLockMask", "x11.xkb.GetNamedIndicator.reply.map_ctrls.IgnoreGroupLockMask", FT_BOOLEAN, 32, NULL, 1 << 12, NULL, HFILL }},
 { &hf_x11_xkb_GetNamedIndicator_reply_map_ctrls, { "map_ctrls", "x11.xkb.GetNamedIndicator.reply.map_ctrls", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetNamedIndicator_deviceSpec, { "deviceSpec", "x11.xkb.SetNamedIndicator.deviceSpec", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetNamedIndicator_ledClass, { "ledClass", "x11.xkb.SetNamedIndicator.ledClass", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_LedClass), 0, NULL, HFILL }},
-{ &hf_x11_xkb_SetNamedIndicator_ledID, { "ledID", "x11.xkb.SetNamedIndicator.ledID", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_ID), 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetNamedIndicator_ledClass, { "ledClass", "x11.xkb.SetNamedIndicator.ledClass", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_LedClass), 0, NULL, HFILL }},
+{ &hf_x11_xkb_SetNamedIndicator_ledID, { "ledID", "x11.xkb.SetNamedIndicator.ledID", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_ID), 0, NULL, HFILL }},
 { &hf_x11_xkb_SetNamedIndicator_indicator, { "indicator", "x11.xkb.SetNamedIndicator.indicator", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetNamedIndicator_setState, { "setState", "x11.xkb.SetNamedIndicator.setState", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_SetNamedIndicator_on, { "on", "x11.xkb.SetNamedIndicator.on", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -5958,7 +6030,7 @@
 { &hf_x11_xkb_GetKbdByName_reply_Types_getmap_length, { "getmap_length", "x11.xkb.GetKbdByName.reply.Types.getmap_length", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_Types_typeMinKeyCode, { "typeMinKeyCode", "x11.xkb.GetKbdByName.reply.Types.typeMinKeyCode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_Types_typeMaxKeyCode, { "typeMaxKeyCode", "x11.xkb.GetKbdByName.reply.Types.typeMaxKeyCode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetKbdByName_reply_Types_present, { "present", "x11.xkb.GetKbdByName.reply.Types.present", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_MapPart), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetKbdByName_reply_Types_present, { "present", "x11.xkb.GetKbdByName.reply.Types.present", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_MapPart), 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_Types_firstType, { "firstType", "x11.xkb.GetKbdByName.reply.Types.firstType", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_Types_nTypes, { "nTypes", "x11.xkb.GetKbdByName.reply.Types.nTypes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_Types_totalTypes, { "totalTypes", "x11.xkb.GetKbdByName.reply.Types.totalTypes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -6035,7 +6107,7 @@
 { &hf_x11_xkb_GetKbdByName_reply_ClientSymbols_clientDeviceID, { "clientDeviceID", "x11.xkb.GetKbdByName.reply.ClientSymbols.clientDeviceID", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_ClientSymbols_clientMinKeyCode, { "clientMinKeyCode", "x11.xkb.GetKbdByName.reply.ClientSymbols.clientMinKeyCode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_ClientSymbols_clientMaxKeyCode, { "clientMaxKeyCode", "x11.xkb.GetKbdByName.reply.ClientSymbols.clientMaxKeyCode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetKbdByName_reply_ClientSymbols_present, { "present", "x11.xkb.GetKbdByName.reply.ClientSymbols.present", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_MapPart), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetKbdByName_reply_ClientSymbols_present, { "present", "x11.xkb.GetKbdByName.reply.ClientSymbols.present", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_MapPart), 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_ClientSymbols_firstType, { "firstType", "x11.xkb.GetKbdByName.reply.ClientSymbols.firstType", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_ClientSymbols_nTypes, { "nTypes", "x11.xkb.GetKbdByName.reply.ClientSymbols.nTypes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_ClientSymbols_totalTypes, { "totalTypes", "x11.xkb.GetKbdByName.reply.ClientSymbols.totalTypes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -6100,7 +6172,7 @@
 { &hf_x11_xkb_GetKbdByName_reply_ServerSymbols_serverDeviceID, { "serverDeviceID", "x11.xkb.GetKbdByName.reply.ServerSymbols.serverDeviceID", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_ServerSymbols_serverMinKeyCode, { "serverMinKeyCode", "x11.xkb.GetKbdByName.reply.ServerSymbols.serverMinKeyCode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_ServerSymbols_serverMaxKeyCode, { "serverMaxKeyCode", "x11.xkb.GetKbdByName.reply.ServerSymbols.serverMaxKeyCode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetKbdByName_reply_ServerSymbols_present, { "present", "x11.xkb.GetKbdByName.reply.ServerSymbols.present", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_MapPart), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetKbdByName_reply_ServerSymbols_present, { "present", "x11.xkb.GetKbdByName.reply.ServerSymbols.present", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_MapPart), 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_ServerSymbols_firstType, { "firstType", "x11.xkb.GetKbdByName.reply.ServerSymbols.firstType", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_ServerSymbols_nTypes, { "nTypes", "x11.xkb.GetKbdByName.reply.ServerSymbols.nTypes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetKbdByName_reply_ServerSymbols_totalTypes, { "totalTypes", "x11.xkb.GetKbdByName.reply.ServerSymbols.totalTypes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -6338,8 +6410,8 @@
 { &hf_x11_xkb_GetDeviceInfo_allButtons, { "allButtons", "x11.xkb.GetDeviceInfo.allButtons", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetDeviceInfo_firstButton, { "firstButton", "x11.xkb.GetDeviceInfo.firstButton", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetDeviceInfo_nButtons, { "nButtons", "x11.xkb.GetDeviceInfo.nButtons", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetDeviceInfo_ledClass, { "ledClass", "x11.xkb.GetDeviceInfo.ledClass", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_LedClass), 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetDeviceInfo_ledID, { "ledID", "x11.xkb.GetDeviceInfo.ledID", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_ID), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetDeviceInfo_ledClass, { "ledClass", "x11.xkb.GetDeviceInfo.ledClass", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_LedClass), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetDeviceInfo_ledID, { "ledID", "x11.xkb.GetDeviceInfo.ledID", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_ID), 0, NULL, HFILL }},
 { &hf_x11_xkb_GetDeviceInfo_reply_deviceID, { "deviceID", "x11.xkb.GetDeviceInfo.reply.deviceID", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetDeviceInfo_reply_present_mask_Keyboards, { "Keyboards", "x11.xkb.GetDeviceInfo.reply.present.Keyboards", FT_BOOLEAN, 16, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_xkb_GetDeviceInfo_reply_present_mask_ButtonActions, { "ButtonActions", "x11.xkb.GetDeviceInfo.reply.present.ButtonActions", FT_BOOLEAN, 16, NULL, 1 << 1, NULL, HFILL }},
@@ -6366,8 +6438,8 @@
 { &hf_x11_xkb_GetDeviceInfo_reply_nBtnsRtrn, { "nBtnsRtrn", "x11.xkb.GetDeviceInfo.reply.nBtnsRtrn", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetDeviceInfo_reply_totalBtns, { "totalBtns", "x11.xkb.GetDeviceInfo.reply.totalBtns", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetDeviceInfo_reply_hasOwnState, { "hasOwnState", "x11.xkb.GetDeviceInfo.reply.hasOwnState", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetDeviceInfo_reply_dfltKbdFB, { "dfltKbdFB", "x11.xkb.GetDeviceInfo.reply.dfltKbdFB", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_ID), 0, NULL, HFILL }},
-{ &hf_x11_xkb_GetDeviceInfo_reply_dfltLedFB, { "dfltLedFB", "x11.xkb.GetDeviceInfo.reply.dfltLedFB", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_ID), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetDeviceInfo_reply_dfltKbdFB, { "dfltKbdFB", "x11.xkb.GetDeviceInfo.reply.dfltKbdFB", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_ID), 0, NULL, HFILL }},
+{ &hf_x11_xkb_GetDeviceInfo_reply_dfltLedFB, { "dfltLedFB", "x11.xkb.GetDeviceInfo.reply.dfltLedFB", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_ID), 0, NULL, HFILL }},
 { &hf_x11_xkb_GetDeviceInfo_reply_devType, { "devType", "x11.xkb.GetDeviceInfo.reply.devType", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetDeviceInfo_reply_nameLen, { "nameLen", "x11.xkb.GetDeviceInfo.reply.nameLen", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_GetDeviceInfo_reply_name, { "name", "x11.xkb.GetDeviceInfo.reply.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -6497,10 +6569,10 @@
 { &hf_x11_xkb_StateNotify_lockedMods_mask_5, { "5", "x11.xkb.StateNotify.lockedMods.5", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
 { &hf_x11_xkb_StateNotify_lockedMods_mask_Any, { "Any", "x11.xkb.StateNotify.lockedMods.Any", FT_BOOLEAN, 8, NULL, 1 << 15, NULL, HFILL }},
 { &hf_x11_xkb_StateNotify_lockedMods, { "lockedMods", "x11.xkb.StateNotify.lockedMods", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_StateNotify_group, { "group", "x11.xkb.StateNotify.group", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Group), 0, NULL, HFILL }},
+{ &hf_x11_xkb_StateNotify_group, { "group", "x11.xkb.StateNotify.group", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_Group), 0, NULL, HFILL }},
 { &hf_x11_xkb_StateNotify_baseGroup, { "baseGroup", "x11.xkb.StateNotify.baseGroup", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_StateNotify_latchedGroup, { "latchedGroup", "x11.xkb.StateNotify.latchedGroup", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_StateNotify_lockedGroup, { "lockedGroup", "x11.xkb.StateNotify.lockedGroup", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Group), 0, NULL, HFILL }},
+{ &hf_x11_xkb_StateNotify_lockedGroup, { "lockedGroup", "x11.xkb.StateNotify.lockedGroup", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_Group), 0, NULL, HFILL }},
 { &hf_x11_xkb_StateNotify_compatState_mask_Shift, { "Shift", "x11.xkb.StateNotify.compatState.Shift", FT_BOOLEAN, 8, NULL, 1 << 0, NULL, HFILL }},
 { &hf_x11_xkb_StateNotify_compatState_mask_Lock, { "Lock", "x11.xkb.StateNotify.compatState.Lock", FT_BOOLEAN, 8, NULL, 1 << 1, NULL, HFILL }},
 { &hf_x11_xkb_StateNotify_compatState_mask_Control, { "Control", "x11.xkb.StateNotify.compatState.Control", FT_BOOLEAN, 8, NULL, 1 << 2, NULL, HFILL }},
@@ -6693,7 +6765,7 @@
 { &hf_x11_xkb_CompatMapNotify_nTotalSI, { "nTotalSI", "x11.xkb.CompatMapNotify.nTotalSI", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_BellNotify_time, { "time", "x11.xkb.BellNotify.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_BellNotify_deviceID, { "deviceID", "x11.xkb.BellNotify.deviceID", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_BellNotify_bellClass, { "bellClass", "x11.xkb.BellNotify.bellClass", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_BellClassResult), 0, NULL, HFILL }},
+{ &hf_x11_xkb_BellNotify_bellClass, { "bellClass", "x11.xkb.BellNotify.bellClass", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_BellClassResult), 0, NULL, HFILL }},
 { &hf_x11_xkb_BellNotify_bellID, { "bellID", "x11.xkb.BellNotify.bellID", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_BellNotify_percent, { "percent", "x11.xkb.BellNotify.percent", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_BellNotify_pitch, { "pitch", "x11.xkb.BellNotify.pitch", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -6716,7 +6788,7 @@
 { &hf_x11_xkb_ActionMessage_mods_mask_5, { "5", "x11.xkb.ActionMessage.mods.5", FT_BOOLEAN, 8, NULL, 1 << 7, NULL, HFILL }},
 { &hf_x11_xkb_ActionMessage_mods_mask_Any, { "Any", "x11.xkb.ActionMessage.mods.Any", FT_BOOLEAN, 8, NULL, 1 << 15, NULL, HFILL }},
 { &hf_x11_xkb_ActionMessage_mods, { "mods", "x11.xkb.ActionMessage.mods", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_ActionMessage_group, { "group", "x11.xkb.ActionMessage.group", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_Group), 0, NULL, HFILL }},
+{ &hf_x11_xkb_ActionMessage_group, { "group", "x11.xkb.ActionMessage.group", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xkb_Group), 0, NULL, HFILL }},
 { &hf_x11_xkb_ActionMessage_message, { "message", "x11.xkb.ActionMessage.message", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_AccessXNotify_time, { "time", "x11.xkb.AccessXNotify.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_AccessXNotify_deviceID, { "deviceID", "x11.xkb.AccessXNotify.deviceID", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -6739,7 +6811,7 @@
 { &hf_x11_xkb_ExtensionDeviceNotify_reason_mask_IndicatorMaps, { "IndicatorMaps", "x11.xkb.ExtensionDeviceNotify.reason.IndicatorMaps", FT_BOOLEAN, 16, NULL, 1 << 3, NULL, HFILL }},
 { &hf_x11_xkb_ExtensionDeviceNotify_reason_mask_IndicatorState, { "IndicatorState", "x11.xkb.ExtensionDeviceNotify.reason.IndicatorState", FT_BOOLEAN, 16, NULL, 1 << 4, NULL, HFILL }},
 { &hf_x11_xkb_ExtensionDeviceNotify_reason, { "reason", "x11.xkb.ExtensionDeviceNotify.reason", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
-{ &hf_x11_xkb_ExtensionDeviceNotify_ledClass, { "ledClass", "x11.xkb.ExtensionDeviceNotify.ledClass", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_LedClassResult), 0, NULL, HFILL }},
+{ &hf_x11_xkb_ExtensionDeviceNotify_ledClass, { "ledClass", "x11.xkb.ExtensionDeviceNotify.ledClass", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xkb_LedClassResult), 0, NULL, HFILL }},
 { &hf_x11_xkb_ExtensionDeviceNotify_ledID, { "ledID", "x11.xkb.ExtensionDeviceNotify.ledID", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_ExtensionDeviceNotify_ledsDefined, { "ledsDefined", "x11.xkb.ExtensionDeviceNotify.ledsDefined", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xkb_ExtensionDeviceNotify_ledState, { "ledState", "x11.xkb.ExtensionDeviceNotify.ledState", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -6918,8 +6990,8 @@
 { &hf_x11_xtest_FakeInput_detail, { "detail", "x11.xtest.FakeInput.detail", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xtest_FakeInput_time, { "time", "x11.xtest.FakeInput.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &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_rootX, { "rootX", "x11.xtest.FakeInput.rootX", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xtest_FakeInput_rootY, { "rootY", "x11.xtest.FakeInput.rootY", FT_INT16, BASE_DEC, 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 }},
@@ -6961,8 +7033,8 @@
 { &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_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_type, { "type", "x11.struct.ImageFormatInfo.type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xv_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_xproto_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 }},
@@ -6970,7 +7042,7 @@
 { &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_UINT8, BASE_HEX_DEC, VALS(x11_enum_ImageFormatInfoFormat), 0, NULL, HFILL }},
+{ &hf_x11_struct_ImageFormatInfo_format, { "format", "x11.struct.ImageFormatInfo.format", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xv_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 }},
@@ -6981,8 +7053,8 @@
 { &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_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_struct_ImageFormatInfo_vscanline_order, { "vscanline_order", "x11.struct.ImageFormatInfo.vscanline_order", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xv_ScanlineOrder), 0, NULL, HFILL }},
+{ &hf_x11_xv_VideoNotify_reason, { "reason", "x11.xv.VideoNotify.reason", FT_UINT8, BASE_DEC, VALS(x11_enum_xv_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 }},
@@ -6999,10 +7071,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, 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_GrabPort_time, { "time", "x11.xv.GrabPort.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_Time), 0, NULL, HFILL }},
+{ &hf_x11_xv_GrabPort_reply_result, { "result", "x11.xv.GrabPort.reply.result", FT_UINT8, BASE_DEC, VALS(x11_enum_xv_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, VALS(x11_enum_Time), 0, NULL, HFILL }},
+{ &hf_x11_xv_UngrabPort_time, { "time", "x11.xv.UngrabPort.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_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 }},