x11: update X11 from last mesa and xcb

Change-Id: Ic3567b4789385a29bb420fba5c56bd5fecbb6a22
Reviewed-on: https://code.wireshark.org/review/11114
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>

1 files changed, 391 insertions, 9 deletions

diff --git a/epan/dissectors/x11-declarations.h b/epan/dissectors/x11-declarations.h
index 0806831d53..479f6cfdfb 100644
--- a/epan/dissectors/x11-declarations.h
+++ b/epan/dissectors/x11-declarations.h
@@ -2371,6 +2371,9 @@ static int hf_x11_glx_GetTexLevelParameteriv_reply_n = -1;
 static int hf_x11_glx_GetTexLevelParameteriv_reply_datum = -1;
 static int hf_x11_glx_GetTexLevelParameteriv_reply_data = -1;
 static int hf_x11_glx_GetTexLevelParameteriv_reply_data_item = -1;
+static int hf_x11_glx_IsEnabled_context_tag = -1;
+static int hf_x11_glx_IsEnabled_capability = -1;
+static int hf_x11_glx_IsEnabled_reply_ret_val = -1;
 static int hf_x11_glx_IsList_context_tag = -1;
 static int hf_x11_glx_IsList_list = -1;
 static int hf_x11_glx_IsList_reply_ret_val = -1;
@@ -2613,6 +2616,19 @@ static int hf_x11_struct_randr_ProviderProperty_state = -1;
 static int hf_x11_struct_randr_ResourceChange = -1;
 static int hf_x11_struct_randr_ResourceChange_timestamp = -1;
 static int hf_x11_struct_randr_ResourceChange_window = -1;
+static int hf_x11_struct_randr_MonitorInfo = -1;
+static int hf_x11_struct_randr_MonitorInfo_name = -1;
+static int hf_x11_struct_randr_MonitorInfo_primary = -1;
+static int hf_x11_struct_randr_MonitorInfo_automatic = -1;
+static int hf_x11_struct_randr_MonitorInfo_nOutput = -1;
+static int hf_x11_struct_randr_MonitorInfo_x = -1;
+static int hf_x11_struct_randr_MonitorInfo_y = -1;
+static int hf_x11_struct_randr_MonitorInfo_width = -1;
+static int hf_x11_struct_randr_MonitorInfo_height = -1;
+static int hf_x11_struct_randr_MonitorInfo_width_in_millimeters = -1;
+static int hf_x11_struct_randr_MonitorInfo_height_in_millimeters = -1;
+static int hf_x11_struct_randr_MonitorInfo_outputs = -1;
+static int hf_x11_struct_randr_MonitorInfo_outputs_item = -1;
 static int hf_x11_struct_sync_INT64 = -1;
 static int hf_x11_struct_sync_INT64_hi = -1;
 static int hf_x11_struct_sync_INT64_lo = -1;
@@ -3061,6 +3077,16 @@ static int hf_x11_union_randr_NotifyData_pp = -1;
 static int hf_x11_union_randr_NotifyData_rc = -1;
 static int hf_x11_randr_Notify_subCode = -1;
 static int hf_x11_randr_Notify_u = -1;
+static int hf_x11_randr_GetMonitors_window = -1;
+static int hf_x11_randr_GetMonitors_get_active = -1;
+static int hf_x11_randr_GetMonitors_reply_timestamp = -1;
+static int hf_x11_randr_GetMonitors_reply_nMonitors = -1;
+static int hf_x11_randr_GetMonitors_reply_nOutputs = -1;
+static int hf_x11_randr_GetMonitors_reply_monitors = -1;
+static int hf_x11_randr_SetMonitor_window = -1;
+static int hf_x11_randr_SetMonitor_monitorinfo = -1;
+static int hf_x11_randr_DeleteMonitor_window = -1;
+static int hf_x11_randr_DeleteMonitor_name = -1;
 static int hf_x11_randr_extension_minor = -1;
 
 static int hf_x11_struct_record_Range8 = -1;
@@ -3149,7 +3175,61 @@ static int hf_x11_render_QueryPictIndexValues_reply_values_item = -1;
 static int hf_x11_render_CreatePicture_pid = -1;
 static int hf_x11_render_CreatePicture_drawable = -1;
 static int hf_x11_render_CreatePicture_format = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_Repeat = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_AlphaMap = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_AlphaXOrigin = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_AlphaYOrigin = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_ClipXOrigin = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_ClipYOrigin = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_ClipMask = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_GraphicsExposure = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_SubwindowMode = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_PolyEdge = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_PolyMode = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_Dither = -1;
+static int hf_x11_render_CreatePicture_value_mask_mask_ComponentAlpha = -1;
+static int hf_x11_render_CreatePicture_value_mask = -1;
+static int hf_x11_render_CreatePicture_Repeat_repeat = -1;
+static int hf_x11_render_CreatePicture_AlphaMap_alphamap = -1;
+static int hf_x11_render_CreatePicture_AlphaXOrigin_alphaxorigin = -1;
+static int hf_x11_render_CreatePicture_AlphaYOrigin_alphayorigin = -1;
+static int hf_x11_render_CreatePicture_ClipXOrigin_clipxorigin = -1;
+static int hf_x11_render_CreatePicture_ClipYOrigin_clipyorigin = -1;
+static int hf_x11_render_CreatePicture_ClipMask_clipmask = -1;
+static int hf_x11_render_CreatePicture_GraphicsExposure_graphicsexposure = -1;
+static int hf_x11_render_CreatePicture_SubwindowMode_subwindowmode = -1;
+static int hf_x11_render_CreatePicture_PolyEdge_polyedge = -1;
+static int hf_x11_render_CreatePicture_PolyMode_polymode = -1;
+static int hf_x11_render_CreatePicture_Dither_dither = -1;
+static int hf_x11_render_CreatePicture_ComponentAlpha_componentalpha = -1;
 static int hf_x11_render_ChangePicture_picture = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_Repeat = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_AlphaMap = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_AlphaXOrigin = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_AlphaYOrigin = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_ClipXOrigin = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_ClipYOrigin = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_ClipMask = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_GraphicsExposure = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_SubwindowMode = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_PolyEdge = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_PolyMode = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_Dither = -1;
+static int hf_x11_render_ChangePicture_value_mask_mask_ComponentAlpha = -1;
+static int hf_x11_render_ChangePicture_value_mask = -1;
+static int hf_x11_render_ChangePicture_Repeat_repeat = -1;
+static int hf_x11_render_ChangePicture_AlphaMap_alphamap = -1;
+static int hf_x11_render_ChangePicture_AlphaXOrigin_alphaxorigin = -1;
+static int hf_x11_render_ChangePicture_AlphaYOrigin_alphayorigin = -1;
+static int hf_x11_render_ChangePicture_ClipXOrigin_clipxorigin = -1;
+static int hf_x11_render_ChangePicture_ClipYOrigin_clipyorigin = -1;
+static int hf_x11_render_ChangePicture_ClipMask_clipmask = -1;
+static int hf_x11_render_ChangePicture_GraphicsExposure_graphicsexposure = -1;
+static int hf_x11_render_ChangePicture_SubwindowMode_subwindowmode = -1;
+static int hf_x11_render_ChangePicture_PolyEdge_polyedge = -1;
+static int hf_x11_render_ChangePicture_PolyMode_polymode = -1;
+static int hf_x11_render_ChangePicture_Dither_dither = -1;
+static int hf_x11_render_ChangePicture_ComponentAlpha_componentalpha = -1;
 static int hf_x11_render_SetPictureClipRectangles_picture = -1;
 static int hf_x11_render_SetPictureClipRectangles_clip_x_origin = -1;
 static int hf_x11_render_SetPictureClipRectangles_clip_y_origin = -1;
@@ -3379,6 +3459,87 @@ static int hf_x11_screensaver_SetAttributes_border_width = -1;
 static int hf_x11_screensaver_SetAttributes_class = -1;
 static int hf_x11_screensaver_SetAttributes_depth = -1;
 static int hf_x11_screensaver_SetAttributes_visual = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_BackPixmap = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_BackPixel = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_BorderPixmap = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_BorderPixel = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_BitGravity = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_WinGravity = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_BackingStore = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_BackingPlanes = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_BackingPixel = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_OverrideRedirect = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_SaveUnder = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_EventMask = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_DontPropagate = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_Colormap = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask_mask_Cursor = -1;
+static int hf_x11_screensaver_SetAttributes_value_mask = -1;
+static int hf_x11_screensaver_SetAttributes_BackPixmap_background_pixmap = -1;
+static int hf_x11_screensaver_SetAttributes_BackPixel_background_pixel = -1;
+static int hf_x11_screensaver_SetAttributes_BorderPixmap_border_pixmap = -1;
+static int hf_x11_screensaver_SetAttributes_BorderPixel_border_pixel = -1;
+static int hf_x11_screensaver_SetAttributes_BitGravity_bit_gravity = -1;
+static int hf_x11_screensaver_SetAttributes_WinGravity_win_gravity = -1;
+static int hf_x11_screensaver_SetAttributes_BackingStore_backing_store = -1;
+static int hf_x11_screensaver_SetAttributes_BackingPlanes_backing_planes = -1;
+static int hf_x11_screensaver_SetAttributes_BackingPixel_backing_pixel = -1;
+static int hf_x11_screensaver_SetAttributes_OverrideRedirect_override_redirect = -1;
+static int hf_x11_screensaver_SetAttributes_SaveUnder_save_under = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_KeyPress = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_KeyRelease = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ButtonPress = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ButtonRelease = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_EnterWindow = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_LeaveWindow = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_PointerMotion = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_PointerMotionHint = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button1Motion = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button2Motion = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button3Motion = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button4Motion = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button5Motion = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ButtonMotion = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_KeymapState = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Exposure = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_VisibilityChange = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_StructureNotify = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ResizeRedirect = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_SubstructureNotify = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_SubstructureRedirect = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_FocusChange = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_PropertyChange = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ColorMapChange = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_OwnerGrabButton = -1;
+static int hf_x11_screensaver_SetAttributes_EventMask_event_mask = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_KeyPress = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_KeyRelease = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ButtonPress = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ButtonRelease = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_EnterWindow = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_LeaveWindow = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_PointerMotion = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_PointerMotionHint = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button1Motion = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button2Motion = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button3Motion = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button4Motion = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button5Motion = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ButtonMotion = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_KeymapState = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Exposure = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_VisibilityChange = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_StructureNotify = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ResizeRedirect = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_SubstructureNotify = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_SubstructureRedirect = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_FocusChange = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_PropertyChange = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ColorMapChange = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_OwnerGrabButton = -1;
+static int hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask = -1;
+static int hf_x11_screensaver_SetAttributes_Colormap_colormap = -1;
+static int hf_x11_screensaver_SetAttributes_Cursor_cursor = -1;
 static int hf_x11_screensaver_UnsetAttributes_drawable = -1;
 static int hf_x11_screensaver_Suspend_suspend = -1;
 static int hf_x11_screensaver_extension_minor = -1;
@@ -4026,9 +4187,9 @@ static int hf_x11_xfixes_GetCursorImageAndName_reply_yhot = -1;
 static int hf_x11_xfixes_GetCursorImageAndName_reply_cursor_serial = -1;
 static int hf_x11_xfixes_GetCursorImageAndName_reply_cursor_atom = -1;
 static int hf_x11_xfixes_GetCursorImageAndName_reply_nbytes = -1;
-static int hf_x11_xfixes_GetCursorImageAndName_reply_name = -1;
 static int hf_x11_xfixes_GetCursorImageAndName_reply_cursor_image = -1;
 static int hf_x11_xfixes_GetCursorImageAndName_reply_cursor_image_item = -1;
+static int hf_x11_xfixes_GetCursorImageAndName_reply_name = -1;
 static int hf_x11_xfixes_ChangeCursor_source = -1;
 static int hf_x11_xfixes_ChangeCursor_destination = -1;
 static int hf_x11_xfixes_ChangeCursorByName_src = -1;
@@ -4091,6 +4252,7 @@ static int hf_x11_struct_xinput_FP3232_integral = -1;
 static int hf_x11_struct_xinput_FP3232_frac = -1;
 static int hf_x11_xinput_GetExtensionVersion_name_len = -1;
 static int hf_x11_xinput_GetExtensionVersion_name = -1;
+static int hf_x11_xinput_GetExtensionVersion_reply_xi_reply_type = -1;
 static int hf_x11_xinput_GetExtensionVersion_reply_server_major = -1;
 static int hf_x11_xinput_GetExtensionVersion_reply_server_minor = -1;
 static int hf_x11_xinput_GetExtensionVersion_reply_present = -1;
@@ -4099,25 +4261,47 @@ static int hf_x11_struct_xinput_DeviceInfo_device_type = -1;
 static int hf_x11_struct_xinput_DeviceInfo_device_id = -1;
 static int hf_x11_struct_xinput_DeviceInfo_num_class_info = -1;
 static int hf_x11_struct_xinput_DeviceInfo_device_use = -1;
+static int hf_x11_struct_xinput_AxisInfo = -1;
+static int hf_x11_struct_xinput_AxisInfo_resolution = -1;
+static int hf_x11_struct_xinput_AxisInfo_minimum = -1;
+static int hf_x11_struct_xinput_AxisInfo_maximum = -1;
+static int hf_x11_struct_xinput_InputInfo = -1;
+static int hf_x11_struct_xinput_InputInfo_class_id = -1;
+static int hf_x11_struct_xinput_InputInfo_len = -1;
+static int hf_x11_struct_xinput_InputInfo_Key_min_keycode = -1;
+static int hf_x11_struct_xinput_InputInfo_Key_max_keycode = -1;
+static int hf_x11_struct_xinput_InputInfo_Key_num_keys = -1;
+static int hf_x11_struct_xinput_InputInfo_Button_num_buttons = -1;
+static int hf_x11_struct_xinput_InputInfo_Valuator_axes_len = -1;
+static int hf_x11_struct_xinput_InputInfo_Valuator_mode = -1;
+static int hf_x11_struct_xinput_InputInfo_Valuator_motion_size = -1;
+static int hf_x11_struct_xinput_InputInfo_Valuator_axes = -1;
+static int hf_x11_struct_xinput_InputInfo_Valuator_axes_item = -1;
+static int hf_x11_xinput_ListInputDevices_reply_xi_reply_type = -1;
 static int hf_x11_xinput_ListInputDevices_reply_devices_len = -1;
 static int hf_x11_xinput_ListInputDevices_reply_devices = -1;
 static int hf_x11_xinput_ListInputDevices_reply_devices_item = -1;
+static int hf_x11_xinput_ListInputDevices_reply_infos = -1;
+static int hf_x11_xinput_ListInputDevices_reply_names = -1;
 static int hf_x11_struct_xinput_InputClassInfo = -1;
 static int hf_x11_struct_xinput_InputClassInfo_class_id = -1;
 static int hf_x11_struct_xinput_InputClassInfo_event_type_base = -1;
 static int hf_x11_xinput_OpenDevice_device_id = -1;
+static int hf_x11_xinput_OpenDevice_reply_xi_reply_type = -1;
 static int hf_x11_xinput_OpenDevice_reply_num_classes = -1;
 static int hf_x11_xinput_OpenDevice_reply_class_info = -1;
 static int hf_x11_xinput_OpenDevice_reply_class_info_item = -1;
 static int hf_x11_xinput_CloseDevice_device_id = -1;
 static int hf_x11_xinput_SetDeviceMode_device_id = -1;
 static int hf_x11_xinput_SetDeviceMode_mode = -1;
+static int hf_x11_xinput_SetDeviceMode_reply_xi_reply_type = -1;
 static int hf_x11_xinput_SetDeviceMode_reply_status = -1;
 static int hf_x11_xinput_SelectExtensionEvent_window = -1;
 static int hf_x11_xinput_SelectExtensionEvent_num_classes = -1;
 static int hf_x11_xinput_SelectExtensionEvent_classes = -1;
 static int hf_x11_xinput_SelectExtensionEvent_classes_item = -1;
 static int hf_x11_xinput_GetSelectedExtensionEvents_window = -1;
+static int hf_x11_xinput_GetSelectedExtensionEvents_reply_xi_reply_type = -1;
 static int hf_x11_xinput_GetSelectedExtensionEvents_reply_num_this_classes = -1;
 static int hf_x11_xinput_GetSelectedExtensionEvents_reply_num_all_classes = -1;
 static int hf_x11_xinput_GetSelectedExtensionEvents_reply_this_classes = -1;
@@ -4130,20 +4314,29 @@ static int hf_x11_xinput_ChangeDeviceDontPropagateList_mode = -1;
 static int hf_x11_xinput_ChangeDeviceDontPropagateList_classes = -1;
 static int hf_x11_xinput_ChangeDeviceDontPropagateList_classes_item = -1;
 static int hf_x11_xinput_GetDeviceDontPropagateList_window = -1;
+static int hf_x11_xinput_GetDeviceDontPropagateList_reply_xi_reply_type = -1;
 static int hf_x11_xinput_GetDeviceDontPropagateList_reply_num_classes = -1;
 static int hf_x11_xinput_GetDeviceDontPropagateList_reply_classes = -1;
 static int hf_x11_xinput_GetDeviceDontPropagateList_reply_classes_item = -1;
+static int hf_x11_struct_xinput_DeviceTimeCoord = -1;
+static int hf_x11_struct_xinput_DeviceTimeCoord_time = -1;
+static int hf_x11_struct_xinput_DeviceTimeCoord_axisvalues = -1;
+static int hf_x11_struct_xinput_DeviceTimeCoord_axisvalues_item = -1;
 static int hf_x11_xinput_GetDeviceMotionEvents_start = -1;
 static int hf_x11_xinput_GetDeviceMotionEvents_stop = -1;
 static int hf_x11_xinput_GetDeviceMotionEvents_device_id = -1;
+static int hf_x11_xinput_GetDeviceMotionEvents_reply_xi_reply_type = -1;
 static int hf_x11_xinput_GetDeviceMotionEvents_reply_num_events = -1;
 static int hf_x11_xinput_GetDeviceMotionEvents_reply_num_axes = -1;
 static int hf_x11_xinput_GetDeviceMotionEvents_reply_device_mode = -1;
+static int hf_x11_xinput_GetDeviceMotionEvents_reply_events = -1;
 static int hf_x11_xinput_ChangeKeyboardDevice_device_id = -1;
+static int hf_x11_xinput_ChangeKeyboardDevice_reply_xi_reply_type = -1;
 static int hf_x11_xinput_ChangeKeyboardDevice_reply_status = -1;
 static int hf_x11_xinput_ChangePointerDevice_x_axis = -1;
 static int hf_x11_xinput_ChangePointerDevice_y_axis = -1;
 static int hf_x11_xinput_ChangePointerDevice_device_id = -1;
+static int hf_x11_xinput_ChangePointerDevice_reply_xi_reply_type = -1;
 static int hf_x11_xinput_ChangePointerDevice_reply_status = -1;
 static int hf_x11_xinput_GrabDevice_grab_window = -1;
 static int hf_x11_xinput_GrabDevice_time = -1;
@@ -4154,6 +4347,7 @@ static int hf_x11_xinput_GrabDevice_owner_events = -1;
 static int hf_x11_xinput_GrabDevice_device_id = -1;
 static int hf_x11_xinput_GrabDevice_classes = -1;
 static int hf_x11_xinput_GrabDevice_classes_item = -1;
+static int hf_x11_xinput_GrabDevice_reply_xi_reply_type = -1;
 static int hf_x11_xinput_GrabDevice_reply_status = -1;
 static int hf_x11_xinput_UngrabDevice_time = -1;
 static int hf_x11_xinput_UngrabDevice_device_id = -1;
@@ -4229,6 +4423,7 @@ static int hf_x11_xinput_AllowDeviceEvents_time = -1;
 static int hf_x11_xinput_AllowDeviceEvents_mode = -1;
 static int hf_x11_xinput_AllowDeviceEvents_device_id = -1;
 static int hf_x11_xinput_GetDeviceFocus_device_id = -1;
+static int hf_x11_xinput_GetDeviceFocus_reply_xi_reply_type = -1;
 static int hf_x11_xinput_GetDeviceFocus_reply_focus = -1;
 static int hf_x11_xinput_GetDeviceFocus_reply_time = -1;
 static int hf_x11_xinput_GetDeviceFocus_reply_revert_to = -1;
@@ -4240,15 +4435,65 @@ static int hf_x11_struct_xinput_FeedbackState = -1;
 static int hf_x11_struct_xinput_FeedbackState_class_id = -1;
 static int hf_x11_struct_xinput_FeedbackState_feedback_id = -1;
 static int hf_x11_struct_xinput_FeedbackState_len = -1;
-static int hf_x11_struct_xinput_FeedbackState_uninterpreted_data = -1;
+static int hf_x11_struct_xinput_FeedbackState_Keyboard_pitch = -1;
+static int hf_x11_struct_xinput_FeedbackState_Keyboard_duration = -1;
+static int hf_x11_struct_xinput_FeedbackState_Keyboard_led_mask = -1;
+static int hf_x11_struct_xinput_FeedbackState_Keyboard_led_values = -1;
+static int hf_x11_struct_xinput_FeedbackState_Keyboard_global_auto_repeat = -1;
+static int hf_x11_struct_xinput_FeedbackState_Keyboard_click = -1;
+static int hf_x11_struct_xinput_FeedbackState_Keyboard_percent = -1;
+static int hf_x11_struct_xinput_FeedbackState_Keyboard_auto_repeats = -1;
+static int hf_x11_struct_xinput_FeedbackState_Pointer_accel_num = -1;
+static int hf_x11_struct_xinput_FeedbackState_Pointer_accel_denom = -1;
+static int hf_x11_struct_xinput_FeedbackState_Pointer_threshold = -1;
+static int hf_x11_struct_xinput_FeedbackState_String_max_symbols = -1;
+static int hf_x11_struct_xinput_FeedbackState_String_num_keysyms = -1;
+static int hf_x11_struct_xinput_FeedbackState_String_keysyms = -1;
+static int hf_x11_struct_xinput_FeedbackState_String_keysyms_item = -1;
+static int hf_x11_struct_xinput_FeedbackState_Integer_resolution = -1;
+static int hf_x11_struct_xinput_FeedbackState_Integer_min_value = -1;
+static int hf_x11_struct_xinput_FeedbackState_Integer_max_value = -1;
+static int hf_x11_struct_xinput_FeedbackState_Led_led_mask = -1;
+static int hf_x11_struct_xinput_FeedbackState_Led_led_values = -1;
+static int hf_x11_struct_xinput_FeedbackState_Bell_percent = -1;
+static int hf_x11_struct_xinput_FeedbackState_Bell_pitch = -1;
+static int hf_x11_struct_xinput_FeedbackState_Bell_duration = -1;
 static int hf_x11_xinput_GetFeedbackControl_device_id = -1;
+static int hf_x11_xinput_GetFeedbackControl_reply_xi_reply_type = -1;
 static int hf_x11_xinput_GetFeedbackControl_reply_num_feedbacks = -1;
 static int hf_x11_xinput_GetFeedbackControl_reply_feedbacks = -1;
 static int hf_x11_struct_xinput_FeedbackCtl = -1;
 static int hf_x11_struct_xinput_FeedbackCtl_class_id = -1;
 static int hf_x11_struct_xinput_FeedbackCtl_feedback_id = -1;
 static int hf_x11_struct_xinput_FeedbackCtl_len = -1;
-static int hf_x11_struct_xinput_FeedbackCtl_uninterpreted_data = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Keyboard_key = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Keyboard_auto_repeat_mode = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Keyboard_key_click_percent = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Keyboard_bell_percent = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Keyboard_bell_pitch = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Keyboard_bell_duration = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Keyboard_led_mask = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Keyboard_led_values = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Pointer_num = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Pointer_denom = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Pointer_threshold = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_String_num_keysyms = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_String_keysyms = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_String_keysyms_item = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Integer_int_to_display = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Led_led_mask = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Led_led_values = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Bell_percent = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Bell_pitch = -1;
+static int hf_x11_struct_xinput_FeedbackCtl_Bell_duration = -1;
+static int hf_x11_xinput_ChangeFeedbackControl_mask_mask_AccelNum = -1;
+static int hf_x11_xinput_ChangeFeedbackControl_mask_mask_AccelDenom = -1;
+static int hf_x11_xinput_ChangeFeedbackControl_mask_mask_Threshold = -1;
+static int hf_x11_xinput_ChangeFeedbackControl_mask_mask_Duration = -1;
+static int hf_x11_xinput_ChangeFeedbackControl_mask_mask_Led = -1;
+static int hf_x11_xinput_ChangeFeedbackControl_mask_mask_LedMode = -1;
+static int hf_x11_xinput_ChangeFeedbackControl_mask_mask_Key = -1;
+static int hf_x11_xinput_ChangeFeedbackControl_mask_mask_AutoRepeatMode = -1;
 static int hf_x11_xinput_ChangeFeedbackControl_mask = -1;
 static int hf_x11_xinput_ChangeFeedbackControl_device_id = -1;
 static int hf_x11_xinput_ChangeFeedbackControl_feedback_id = -1;
@@ -4256,6 +4501,7 @@ static int hf_x11_xinput_ChangeFeedbackControl_feedback = -1;
 static int hf_x11_xinput_GetDeviceKeyMapping_device_id = -1;
 static int hf_x11_xinput_GetDeviceKeyMapping_first_keycode = -1;
 static int hf_x11_xinput_GetDeviceKeyMapping_count = -1;
+static int hf_x11_xinput_GetDeviceKeyMapping_reply_xi_reply_type = -1;
 static int hf_x11_xinput_GetDeviceKeyMapping_reply_keysyms_per_keycode = -1;
 static int hf_x11_xinput_GetDeviceKeyMapping_reply_keysyms = -1;
 static int hf_x11_xinput_GetDeviceKeyMapping_reply_keysyms_item = -1;
@@ -4266,25 +4512,38 @@ static int hf_x11_xinput_ChangeDeviceKeyMapping_keycode_count = -1;
 static int hf_x11_xinput_ChangeDeviceKeyMapping_keysyms = -1;
 static int hf_x11_xinput_ChangeDeviceKeyMapping_keysyms_item = -1;
 static int hf_x11_xinput_GetDeviceModifierMapping_device_id = -1;
+static int hf_x11_xinput_GetDeviceModifierMapping_reply_xi_reply_type = -1;
 static int hf_x11_xinput_GetDeviceModifierMapping_reply_keycodes_per_modifier = -1;
 static int hf_x11_xinput_GetDeviceModifierMapping_reply_keymaps = -1;
 static int hf_x11_xinput_SetDeviceModifierMapping_device_id = -1;
 static int hf_x11_xinput_SetDeviceModifierMapping_keycodes_per_modifier = -1;
 static int hf_x11_xinput_SetDeviceModifierMapping_keymaps = -1;
+static int hf_x11_xinput_SetDeviceModifierMapping_reply_xi_reply_type = -1;
 static int hf_x11_xinput_SetDeviceModifierMapping_reply_status = -1;
 static int hf_x11_xinput_GetDeviceButtonMapping_device_id = -1;
+static int hf_x11_xinput_GetDeviceButtonMapping_reply_xi_reply_type = -1;
 static int hf_x11_xinput_GetDeviceButtonMapping_reply_map_size = -1;
 static int hf_x11_xinput_GetDeviceButtonMapping_reply_map = -1;
 static int hf_x11_xinput_SetDeviceButtonMapping_device_id = -1;
 static int hf_x11_xinput_SetDeviceButtonMapping_map_size = -1;
 static int hf_x11_xinput_SetDeviceButtonMapping_map = -1;
+static int hf_x11_xinput_SetDeviceButtonMapping_reply_xi_reply_type = -1;
 static int hf_x11_xinput_SetDeviceButtonMapping_reply_status = -1;
 static int hf_x11_struct_xinput_InputState = -1;
 static int hf_x11_struct_xinput_InputState_class_id = -1;
 static int hf_x11_struct_xinput_InputState_len = -1;
-static int hf_x11_struct_xinput_InputState_num_items = -1;
-static int hf_x11_struct_xinput_InputState_uninterpreted_data = -1;
+static int hf_x11_struct_xinput_InputState_Key_num_keys = -1;
+static int hf_x11_struct_xinput_InputState_Key_keys = -1;
+static int hf_x11_struct_xinput_InputState_Button_num_buttons = -1;
+static int hf_x11_struct_xinput_InputState_Button_buttons = -1;
+static int hf_x11_struct_xinput_InputState_Valuator_num_valuators = -1;
+static int hf_x11_struct_xinput_InputState_Valuator_mode_mask_DeviceModeAbsolute = -1;
+static int hf_x11_struct_xinput_InputState_Valuator_mode_mask_OutOfProximity = -1;
+static int hf_x11_struct_xinput_InputState_Valuator_mode = -1;
+static int hf_x11_struct_xinput_InputState_Valuator_valuators = -1;
+static int hf_x11_struct_xinput_InputState_Valuator_valuators_item = -1;
 static int hf_x11_xinput_QueryDeviceState_device_id = -1;
+static int hf_x11_xinput_QueryDeviceState_reply_xi_reply_type = -1;
 static int hf_x11_xinput_QueryDeviceState_reply_num_classes = -1;
 static int hf_x11_xinput_QueryDeviceState_reply_classes = -1;
 static int hf_x11_xinput_SendExtensionEvent_destination = -1;
@@ -4304,24 +4563,70 @@ static int hf_x11_xinput_SetDeviceValuators_first_valuator = -1;
 static int hf_x11_xinput_SetDeviceValuators_num_valuators = -1;
 static int hf_x11_xinput_SetDeviceValuators_valuators = -1;
 static int hf_x11_xinput_SetDeviceValuators_valuators_item = -1;
+static int hf_x11_xinput_SetDeviceValuators_reply_xi_reply_type = -1;
 static int hf_x11_xinput_SetDeviceValuators_reply_status = -1;
 static int hf_x11_struct_xinput_DeviceState = -1;
 static int hf_x11_struct_xinput_DeviceState_control_id = -1;
 static int hf_x11_struct_xinput_DeviceState_len = -1;
-static int hf_x11_struct_xinput_DeviceState_uninterpreted_data = -1;
+static int hf_x11_struct_xinput_DeviceState_resolution_num_valuators = -1;
+static int hf_x11_struct_xinput_DeviceState_resolution_resolution_values = -1;
+static int hf_x11_struct_xinput_DeviceState_resolution_resolution_values_item = -1;
+static int hf_x11_struct_xinput_DeviceState_resolution_resolution_min = -1;
+static int hf_x11_struct_xinput_DeviceState_resolution_resolution_min_item = -1;
+static int hf_x11_struct_xinput_DeviceState_resolution_resolution_max = -1;
+static int hf_x11_struct_xinput_DeviceState_resolution_resolution_max_item = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_calib_min_x = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_calib_max_x = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_calib_min_y = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_calib_max_y = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_calib_flip_x = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_calib_flip_y = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_calib_rotation = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_calib_button_threshold = -1;
+static int hf_x11_struct_xinput_DeviceState_core_status = -1;
+static int hf_x11_struct_xinput_DeviceState_core_iscore = -1;
+static int hf_x11_struct_xinput_DeviceState_enable_enable = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_area_offset_x = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_area_offset_y = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_area_width = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_area_height = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_area_screen = -1;
+static int hf_x11_struct_xinput_DeviceState_abs_area_following = -1;
 static int hf_x11_xinput_GetDeviceControl_control_id = -1;
 static int hf_x11_xinput_GetDeviceControl_device_id = -1;
+static int hf_x11_xinput_GetDeviceControl_reply_xi_reply_type = -1;
 static int hf_x11_xinput_GetDeviceControl_reply_status = -1;
 static int hf_x11_xinput_GetDeviceControl_reply_control = -1;
 static int hf_x11_struct_xinput_DeviceCtl = -1;
 static int hf_x11_struct_xinput_DeviceCtl_control_id = -1;
 static int hf_x11_struct_xinput_DeviceCtl_len = -1;
-static int hf_x11_struct_xinput_DeviceCtl_uninterpreted_data = -1;
+static int hf_x11_struct_xinput_DeviceCtl_resolution_first_valuator = -1;
+static int hf_x11_struct_xinput_DeviceCtl_resolution_num_valuators = -1;
+static int hf_x11_struct_xinput_DeviceCtl_resolution_resolution_values = -1;
+static int hf_x11_struct_xinput_DeviceCtl_resolution_resolution_values_item = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_calib_min_x = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_calib_max_x = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_calib_min_y = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_calib_max_y = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_calib_flip_x = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_calib_flip_y = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_calib_rotation = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_calib_button_threshold = -1;
+static int hf_x11_struct_xinput_DeviceCtl_core_status = -1;
+static int hf_x11_struct_xinput_DeviceCtl_enable_enable = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_area_offset_x = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_area_offset_y = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_area_width = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_area_height = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_area_screen = -1;
+static int hf_x11_struct_xinput_DeviceCtl_abs_area_following = -1;
 static int hf_x11_xinput_ChangeDeviceControl_control_id = -1;
 static int hf_x11_xinput_ChangeDeviceControl_device_id = -1;
 static int hf_x11_xinput_ChangeDeviceControl_control = -1;
+static int hf_x11_xinput_ChangeDeviceControl_reply_xi_reply_type = -1;
 static int hf_x11_xinput_ChangeDeviceControl_reply_status = -1;
 static int hf_x11_xinput_ListDeviceProperties_device_id = -1;
+static int hf_x11_xinput_ListDeviceProperties_reply_xi_reply_type = -1;
 static int hf_x11_xinput_ListDeviceProperties_reply_num_atoms = -1;
 static int hf_x11_xinput_ListDeviceProperties_reply_atoms = -1;
 static int hf_x11_xinput_ListDeviceProperties_reply_atoms_item = -1;
@@ -4344,6 +4649,7 @@ static int hf_x11_xinput_GetDeviceProperty_offset = -1;
 static int hf_x11_xinput_GetDeviceProperty_len = -1;
 static int hf_x11_xinput_GetDeviceProperty_device_id = -1;
 static int hf_x11_xinput_GetDeviceProperty_delete = -1;
+static int hf_x11_xinput_GetDeviceProperty_reply_xi_reply_type = -1;
 static int hf_x11_xinput_GetDeviceProperty_reply_type = -1;
 static int hf_x11_xinput_GetDeviceProperty_reply_bytes_after = -1;
 static int hf_x11_xinput_GetDeviceProperty_reply_num_items = -1;
@@ -4393,7 +4699,17 @@ static int hf_x11_xinput_XIChangeCursor_deviceid = -1;
 static int hf_x11_struct_xinput_HierarchyChange = -1;
 static int hf_x11_struct_xinput_HierarchyChange_type = -1;
 static int hf_x11_struct_xinput_HierarchyChange_len = -1;
-static int hf_x11_struct_xinput_HierarchyChange_uninterpreted_data = -1;
+static int hf_x11_struct_xinput_HierarchyChange_AddMaster_name_len = -1;
+static int hf_x11_struct_xinput_HierarchyChange_AddMaster_send_core = -1;
+static int hf_x11_struct_xinput_HierarchyChange_AddMaster_enable = -1;
+static int hf_x11_struct_xinput_HierarchyChange_AddMaster_name = -1;
+static int hf_x11_struct_xinput_HierarchyChange_RemoveMaster_deviceid = -1;
+static int hf_x11_struct_xinput_HierarchyChange_RemoveMaster_return_mode = -1;
+static int hf_x11_struct_xinput_HierarchyChange_RemoveMaster_return_pointer = -1;
+static int hf_x11_struct_xinput_HierarchyChange_RemoveMaster_return_keyboard = -1;
+static int hf_x11_struct_xinput_HierarchyChange_AttachSlave_deviceid = -1;
+static int hf_x11_struct_xinput_HierarchyChange_AttachSlave_master = -1;
+static int hf_x11_struct_xinput_HierarchyChange_DetachSlave_deviceid = -1;
 static int hf_x11_xinput_XIChangeHierarchy_num_changes = -1;
 static int hf_x11_xinput_XIChangeHierarchy_changes = -1;
 static int hf_x11_xinput_XISetClientPointer_window = -1;
@@ -4443,7 +4759,29 @@ static int hf_x11_struct_xinput_DeviceClass = -1;
 static int hf_x11_struct_xinput_DeviceClass_type = -1;
 static int hf_x11_struct_xinput_DeviceClass_len = -1;
 static int hf_x11_struct_xinput_DeviceClass_sourceid = -1;
-static int hf_x11_struct_xinput_DeviceClass_uninterpreted_data = -1;
+static int hf_x11_struct_xinput_DeviceClass_Key_num_keys = -1;
+static int hf_x11_struct_xinput_DeviceClass_Key_keys = -1;
+static int hf_x11_struct_xinput_DeviceClass_Key_keys_item = -1;
+static int hf_x11_struct_xinput_DeviceClass_Button_num_buttons = -1;
+static int hf_x11_struct_xinput_DeviceClass_Button_state = -1;
+static int hf_x11_struct_xinput_DeviceClass_Button_state_item = -1;
+static int hf_x11_struct_xinput_DeviceClass_Button_labels = -1;
+static int hf_x11_struct_xinput_DeviceClass_Button_labels_item = -1;
+static int hf_x11_struct_xinput_DeviceClass_Valuator_number = -1;
+static int hf_x11_struct_xinput_DeviceClass_Valuator_label = -1;
+static int hf_x11_struct_xinput_DeviceClass_Valuator_min = -1;
+static int hf_x11_struct_xinput_DeviceClass_Valuator_max = -1;
+static int hf_x11_struct_xinput_DeviceClass_Valuator_value = -1;
+static int hf_x11_struct_xinput_DeviceClass_Valuator_resolution = -1;
+static int hf_x11_struct_xinput_DeviceClass_Valuator_mode = -1;
+static int hf_x11_struct_xinput_DeviceClass_Scroll_number = -1;
+static int hf_x11_struct_xinput_DeviceClass_Scroll_scroll_type = -1;
+static int hf_x11_struct_xinput_DeviceClass_Scroll_flags_mask_NoEmulation = -1;
+static int hf_x11_struct_xinput_DeviceClass_Scroll_flags_mask_Preferred = -1;
+static int hf_x11_struct_xinput_DeviceClass_Scroll_flags = -1;
+static int hf_x11_struct_xinput_DeviceClass_Scroll_increment = -1;
+static int hf_x11_struct_xinput_DeviceClass_Touch_mode = -1;
+static int hf_x11_struct_xinput_DeviceClass_Touch_num_touches = -1;
 static int hf_x11_struct_xinput_XIDeviceInfo = -1;
 static int hf_x11_struct_xinput_XIDeviceInfo_deviceid = -1;
 static int hf_x11_struct_xinput_XIDeviceInfo_type = -1;
@@ -4558,6 +4896,19 @@ static int hf_x11_xinput_DeviceKeyPress_root_x = -1;
 static int hf_x11_xinput_DeviceKeyPress_root_y = -1;
 static int hf_x11_xinput_DeviceKeyPress_event_x = -1;
 static int hf_x11_xinput_DeviceKeyPress_event_y = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Shift = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Lock = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Control = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Mod1 = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Mod2 = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Mod3 = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Mod4 = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Mod5 = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Button1 = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Button2 = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Button3 = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Button4 = -1;
+static int hf_x11_xinput_DeviceKeyPress_state_mask_Button5 = -1;
 static int hf_x11_xinput_DeviceKeyPress_state = -1;
 static int hf_x11_xinput_DeviceKeyPress_same_screen = -1;
 static int hf_x11_xinput_DeviceKeyPress_device_id = -1;
@@ -4571,6 +4922,11 @@ static int hf_x11_xinput_DeviceStateNotify_time = -1;
 static int hf_x11_xinput_DeviceStateNotify_num_keys = -1;
 static int hf_x11_xinput_DeviceStateNotify_num_buttons = -1;
 static int hf_x11_xinput_DeviceStateNotify_num_valuators = -1;
+static int hf_x11_xinput_DeviceStateNotify_classes_reported_mask_ReportingKeys = -1;
+static int hf_x11_xinput_DeviceStateNotify_classes_reported_mask_ReportingButtons = -1;
+static int hf_x11_xinput_DeviceStateNotify_classes_reported_mask_ReportingValuators = -1;
+static int hf_x11_xinput_DeviceStateNotify_classes_reported_mask_DeviceModeAbsolute = -1;
+static int hf_x11_xinput_DeviceStateNotify_classes_reported_mask_OutOfProximity = -1;
 static int hf_x11_xinput_DeviceStateNotify_classes_reported = -1;
 static int hf_x11_xinput_DeviceStateNotify_buttons = -1;
 static int hf_x11_xinput_DeviceStateNotify_keys = -1;
@@ -4623,6 +4979,8 @@ static int hf_x11_xinput_KeyPress_button_mask = -1;
 static int hf_x11_xinput_KeyPress_button_mask_item = -1;
 static int hf_x11_xinput_KeyPress_valuator_mask = -1;
 static int hf_x11_xinput_KeyPress_valuator_mask_item = -1;
+static int hf_x11_xinput_KeyPress_axisvalues = -1;
+static int hf_x11_xinput_KeyPress_axisvalues_item = -1;
 static int hf_x11_xinput_ButtonPress_deviceid = -1;
 static int hf_x11_xinput_ButtonPress_time = -1;
 static int hf_x11_xinput_ButtonPress_detail = -1;
@@ -4644,6 +5002,8 @@ static int hf_x11_xinput_ButtonPress_button_mask = -1;
 static int hf_x11_xinput_ButtonPress_button_mask_item = -1;
 static int hf_x11_xinput_ButtonPress_valuator_mask = -1;
 static int hf_x11_xinput_ButtonPress_valuator_mask_item = -1;
+static int hf_x11_xinput_ButtonPress_axisvalues = -1;
+static int hf_x11_xinput_ButtonPress_axisvalues_item = -1;
 static int hf_x11_xinput_Enter_deviceid = -1;
 static int hf_x11_xinput_Enter_time = -1;
 static int hf_x11_xinput_Enter_sourceid = -1;
@@ -4704,6 +5064,10 @@ static int hf_x11_xinput_RawKeyPress_flags_mask_KeyRepeat = -1;
 static int hf_x11_xinput_RawKeyPress_flags = -1;
 static int hf_x11_xinput_RawKeyPress_valuator_mask = -1;
 static int hf_x11_xinput_RawKeyPress_valuator_mask_item = -1;
+static int hf_x11_xinput_RawKeyPress_axisvalues = -1;
+static int hf_x11_xinput_RawKeyPress_axisvalues_item = -1;
+static int hf_x11_xinput_RawKeyPress_axisvalues_raw = -1;
+static int hf_x11_xinput_RawKeyPress_axisvalues_raw_item = -1;
 static int hf_x11_xinput_RawButtonPress_deviceid = -1;
 static int hf_x11_xinput_RawButtonPress_time = -1;
 static int hf_x11_xinput_RawButtonPress_detail = -1;
@@ -4713,6 +5077,10 @@ static int hf_x11_xinput_RawButtonPress_flags_mask_PointerEmulated = -1;
 static int hf_x11_xinput_RawButtonPress_flags = -1;
 static int hf_x11_xinput_RawButtonPress_valuator_mask = -1;
 static int hf_x11_xinput_RawButtonPress_valuator_mask_item = -1;
+static int hf_x11_xinput_RawButtonPress_axisvalues = -1;
+static int hf_x11_xinput_RawButtonPress_axisvalues_item = -1;
+static int hf_x11_xinput_RawButtonPress_axisvalues_raw = -1;
+static int hf_x11_xinput_RawButtonPress_axisvalues_raw_item = -1;
 static int hf_x11_xinput_TouchBegin_deviceid = -1;
 static int hf_x11_xinput_TouchBegin_time = -1;
 static int hf_x11_xinput_TouchBegin_detail = -1;
@@ -4735,6 +5103,8 @@ static int hf_x11_xinput_TouchBegin_button_mask = -1;
 static int hf_x11_xinput_TouchBegin_button_mask_item = -1;
 static int hf_x11_xinput_TouchBegin_valuator_mask = -1;
 static int hf_x11_xinput_TouchBegin_valuator_mask_item = -1;
+static int hf_x11_xinput_TouchBegin_axisvalues = -1;
+static int hf_x11_xinput_TouchBegin_axisvalues_item = -1;
 static int hf_x11_xinput_TouchOwnership_deviceid = -1;
 static int hf_x11_xinput_TouchOwnership_time = -1;
 static int hf_x11_xinput_TouchOwnership_touchid = -1;
@@ -4753,6 +5123,10 @@ static int hf_x11_xinput_RawTouchBegin_flags_mask_TouchEmulatingPointer = -1;
 static int hf_x11_xinput_RawTouchBegin_flags = -1;
 static int hf_x11_xinput_RawTouchBegin_valuator_mask = -1;
 static int hf_x11_xinput_RawTouchBegin_valuator_mask_item = -1;
+static int hf_x11_xinput_RawTouchBegin_axisvalues = -1;
+static int hf_x11_xinput_RawTouchBegin_axisvalues_item = -1;
+static int hf_x11_xinput_RawTouchBegin_axisvalues_raw = -1;
+static int hf_x11_xinput_RawTouchBegin_axisvalues_raw_item = -1;
 static int hf_x11_xinput_BarrierHit_deviceid = -1;
 static int hf_x11_xinput_BarrierHit_time = -1;
 static int hf_x11_xinput_BarrierHit_eventid = -1;
@@ -4760,6 +5134,8 @@ static int hf_x11_xinput_BarrierHit_root = -1;
 static int hf_x11_xinput_BarrierHit_event = -1;
 static int hf_x11_xinput_BarrierHit_barrier = -1;
 static int hf_x11_xinput_BarrierHit_dtime = -1;
+static int hf_x11_xinput_BarrierHit_flags_mask_PointerReleased = -1;
+static int hf_x11_xinput_BarrierHit_flags_mask_DeviceIsGrabbed = -1;
 static int hf_x11_xinput_BarrierHit_flags = -1;
 static int hf_x11_xinput_BarrierHit_sourceid = -1;
 static int hf_x11_xinput_BarrierHit_root_x = -1;
@@ -6616,6 +6992,7 @@ static int hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item = -1;
 static int hf_x11_xkb_GetNames_reply_GroupNames_groups = -1;
 static int hf_x11_xkb_GetNames_reply_GroupNames_groups_item = -1;
 static int hf_x11_xkb_GetNames_reply_KeyNames_keyNames = -1;
+static int hf_x11_xkb_GetNames_reply_KeyNames_keyNames_item = -1;
 static int hf_x11_xkb_GetNames_reply_KeyAliases_keyAliases = -1;
 static int hf_x11_xkb_GetNames_reply_KeyAliases_keyAliases_item = -1;
 static int hf_x11_xkb_GetNames_reply_RGNames_radioGroupNames = -1;
@@ -6686,6 +7063,7 @@ static int hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item = -1;
 static int hf_x11_xkb_SetNames_GroupNames_groups = -1;
 static int hf_x11_xkb_SetNames_GroupNames_groups_item = -1;
 static int hf_x11_xkb_SetNames_KeyNames_keyNames = -1;
+static int hf_x11_xkb_SetNames_KeyNames_keyNames_item = -1;
 static int hf_x11_xkb_SetNames_KeyAliases_keyAliases = -1;
 static int hf_x11_xkb_SetNames_KeyAliases_keyAliases_item = -1;
 static int hf_x11_xkb_SetNames_RGNames_radioGroupNames = -1;
@@ -7014,6 +7392,7 @@ static int hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModName
 static int hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups = -1;
 static int hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item = -1;
 static int hf_x11_xkb_GetKbdByName_reply_KeyNames_KeyNames_keyNames = -1;
+static int hf_x11_xkb_GetKbdByName_reply_KeyNames_KeyNames_keyNames_item = -1;
 static int hf_x11_xkb_GetKbdByName_reply_KeyNames_KeyAliases_keyAliases = -1;
 static int hf_x11_xkb_GetKbdByName_reply_KeyNames_KeyAliases_keyAliases_item = -1;
 static int hf_x11_xkb_GetKbdByName_reply_KeyNames_RGNames_radioGroupNames = -1;
@@ -7506,7 +7885,10 @@ static int hf_x11_xprint_PrintGetDocumentData_reply_data = -1;
 static int hf_x11_xprint_PrintStartPage_window = -1;
 static int hf_x11_xprint_PrintEndPage_cancel = -1;
 static int hf_x11_xprint_PrintSelectInput_context = -1;
+static int hf_x11_xprint_PrintSelectInput_event_mask = -1;
 static int hf_x11_xprint_PrintInputSelected_context = -1;
+static int hf_x11_xprint_PrintInputSelected_reply_event_mask = -1;
+static int hf_x11_xprint_PrintInputSelected_reply_all_events_mask = -1;
 static int hf_x11_xprint_PrintGetAttributes_context = -1;
 static int hf_x11_xprint_PrintGetAttributes_pool = -1;
 static int hf_x11_xprint_PrintGetAttributes_reply_stringLen = -1;