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

1 files changed, 212 insertions, 140 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;