diff options
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/x11-declarations.h | 400 | ||||
| -rw-r--r-- | epan/dissectors/x11-enum.h | 112 | ||||
| -rw-r--r-- | epan/dissectors/x11-extension-errors.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/x11-extension-implementation.h | 1242 | ||||
| -rw-r--r-- | epan/dissectors/x11-glx-render-enum.h | 7 | ||||
| -rw-r--r-- | epan/dissectors/x11-register-info.h | 422 |
6 files changed, 1998 insertions, 187 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; diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h index f85b00823a..4c9031acd1 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.11-2-g8e3db42 */ + using xcbproto version 1.11-97-g8d0c100 */ /* * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com> * @@ -230,6 +230,32 @@ static const value_string x11_enum_randr_Notify[] = { { 0, NULL }, }; +static const value_string x11_enum_render_Repeat[] = { + { 0, "None" }, + { 1, "Normal" }, + { 2, "Pad" }, + { 3, "Reflect" }, + { 0, NULL }, +}; + +static const value_string x11_enum_xproto_SubwindowMode[] = { + { 0, "ClipByChildren" }, + { 1, "IncludeInferiors" }, + { 0, NULL }, +}; + +static const value_string x11_enum_render_PolyEdge[] = { + { 0, "Sharp" }, + { 1, "Smooth" }, + { 0, NULL }, +}; + +static const value_string x11_enum_render_PolyMode[] = { + { 0, "Precise" }, + { 1, "Imprecise" }, + { 0, NULL }, +}; + static const value_string x11_enum_render_PictOp[] = { { 0, "Clear" }, { 1, "Src" }, @@ -306,6 +332,49 @@ static const value_string x11_enum_xproto_WindowClass[] = { { 0, NULL }, }; +static const value_string x11_enum_xproto_BackPixmap[] = { + { 0, "None" }, + { 1, "ParentRelative" }, + { 0, NULL }, +}; + +static const value_string x11_enum_xproto_Pixmap[] = { + { 0, "None" }, + { 0, NULL }, +}; + +static const value_string x11_enum_xproto_Gravity[] = { + { 0, "WinUnmap" }, + { 1, "NorthWest" }, + { 2, "North" }, + { 3, "NorthEast" }, + { 4, "West" }, + { 5, "Center" }, + { 6, "East" }, + { 7, "SouthWest" }, + { 8, "South" }, + { 9, "SouthEast" }, + { 10, "Static" }, + { 0, NULL }, +}; + +static const value_string x11_enum_xproto_BackingStore[] = { + { 0, "NotUseful" }, + { 1, "WhenMapped" }, + { 2, "Always" }, + { 0, NULL }, +}; + +static const value_string x11_enum_xproto_Colormap[] = { + { 0, "None" }, + { 0, NULL }, +}; + +static const value_string x11_enum_xproto_Cursor[] = { + { 0, "None" }, + { 0, NULL }, +}; + static const value_string x11_enum_shape_SO[] = { { 0, "Set" }, { 1, "Union" }, @@ -330,11 +399,6 @@ static const value_string x11_enum_xproto_ClipOrdering[] = { { 0, NULL }, }; -static const value_string x11_enum_xproto_Pixmap[] = { - { 0, "None" }, - { 0, NULL }, -}; - static const value_string x11_enum_sync_ALARMSTATE[] = { { 0, "Active" }, { 1, "Inactive" }, @@ -417,6 +481,11 @@ static const value_string x11_enum_xproto_GrabMode[] = { { 0, NULL }, }; +static const value_string x11_enum_xinput_ModifierDevice[] = { + { 255, "UseXKeyboard" }, + { 0, NULL }, +}; + static const value_string x11_enum_xproto_Grab[] = { { 0, "Any" }, { 0, NULL }, @@ -487,6 +556,12 @@ static const value_string x11_enum_xinput_HierarchyChangeType[] = { { 0, NULL }, }; +static const value_string x11_enum_xinput_ChangeMode[] = { + { 1, "Attach" }, + { 2, "Float" }, + { 0, NULL }, +}; + static const value_string x11_enum_xinput_DeviceClassType[] = { { 0, "Key" }, { 1, "Button" }, @@ -496,6 +571,18 @@ static const value_string x11_enum_xinput_DeviceClassType[] = { { 0, NULL }, }; +static const value_string x11_enum_xinput_ScrollType[] = { + { 1, "Vertical" }, + { 2, "Horizontal" }, + { 0, NULL }, +}; + +static const value_string x11_enum_xinput_TouchMode[] = { + { 1, "Direct" }, + { 2, "Dependent" }, + { 0, NULL }, +}; + static const value_string x11_enum_xinput_DeviceType[] = { { 1, "MasterPointer" }, { 2, "MasterKeyboard" }, @@ -568,6 +655,19 @@ static const value_string x11_enum_xproto_NotifyMode[] = { { 0, NULL }, }; +static const value_string x11_enum_xproto_Mapping[] = { + { 0, "Modifier" }, + { 1, "Keyboard" }, + { 2, "Pointer" }, + { 0, NULL }, +}; + +static const value_string x11_enum_xinput_ChangeDevice[] = { + { 0, "NewPointer" }, + { 1, "NewKeyboard" }, + { 0, NULL }, +}; + static const value_string x11_enum_xinput_DeviceChange[] = { { 0, "Added" }, { 1, "Removed" }, diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h index f27043b0a1..1b48501384 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.11-2-g8e3db42 */ + using xcbproto version 1.11-97-g8d0c100 */ /* * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com> * diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h index 412fa4769a..3f6dd59ee4 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.11-2-g8e3db42 */ + using xcbproto version 1.11-97-g8d0c100 */ /* * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com> * @@ -4942,7 +4942,7 @@ static void struct_xproto_RECTANGLE(tvbuff_t *tvb, int *offsetp, proto_tree *roo } } -static int struct_size_xproto_STR(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xproto_STR(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_name_len; @@ -5033,7 +5033,7 @@ static void struct_render_PICTVISUAL(tvbuff_t *tvb, int *offsetp, proto_tree *ro } } -static int struct_size_render_PICTDEPTH(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_render_PICTDEPTH(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_num_visuals; @@ -5063,7 +5063,7 @@ static void struct_render_PICTDEPTH(tvbuff_t *tvb, int *offsetp, proto_tree *roo } } -static int struct_size_render_PICTSCREEN(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_render_PICTSCREEN(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int i, off; @@ -8293,6 +8293,31 @@ static void glxGetTexLevelParameteriv_Reply(tvbuff_t *tvb, packet_info *pinfo, i listOfInt32(tvb, offsetp, t, hf_x11_glx_GetTexLevelParameteriv_reply_data, hf_x11_glx_GetTexLevelParameteriv_reply_data_item, f_n, byte_order); } +static void glxIsEnabled(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) +{ + proto_tree_add_item(t, hf_x11_glx_IsEnabled_context_tag, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_glx_IsEnabled_capability, tvb, *offsetp, 4, byte_order); + *offsetp += 4; +} +static void glxIsEnabled_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order) +{ + int sequence_number; + + col_append_fstr(pinfo->cinfo, COL_INFO, "-IsEnabled"); + + 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 (glx-IsEnabled)", sequence_number); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_glx_IsEnabled_reply_ret_val, tvb, *offsetp, 4, byte_order); + *offsetp += 4; +} + static void glxIsList(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) { proto_tree_add_item(t, hf_x11_glx_IsList_context_tag, tvb, *offsetp, 4, byte_order); @@ -9150,6 +9175,7 @@ static const value_string glx_extension_minor[] = { { 137, "GetTexParameteriv" }, { 138, "GetTexLevelParameterfv" }, { 139, "GetTexLevelParameteriv" }, + { 140, "IsEnabled" }, { 141, "IsList" }, { 142, "Flush" }, { 143, "AreTexturesResident" }, @@ -9226,6 +9252,7 @@ static x11_reply_info glx_replies[] = { { 137, glxGetTexParameteriv_Reply }, { 138, glxGetTexLevelParameterfv_Reply }, { 139, glxGetTexLevelParameteriv_Reply }, + { 140, glxIsEnabled_Reply }, { 141, glxIsList_Reply }, { 143, glxAreTexturesResident_Reply }, { 145, glxGenTextures_Reply }, @@ -9484,6 +9511,9 @@ static void dispatch_glx(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_ case 139: glxGetTexLevelParameteriv(tvb, pinfo, offsetp, t, byte_order, length); break; + case 140: + glxIsEnabled(tvb, pinfo, offsetp, t, byte_order, length); + break; case 141: glxIsList(tvb, pinfo, offsetp, t, byte_order, length); break; @@ -9592,7 +9622,7 @@ static void struct_randr_ScreenSize(tvbuff_t *tvb, int *offsetp, proto_tree *roo } } -static int struct_size_randr_RefreshRates(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_randr_RefreshRates(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_nRates; @@ -9831,6 +9861,50 @@ static void struct_randr_ResourceChange(tvbuff_t *tvb, int *offsetp, proto_tree } } +static int struct_size_randr_MonitorInfo(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) +{ + int size = 0; + int f_nOutput; + f_nOutput = VALUE16(tvb, *offsetp + size + 6); + size += f_nOutput * 4; + return size + 24; +} + +static void struct_randr_MonitorInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count) +{ + int i; + for (i = 0; i < count; i++) { + proto_item *item; + proto_tree *t; + int f_nOutput; + + item = proto_tree_add_item(root, hf_x11_struct_randr_MonitorInfo, tvb, *offsetp, struct_size_randr_MonitorInfo(tvb, offsetp, byte_order), ENC_NA); + t = proto_item_add_subtree(item, ett_x11_rectangle); + proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_name, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_primary, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_automatic, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + f_nOutput = VALUE16(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_nOutput, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_x, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_y, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_width, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_height, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_width_in_millimeters, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_randr_MonitorInfo_height_in_millimeters, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + listOfCard32(tvb, offsetp, t, hf_x11_struct_randr_MonitorInfo_outputs, hf_x11_struct_randr_MonitorInfo_outputs_item, f_nOutput, byte_order); + } +} + static void struct_sync_INT64(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count) { int i; @@ -9847,7 +9921,7 @@ static void struct_sync_INT64(tvbuff_t *tvb, int *offsetp, proto_tree *root, gui } } -static int struct_size_sync_SYSTEMCOUNTER(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_sync_SYSTEMCOUNTER(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_name_len; @@ -11392,6 +11466,54 @@ static void randrNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, guint byte_o struct_randr_NotifyData(tvb, offsetp, t, byte_order, 1); } + +static void randrGetMonitors(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) +{ + proto_tree_add_item(t, hf_x11_randr_GetMonitors_window, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_randr_GetMonitors_get_active, tvb, *offsetp, 1, byte_order); + *offsetp += 1; +} +static void randrGetMonitors_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order) +{ + int sequence_number; + int f_nMonitors; + + col_append_fstr(pinfo->cinfo, COL_INFO, "-GetMonitors"); + + 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 (randr-GetMonitors)", sequence_number); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_randr_GetMonitors_reply_timestamp, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + f_nMonitors = VALUE32(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_randr_GetMonitors_reply_nMonitors, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_randr_GetMonitors_reply_nOutputs, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + UNUSED(12); + struct_randr_MonitorInfo(tvb, offsetp, t, byte_order, f_nMonitors); +} + +static void randrSetMonitor(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) +{ + proto_tree_add_item(t, hf_x11_randr_SetMonitor_window, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + struct_randr_MonitorInfo(tvb, offsetp, t, byte_order, 1); +} + +static void randrDeleteMonitor(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) +{ + proto_tree_add_item(t, hf_x11_randr_DeleteMonitor_window, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_randr_DeleteMonitor_name, tvb, *offsetp, 4, byte_order); + *offsetp += 4; +} static const value_string randr_extension_minor[] = { { 0, "QueryVersion" }, { 2, "SetScreenConfig" }, @@ -11433,6 +11555,9 @@ static const value_string randr_extension_minor[] = { { 39, "ChangeProviderProperty" }, { 40, "DeleteProviderProperty" }, { 41, "GetProviderProperty" }, + { 42, "GetMonitors" }, + { 43, "SetMonitor" }, + { 44, "DeleteMonitor" }, { 0, NULL } }; const x11_event_info randr_events[] = { @@ -11464,6 +11589,7 @@ static x11_reply_info randr_replies[] = { { 36, randrListProviderProperties_Reply }, { 37, randrQueryProviderProperty_Reply }, { 41, randrGetProviderProperty_Reply }, + { 42, randrGetMonitors_Reply }, { 0, NULL } }; @@ -11597,6 +11723,15 @@ static void dispatch_randr(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, prot case 41: randrGetProviderProperty(tvb, pinfo, offsetp, t, byte_order, length); break; + case 42: + randrGetMonitors(tvb, pinfo, offsetp, t, byte_order, length); + break; + case 43: + randrSetMonitor(tvb, pinfo, offsetp, t, byte_order, length); + break; + case 44: + randrDeleteMonitor(tvb, pinfo, offsetp, t, byte_order, length); + break; /* No need for a default case here, since Unknown is printed above, and UNDECODED() is taken care of by dissect_x11_request */ } @@ -11676,7 +11811,7 @@ static void struct_record_Range(tvbuff_t *tvb, int *offsetp, proto_tree *root, g } } -static int struct_size_record_ClientInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_record_ClientInfo(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_num_ranges; @@ -12025,18 +12160,154 @@ static void renderQueryPictIndexValues_Reply(tvbuff_t *tvb, packet_info *pinfo, static void renderCreatePicture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) { + int f_value_mask; proto_tree_add_item(t, hf_x11_render_CreatePicture_pid, tvb, *offsetp, 4, byte_order); *offsetp += 4; proto_tree_add_item(t, hf_x11_render_CreatePicture_drawable, tvb, *offsetp, 4, byte_order); *offsetp += 4; proto_tree_add_item(t, hf_x11_render_CreatePicture_format, tvb, *offsetp, 4, byte_order); *offsetp += 4; + f_value_mask = VALUE32(tvb, *offsetp); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_render_CreatePicture_value_mask, tvb, *offsetp, 4, byte_order); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_Repeat, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_AlphaMap, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_AlphaXOrigin, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_AlphaYOrigin, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_ClipXOrigin, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_ClipYOrigin, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_ClipMask, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_GraphicsExposure, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_SubwindowMode, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_PolyEdge, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_PolyMode, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_Dither, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_CreatePicture_value_mask_mask_ComponentAlpha, tvb, *offsetp, 4, byte_order); + } + *offsetp += 4; + if ((f_value_mask & (1U << 0))) { + field32(tvb, offsetp, t, hf_x11_render_CreatePicture_Repeat_repeat, byte_order); + } + if ((f_value_mask & (1U << 1))) { + proto_tree_add_item(t, hf_x11_render_CreatePicture_AlphaMap_alphamap, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 2))) { + proto_tree_add_item(t, hf_x11_render_CreatePicture_AlphaXOrigin_alphaxorigin, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 3))) { + proto_tree_add_item(t, hf_x11_render_CreatePicture_AlphaYOrigin_alphayorigin, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 4))) { + proto_tree_add_item(t, hf_x11_render_CreatePicture_ClipXOrigin_clipxorigin, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 5))) { + proto_tree_add_item(t, hf_x11_render_CreatePicture_ClipYOrigin_clipyorigin, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 6))) { + proto_tree_add_item(t, hf_x11_render_CreatePicture_ClipMask_clipmask, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 7))) { + proto_tree_add_item(t, hf_x11_render_CreatePicture_GraphicsExposure_graphicsexposure, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 8))) { + field32(tvb, offsetp, t, hf_x11_render_CreatePicture_SubwindowMode_subwindowmode, byte_order); + } + if ((f_value_mask & (1U << 9))) { + field32(tvb, offsetp, t, hf_x11_render_CreatePicture_PolyEdge_polyedge, byte_order); + } + if ((f_value_mask & (1U << 10))) { + field32(tvb, offsetp, t, hf_x11_render_CreatePicture_PolyMode_polymode, byte_order); + } + if ((f_value_mask & (1U << 11))) { + proto_tree_add_item(t, hf_x11_render_CreatePicture_Dither_dither, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 12))) { + proto_tree_add_item(t, hf_x11_render_CreatePicture_ComponentAlpha_componentalpha, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } } static void renderChangePicture(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) { + int f_value_mask; proto_tree_add_item(t, hf_x11_render_ChangePicture_picture, tvb, *offsetp, 4, byte_order); *offsetp += 4; + f_value_mask = VALUE32(tvb, *offsetp); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_render_ChangePicture_value_mask, tvb, *offsetp, 4, byte_order); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_Repeat, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_AlphaMap, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_AlphaXOrigin, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_AlphaYOrigin, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_ClipXOrigin, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_ClipYOrigin, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_ClipMask, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_GraphicsExposure, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_SubwindowMode, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_PolyEdge, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_PolyMode, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_Dither, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_render_ChangePicture_value_mask_mask_ComponentAlpha, tvb, *offsetp, 4, byte_order); + } + *offsetp += 4; + if ((f_value_mask & (1U << 0))) { + field32(tvb, offsetp, t, hf_x11_render_ChangePicture_Repeat_repeat, byte_order); + } + if ((f_value_mask & (1U << 1))) { + proto_tree_add_item(t, hf_x11_render_ChangePicture_AlphaMap_alphamap, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 2))) { + proto_tree_add_item(t, hf_x11_render_ChangePicture_AlphaXOrigin_alphaxorigin, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 3))) { + proto_tree_add_item(t, hf_x11_render_ChangePicture_AlphaYOrigin_alphayorigin, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 4))) { + proto_tree_add_item(t, hf_x11_render_ChangePicture_ClipXOrigin_clipxorigin, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 5))) { + proto_tree_add_item(t, hf_x11_render_ChangePicture_ClipYOrigin_clipyorigin, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 6))) { + proto_tree_add_item(t, hf_x11_render_ChangePicture_ClipMask_clipmask, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 7))) { + proto_tree_add_item(t, hf_x11_render_ChangePicture_GraphicsExposure_graphicsexposure, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 8))) { + field32(tvb, offsetp, t, hf_x11_render_ChangePicture_SubwindowMode_subwindowmode, byte_order); + } + if ((f_value_mask & (1U << 9))) { + field32(tvb, offsetp, t, hf_x11_render_ChangePicture_PolyEdge_polyedge, byte_order); + } + if ((f_value_mask & (1U << 10))) { + field32(tvb, offsetp, t, hf_x11_render_ChangePicture_PolyMode_polymode, byte_order); + } + if ((f_value_mask & (1U << 11))) { + proto_tree_add_item(t, hf_x11_render_ChangePicture_Dither_dither, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 12))) { + proto_tree_add_item(t, hf_x11_render_ChangePicture_ComponentAlpha_componentalpha, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } } static void renderSetPictureClipRectangles(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@ -12615,7 +12886,7 @@ static void struct_res_ClientIdSpec(tvbuff_t *tvb, int *offsetp, proto_tree *roo } } -static int struct_size_res_ClientIdValue(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_res_ClientIdValue(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_length; @@ -12677,7 +12948,7 @@ static void struct_res_ResourceSizeSpec(tvbuff_t *tvb, int *offsetp, proto_tree } } -static int struct_size_res_ResourceSizeValue(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_res_ResourceSizeValue(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_num_cross_references; @@ -13007,6 +13278,7 @@ static void screensaverSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *o static void screensaverSetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) { + int f_value_mask; proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_drawable, tvb, *offsetp, 4, byte_order); *offsetp += 4; proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_x, tvb, *offsetp, 2, byte_order); @@ -13024,6 +13296,136 @@ static void screensaverSetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp += 1; proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_visual, tvb, *offsetp, 4, byte_order); *offsetp += 4; + f_value_mask = VALUE32(tvb, *offsetp); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_value_mask, tvb, *offsetp, 4, byte_order); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_BackPixmap, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_BackPixel, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_BorderPixmap, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_BorderPixel, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_BitGravity, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_WinGravity, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_BackingStore, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_BackingPlanes, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_BackingPixel, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_OverrideRedirect, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_SaveUnder, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_EventMask, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_DontPropagate, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_Colormap, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_value_mask_mask_Cursor, tvb, *offsetp, 4, byte_order); + } + *offsetp += 4; + if ((f_value_mask & (1U << 0))) { + field32(tvb, offsetp, t, hf_x11_screensaver_SetAttributes_BackPixmap_background_pixmap, byte_order); + } + if ((f_value_mask & (1U << 1))) { + proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_BackPixel_background_pixel, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 2))) { + field32(tvb, offsetp, t, hf_x11_screensaver_SetAttributes_BorderPixmap_border_pixmap, byte_order); + } + if ((f_value_mask & (1U << 3))) { + proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_BorderPixel_border_pixel, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 4))) { + field32(tvb, offsetp, t, hf_x11_screensaver_SetAttributes_BitGravity_bit_gravity, byte_order); + } + if ((f_value_mask & (1U << 5))) { + field32(tvb, offsetp, t, hf_x11_screensaver_SetAttributes_WinGravity_win_gravity, byte_order); + } + if ((f_value_mask & (1U << 6))) { + field32(tvb, offsetp, t, hf_x11_screensaver_SetAttributes_BackingStore_backing_store, byte_order); + } + if ((f_value_mask & (1U << 7))) { + proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_BackingPlanes_backing_planes, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 8))) { + proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_BackingPixel_backing_pixel, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 9))) { + proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_OverrideRedirect_override_redirect, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 10))) { + proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_SaveUnder_save_under, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_value_mask & (1U << 11))) { + { + proto_item *ti = proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_EventMask_event_mask, tvb, *offsetp, 4, byte_order); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_KeyPress, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_KeyRelease, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ButtonPress, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ButtonRelease, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_EnterWindow, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_LeaveWindow, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_PointerMotion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_PointerMotionHint, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button1Motion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button2Motion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button3Motion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button4Motion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button5Motion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ButtonMotion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_KeymapState, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Exposure, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_VisibilityChange, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_StructureNotify, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ResizeRedirect, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_SubstructureNotify, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_SubstructureRedirect, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_FocusChange, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_PropertyChange, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ColorMapChange, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_OwnerGrabButton, tvb, *offsetp, 4, byte_order); + } + *offsetp += 4; + } + if ((f_value_mask & (1U << 12))) { + { + proto_item *ti = proto_tree_add_item(t, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask, tvb, *offsetp, 4, byte_order); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_KeyPress, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_KeyRelease, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ButtonPress, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ButtonRelease, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_EnterWindow, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_LeaveWindow, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_PointerMotion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_PointerMotionHint, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button1Motion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button2Motion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button3Motion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button4Motion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button5Motion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ButtonMotion, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_KeymapState, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Exposure, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_VisibilityChange, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_StructureNotify, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ResizeRedirect, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_SubstructureNotify, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_SubstructureRedirect, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_FocusChange, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_PropertyChange, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ColorMapChange, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_OwnerGrabButton, tvb, *offsetp, 4, byte_order); + } + *offsetp += 4; + } + if ((f_value_mask & (1U << 13))) { + field32(tvb, offsetp, t, hf_x11_screensaver_SetAttributes_Colormap_colormap, byte_order); + } + if ((f_value_mask & (1U << 14))) { + field32(tvb, offsetp, t, hf_x11_screensaver_SetAttributes_Cursor_cursor, byte_order); + } } static void screensaverUnsetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@ -16020,8 +16422,8 @@ static void xfixesGetCursorImageAndName_Reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(t, hf_x11_xfixes_GetCursorImageAndName_reply_nbytes, tvb, *offsetp, 2, byte_order); *offsetp += 2; UNUSED(2); - listOfByte(tvb, offsetp, t, hf_x11_xfixes_GetCursorImageAndName_reply_name, f_nbytes, byte_order); listOfCard32(tvb, offsetp, t, hf_x11_xfixes_GetCursorImageAndName_reply_cursor_image, hf_x11_xfixes_GetCursorImageAndName_reply_cursor_image_item, (f_width * f_height), byte_order); + listOfByte(tvb, offsetp, t, hf_x11_xfixes_GetCursorImageAndName_reply_name, f_nbytes, byte_order); } static void xfixesChangeCursor(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@ -16542,7 +16944,8 @@ static void xinputGetExtensionVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, i col_append_fstr(pinfo->cinfo, COL_INFO, "-GetExtensionVersion"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_GetExtensionVersion_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-GetExtensionVersion)", sequence_number); @@ -16578,6 +16981,69 @@ static void struct_xinput_DeviceInfo(tvbuff_t *tvb, int *offsetp, proto_tree *ro } } +static void struct_xinput_AxisInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count) +{ + int i; + for (i = 0; i < count; i++) { + proto_item *item; + proto_tree *t; + + item = proto_tree_add_item(root, hf_x11_struct_xinput_AxisInfo, tvb, *offsetp, 12, ENC_NA); + t = proto_item_add_subtree(item, ett_x11_rectangle); + proto_tree_add_item(t, hf_x11_struct_xinput_AxisInfo_resolution, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_AxisInfo_minimum, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_AxisInfo_maximum, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } +} + +static int struct_size_xinput_InputInfo(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) +{ + int size = 0; + return size + 2; +} + +static void struct_xinput_InputInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count) +{ + int i; + for (i = 0; i < count; i++) { + proto_item *item; + proto_tree *t; + int f_class_id; + + item = proto_tree_add_item(root, hf_x11_struct_xinput_InputInfo, tvb, *offsetp, struct_size_xinput_InputInfo(tvb, offsetp, byte_order), ENC_NA); + t = proto_item_add_subtree(item, ett_x11_rectangle); + f_class_id = field8(tvb, offsetp, t, hf_x11_struct_xinput_InputInfo_class_id, byte_order); + proto_tree_add_item(t, hf_x11_struct_xinput_InputInfo_len, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + if ((f_class_id == 0)) { + proto_tree_add_item(t, hf_x11_struct_xinput_InputInfo_Key_min_keycode, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_struct_xinput_InputInfo_Key_max_keycode, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_struct_xinput_InputInfo_Key_num_keys, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + UNUSED(2); + } + if ((f_class_id == 1)) { + proto_tree_add_item(t, hf_x11_struct_xinput_InputInfo_Button_num_buttons, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + } + if ((f_class_id == 2)) { + int f_axes_len; + f_axes_len = VALUE8(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_struct_xinput_InputInfo_Valuator_axes_len, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + field8(tvb, offsetp, t, hf_x11_struct_xinput_InputInfo_Valuator_mode, byte_order); + proto_tree_add_item(t, hf_x11_struct_xinput_InputInfo_Valuator_motion_size, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + struct_xinput_AxisInfo(tvb, offsetp, t, byte_order, f_axes_len); + } + } +} + static void xinputListInputDevices(tvbuff_t *tvb _U_, packet_info *pinfo _U_, int *offsetp _U_, proto_tree *t _U_, guint byte_order _U_, int length _U_) { } @@ -16585,11 +17051,13 @@ static void xinputListInputDevices_Reply(tvbuff_t *tvb, packet_info *pinfo, int { int sequence_number; int f_devices_len; + int sumof_devices = 0; col_append_fstr(pinfo->cinfo, COL_INFO, "-ListInputDevices"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_ListInputDevices_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-ListInputDevices)", sequence_number); @@ -16601,6 +17069,11 @@ static void xinputListInputDevices_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp += 1; UNUSED(23); struct_xinput_DeviceInfo(tvb, offsetp, t, byte_order, f_devices_len); + struct_xinput_InputInfo(tvb, offsetp, t, byte_order, sumof_devices); + struct_xproto_STR(tvb, offsetp, t, byte_order, f_devices_len); + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } } static void struct_xinput_InputClassInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count) @@ -16632,7 +17105,8 @@ static void xinputOpenDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse col_append_fstr(pinfo->cinfo, COL_INFO, "-OpenDevice"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_OpenDevice_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-OpenDevice)", sequence_number); @@ -16644,6 +17118,9 @@ static void xinputOpenDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse *offsetp += 1; UNUSED(23); struct_xinput_InputClassInfo(tvb, offsetp, t, byte_order, f_num_classes); + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } } static void xinputCloseDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@ -16667,7 +17144,8 @@ static void xinputSetDeviceMode_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of col_append_fstr(pinfo->cinfo, COL_INFO, "-SetDeviceMode"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_SetDeviceMode_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-SetDeviceMode)", sequence_number); @@ -16705,7 +17183,8 @@ static void xinputGetSelectedExtensionEvents_Reply(tvbuff_t *tvb, packet_info *p col_append_fstr(pinfo->cinfo, COL_INFO, "-GetSelectedExtensionEvents"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_GetSelectedExtensionEvents_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-GetSelectedExtensionEvents)", sequence_number); @@ -16750,7 +17229,8 @@ static void xinputGetDeviceDontPropagateList_Reply(tvbuff_t *tvb, packet_info *p col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceDontPropagateList"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_GetDeviceDontPropagateList_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-GetDeviceDontPropagateList)", sequence_number); @@ -16764,6 +17244,28 @@ static void xinputGetDeviceDontPropagateList_Reply(tvbuff_t *tvb, packet_info *p listOfCard32(tvb, offsetp, t, hf_x11_xinput_GetDeviceDontPropagateList_reply_classes, hf_x11_xinput_GetDeviceDontPropagateList_reply_classes_item, f_num_classes, byte_order); } +static int struct_size_xinput_DeviceTimeCoord(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_, int p_num_axes) +{ + int size = 0; + size += p_num_axes * 4; + return size + 4; +} + +static void struct_xinput_DeviceTimeCoord(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count, int p_num_axes) +{ + int i; + for (i = 0; i < count; i++) { + proto_item *item; + proto_tree *t; + + item = proto_tree_add_item(root, hf_x11_struct_xinput_DeviceTimeCoord, tvb, *offsetp, struct_size_xinput_DeviceTimeCoord(tvb, offsetp, byte_order, p_num_axes), ENC_NA); + t = proto_item_add_subtree(item, ett_x11_rectangle); + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceTimeCoord_time, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + listOfInt32(tvb, offsetp, t, hf_x11_struct_xinput_DeviceTimeCoord_axisvalues, hf_x11_struct_xinput_DeviceTimeCoord_axisvalues_item, p_num_axes, byte_order); + } +} + static void xinputGetDeviceMotionEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) { proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_start, tvb, *offsetp, 4, byte_order); @@ -16771,27 +17273,34 @@ static void xinputGetDeviceMotionEvents(tvbuff_t *tvb, packet_info *pinfo _U_, i field32(tvb, offsetp, t, hf_x11_xinput_GetDeviceMotionEvents_stop, byte_order); proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_device_id, tvb, *offsetp, 1, byte_order); *offsetp += 1; + UNUSED(3); } static void xinputGetDeviceMotionEvents_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order) { int sequence_number; + int f_num_events; + int f_num_axes; col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceMotionEvents"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-GetDeviceMotionEvents)", sequence_number); *offsetp += 2; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order); *offsetp += 4; + f_num_events = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_reply_num_events, tvb, *offsetp, 4, byte_order); *offsetp += 4; + f_num_axes = VALUE8(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GetDeviceMotionEvents_reply_num_axes, tvb, *offsetp, 1, byte_order); *offsetp += 1; field8(tvb, offsetp, t, hf_x11_xinput_GetDeviceMotionEvents_reply_device_mode, byte_order); UNUSED(18); + struct_xinput_DeviceTimeCoord(tvb, offsetp, t, byte_order, f_num_events, f_num_axes); } static void xinputChangeKeyboardDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@ -16807,7 +17316,8 @@ static void xinputChangeKeyboardDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, "-ChangeKeyboardDevice"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_ChangeKeyboardDevice_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-ChangeKeyboardDevice)", sequence_number); @@ -16835,7 +17345,8 @@ static void xinputChangePointerDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, i col_append_fstr(pinfo->cinfo, COL_INFO, "-ChangePointerDevice"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_ChangePointerDevice_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-ChangePointerDevice)", sequence_number); @@ -16872,7 +17383,8 @@ static void xinputGrabDevice_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offse col_append_fstr(pinfo->cinfo, COL_INFO, "-GrabDevice"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_GrabDevice_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-GrabDevice)", sequence_number); @@ -16888,6 +17400,7 @@ static void xinputUngrabDevice(tvbuff_t *tvb, packet_info *pinfo _U_, int *offse field32(tvb, offsetp, t, hf_x11_xinput_UngrabDevice_time, byte_order); proto_tree_add_item(t, hf_x11_xinput_UngrabDevice_device_id, tvb, *offsetp, 1, byte_order); *offsetp += 1; + UNUSED(3); } static void xinputGrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@ -16912,8 +17425,7 @@ static void xinputGrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *offs proto_tree_add_item(bitmask_tree, hf_x11_xinput_GrabDeviceKey_modifiers_mask_Any, tvb, *offsetp, 2, byte_order); } *offsetp += 2; - proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_modifier_device, tvb, *offsetp, 1, byte_order); - *offsetp += 1; + field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceKey_modifier_device, byte_order); proto_tree_add_item(t, hf_x11_xinput_GrabDeviceKey_grabbed_device, tvb, *offsetp, 1, byte_order); *offsetp += 1; field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceKey_key, byte_order); @@ -16944,8 +17456,7 @@ static void xinputUngrabDeviceKey(tvbuff_t *tvb, packet_info *pinfo _U_, int *of proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Any, tvb, *offsetp, 2, byte_order); } *offsetp += 2; - proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_modifier_device, tvb, *offsetp, 1, byte_order); - *offsetp += 1; + field8(tvb, offsetp, t, hf_x11_xinput_UngrabDeviceKey_modifier_device, byte_order); field8(tvb, offsetp, t, hf_x11_xinput_UngrabDeviceKey_key, byte_order); proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceKey_grabbed_device, tvb, *offsetp, 1, byte_order); *offsetp += 1; @@ -16958,8 +17469,7 @@ static void xinputGrabDeviceButton(tvbuff_t *tvb, packet_info *pinfo _U_, int *o *offsetp += 4; proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_grabbed_device, tvb, *offsetp, 1, byte_order); *offsetp += 1; - proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_modifier_device, tvb, *offsetp, 1, byte_order); - *offsetp += 1; + field8(tvb, offsetp, t, hf_x11_xinput_GrabDeviceButton_modifier_device, byte_order); f_num_classes = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_GrabDeviceButton_num_classes, tvb, *offsetp, 2, byte_order); *offsetp += 2; @@ -17005,11 +17515,11 @@ static void xinputUngrabDeviceButton(tvbuff_t *tvb, packet_info *pinfo _U_, int proto_tree_add_item(bitmask_tree, hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Any, tvb, *offsetp, 2, byte_order); } *offsetp += 2; - proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_modifier_device, tvb, *offsetp, 1, byte_order); - *offsetp += 1; + field8(tvb, offsetp, t, hf_x11_xinput_UngrabDeviceButton_modifier_device, byte_order); field8(tvb, offsetp, t, hf_x11_xinput_UngrabDeviceButton_button, byte_order); proto_tree_add_item(t, hf_x11_xinput_UngrabDeviceButton_grabbed_device, tvb, *offsetp, 1, byte_order); *offsetp += 1; + UNUSED(3); } static void xinputAllowDeviceEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@ -17018,6 +17528,7 @@ static void xinputAllowDeviceEvents(tvbuff_t *tvb, packet_info *pinfo _U_, int * field8(tvb, offsetp, t, hf_x11_xinput_AllowDeviceEvents_mode, byte_order); proto_tree_add_item(t, hf_x11_xinput_AllowDeviceEvents_device_id, tvb, *offsetp, 1, byte_order); *offsetp += 1; + UNUSED(2); } static void xinputGetDeviceFocus(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@ -17033,7 +17544,8 @@ static void xinputGetDeviceFocus_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceFocus"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_GetDeviceFocus_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-GetDeviceFocus)", sequence_number); @@ -17054,14 +17566,12 @@ static void xinputSetDeviceFocus(tvbuff_t *tvb, packet_info *pinfo _U_, int *off field8(tvb, offsetp, t, hf_x11_xinput_SetDeviceFocus_revert_to, byte_order); proto_tree_add_item(t, hf_x11_xinput_SetDeviceFocus_device_id, tvb, *offsetp, 1, byte_order); *offsetp += 1; + UNUSED(2); } -static int struct_size_xinput_FeedbackState(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xinput_FeedbackState(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; - int f_len; - f_len = VALUE16(tvb, *offsetp + size + 2); - size += (f_len - 4) * 1; return size + 4; } @@ -17071,17 +17581,74 @@ static void struct_xinput_FeedbackState(tvbuff_t *tvb, int *offsetp, proto_tree for (i = 0; i < count; i++) { proto_item *item; proto_tree *t; - int f_len; + int f_class_id; item = proto_tree_add_item(root, hf_x11_struct_xinput_FeedbackState, tvb, *offsetp, struct_size_xinput_FeedbackState(tvb, offsetp, byte_order), ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); - field8(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackState_class_id, byte_order); + f_class_id = field8(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackState_class_id, byte_order); proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_feedback_id, tvb, *offsetp, 1, byte_order); *offsetp += 1; - f_len = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_len, tvb, *offsetp, 2, byte_order); *offsetp += 2; - listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackState_uninterpreted_data, (f_len - 4), byte_order); + if ((f_class_id == 0)) { + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Keyboard_pitch, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Keyboard_duration, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Keyboard_led_mask, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Keyboard_led_values, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Keyboard_global_auto_repeat, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Keyboard_click, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Keyboard_percent, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + UNUSED(1); + listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackState_Keyboard_auto_repeats, 32, byte_order); + } + if ((f_class_id == 1)) { + UNUSED(2); + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Pointer_accel_num, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Pointer_accel_denom, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Pointer_threshold, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + } + if ((f_class_id == 2)) { + int f_num_keysyms; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_String_max_symbols, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + f_num_keysyms = VALUE16(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_String_num_keysyms, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackState_String_keysyms, hf_x11_struct_xinput_FeedbackState_String_keysyms_item, f_num_keysyms, byte_order); + } + if ((f_class_id == 3)) { + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Integer_resolution, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Integer_min_value, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Integer_max_value, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_class_id == 4)) { + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Led_led_mask, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Led_led_values, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_class_id == 5)) { + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Bell_percent, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + UNUSED(3); + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Bell_pitch, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackState_Bell_duration, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + } } } @@ -17099,7 +17666,8 @@ static void xinputGetFeedbackControl_Reply(tvbuff_t *tvb, packet_info *pinfo, in col_append_fstr(pinfo->cinfo, COL_INFO, "-GetFeedbackControl"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_GetFeedbackControl_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-GetFeedbackControl)", sequence_number); @@ -17113,12 +17681,9 @@ static void xinputGetFeedbackControl_Reply(tvbuff_t *tvb, packet_info *pinfo, in struct_xinput_FeedbackState(tvb, offsetp, t, byte_order, f_num_feedbacks); } -static int struct_size_xinput_FeedbackCtl(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xinput_FeedbackCtl(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; - int f_len; - f_len = VALUE16(tvb, *offsetp + size + 2); - size += (f_len - 4) * 1; return size + 4; } @@ -17128,23 +17693,86 @@ static void struct_xinput_FeedbackCtl(tvbuff_t *tvb, int *offsetp, proto_tree *r for (i = 0; i < count; i++) { proto_item *item; proto_tree *t; - int f_len; + int f_class_id; item = proto_tree_add_item(root, hf_x11_struct_xinput_FeedbackCtl, tvb, *offsetp, struct_size_xinput_FeedbackCtl(tvb, offsetp, byte_order), ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); - field8(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackCtl_class_id, byte_order); + f_class_id = field8(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackCtl_class_id, byte_order); proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_feedback_id, tvb, *offsetp, 1, byte_order); *offsetp += 1; - f_len = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_len, tvb, *offsetp, 2, byte_order); *offsetp += 2; - listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackCtl_uninterpreted_data, (f_len - 4), byte_order); + if ((f_class_id == 0)) { + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Keyboard_key, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Keyboard_auto_repeat_mode, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Keyboard_key_click_percent, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Keyboard_bell_percent, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Keyboard_bell_pitch, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Keyboard_bell_duration, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Keyboard_led_mask, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Keyboard_led_values, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_class_id == 1)) { + UNUSED(2); + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Pointer_num, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Pointer_denom, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Pointer_threshold, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + } + if ((f_class_id == 2)) { + int f_num_keysyms; + UNUSED(2); + f_num_keysyms = VALUE16(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_String_num_keysyms, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_FeedbackCtl_String_keysyms, hf_x11_struct_xinput_FeedbackCtl_String_keysyms_item, f_num_keysyms, byte_order); + } + if ((f_class_id == 3)) { + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Integer_int_to_display, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_class_id == 4)) { + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Led_led_mask, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Led_led_values, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_class_id == 5)) { + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Bell_percent, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + UNUSED(3); + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Bell_pitch, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_xinput_FeedbackCtl_Bell_duration, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + } } } static void xinputChangeFeedbackControl(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) { - proto_tree_add_item(t, hf_x11_xinput_ChangeFeedbackControl_mask, tvb, *offsetp, 4, byte_order); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_ChangeFeedbackControl_mask, tvb, *offsetp, 4, byte_order); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_ChangeFeedbackControl_mask_mask_AccelNum, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_ChangeFeedbackControl_mask_mask_AccelDenom, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_ChangeFeedbackControl_mask_mask_Threshold, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_ChangeFeedbackControl_mask_mask_Duration, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_ChangeFeedbackControl_mask_mask_Led, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_ChangeFeedbackControl_mask_mask_LedMode, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_ChangeFeedbackControl_mask_mask_Key, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_ChangeFeedbackControl_mask_mask_AutoRepeatMode, tvb, *offsetp, 4, byte_order); + } *offsetp += 4; proto_tree_add_item(t, hf_x11_xinput_ChangeFeedbackControl_device_id, tvb, *offsetp, 1, byte_order); *offsetp += 1; @@ -17162,6 +17790,7 @@ static void xinputGetDeviceKeyMapping(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp += 1; proto_tree_add_item(t, hf_x11_xinput_GetDeviceKeyMapping_count, tvb, *offsetp, 1, byte_order); *offsetp += 1; + UNUSED(1); } static void xinputGetDeviceKeyMapping_Reply(tvbuff_t *tvb, packet_info *pinfo, int *offsetp, proto_tree *t, guint byte_order) { @@ -17171,7 +17800,8 @@ static void xinputGetDeviceKeyMapping_Reply(tvbuff_t *tvb, packet_info *pinfo, i col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceKeyMapping"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_GetDeviceKeyMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-GetDeviceKeyMapping)", sequence_number); @@ -17217,7 +17847,8 @@ static void xinputGetDeviceModifierMapping_Reply(tvbuff_t *tvb, packet_info *pin col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceModifierMapping"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_GetDeviceModifierMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-GetDeviceModifierMapping)", sequence_number); @@ -17250,7 +17881,8 @@ static void xinputSetDeviceModifierMapping_Reply(tvbuff_t *tvb, packet_info *pin col_append_fstr(pinfo->cinfo, COL_INFO, "-SetDeviceModifierMapping"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_SetDeviceModifierMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-SetDeviceModifierMapping)", sequence_number); @@ -17275,7 +17907,8 @@ static void xinputGetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceButtonMapping"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_GetDeviceButtonMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-GetDeviceButtonMapping)", sequence_number); @@ -17287,6 +17920,9 @@ static void xinputGetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo *offsetp += 1; UNUSED(23); listOfByte(tvb, offsetp, t, hf_x11_xinput_GetDeviceButtonMapping_reply_map, f_map_size, byte_order); + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } } static void xinputSetDeviceButtonMapping(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@ -17308,7 +17944,8 @@ static void xinputSetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo col_append_fstr(pinfo->cinfo, COL_INFO, "-SetDeviceButtonMapping"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_SetDeviceButtonMapping_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-SetDeviceButtonMapping)", sequence_number); @@ -17319,13 +17956,10 @@ static void xinputSetDeviceButtonMapping_Reply(tvbuff_t *tvb, packet_info *pinfo UNUSED(23); } -static int struct_size_xinput_InputState(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xinput_InputState(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; - int f_len; - f_len = VALUE8(tvb, *offsetp + size + 1); - size += (f_len - 4) * 1; - return size + 4; + return size + 2; } static void struct_xinput_InputState(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count) @@ -17334,18 +17968,39 @@ static void struct_xinput_InputState(tvbuff_t *tvb, int *offsetp, proto_tree *ro for (i = 0; i < count; i++) { proto_item *item; proto_tree *t; - int f_len; + int f_class_id; item = proto_tree_add_item(root, hf_x11_struct_xinput_InputState, tvb, *offsetp, struct_size_xinput_InputState(tvb, offsetp, byte_order), ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); - field8(tvb, offsetp, t, hf_x11_struct_xinput_InputState_class_id, byte_order); - f_len = VALUE8(tvb, *offsetp); + f_class_id = field8(tvb, offsetp, t, hf_x11_struct_xinput_InputState_class_id, byte_order); proto_tree_add_item(t, hf_x11_struct_xinput_InputState_len, tvb, *offsetp, 1, byte_order); *offsetp += 1; - proto_tree_add_item(t, hf_x11_struct_xinput_InputState_num_items, tvb, *offsetp, 1, byte_order); - *offsetp += 1; - UNUSED(1); - listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_InputState_uninterpreted_data, (f_len - 4), byte_order); + if ((f_class_id == 0)) { + proto_tree_add_item(t, hf_x11_struct_xinput_InputState_Key_num_keys, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + UNUSED(1); + listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_InputState_Key_keys, 32, byte_order); + } + if ((f_class_id == 1)) { + proto_tree_add_item(t, hf_x11_struct_xinput_InputState_Button_num_buttons, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + UNUSED(1); + listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_InputState_Button_buttons, 32, byte_order); + } + if ((f_class_id == 2)) { + int f_num_valuators; + f_num_valuators = VALUE8(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_struct_xinput_InputState_Valuator_num_valuators, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + { + proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xinput_InputState_Valuator_mode, tvb, *offsetp, 1, byte_order); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_struct_xinput_InputState_Valuator_mode_mask_DeviceModeAbsolute, tvb, *offsetp, 1, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_struct_xinput_InputState_Valuator_mode_mask_OutOfProximity, tvb, *offsetp, 1, byte_order); + } + *offsetp += 1; + listOfInt32(tvb, offsetp, t, hf_x11_struct_xinput_InputState_Valuator_valuators, hf_x11_struct_xinput_InputState_Valuator_valuators_item, f_num_valuators, byte_order); + } } } @@ -17363,7 +18018,8 @@ static void xinputQueryDeviceState_Reply(tvbuff_t *tvb, packet_info *pinfo, int col_append_fstr(pinfo->cinfo, COL_INFO, "-QueryDeviceState"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_QueryDeviceState_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-QueryDeviceState)", sequence_number); @@ -17433,7 +18089,8 @@ static void xinputSetDeviceValuators_Reply(tvbuff_t *tvb, packet_info *pinfo, in col_append_fstr(pinfo->cinfo, COL_INFO, "-SetDeviceValuators"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_SetDeviceValuators_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-SetDeviceValuators)", sequence_number); @@ -17444,12 +18101,9 @@ static void xinputSetDeviceValuators_Reply(tvbuff_t *tvb, packet_info *pinfo, in UNUSED(23); } -static int struct_size_xinput_DeviceState(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xinput_DeviceState(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; - int f_len; - f_len = VALUE16(tvb, *offsetp + size + 2); - size += (f_len - 4) * 1; return size + 4; } @@ -17459,15 +18113,66 @@ static void struct_xinput_DeviceState(tvbuff_t *tvb, int *offsetp, proto_tree *r for (i = 0; i < count; i++) { proto_item *item; proto_tree *t; - int f_len; + int f_control_id; item = proto_tree_add_item(root, hf_x11_struct_xinput_DeviceState, tvb, *offsetp, struct_size_xinput_DeviceState(tvb, offsetp, byte_order), ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); - field16(tvb, offsetp, t, hf_x11_struct_xinput_DeviceState_control_id, byte_order); - f_len = VALUE16(tvb, *offsetp); + f_control_id = field16(tvb, offsetp, t, hf_x11_struct_xinput_DeviceState_control_id, byte_order); proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_len, tvb, *offsetp, 2, byte_order); *offsetp += 2; - listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_DeviceState_uninterpreted_data, (f_len - 4), byte_order); + if ((f_control_id == 1)) { + int f_num_valuators; + f_num_valuators = VALUE32(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_resolution_num_valuators, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_DeviceState_resolution_resolution_values, hf_x11_struct_xinput_DeviceState_resolution_resolution_values_item, f_num_valuators, byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_DeviceState_resolution_resolution_min, hf_x11_struct_xinput_DeviceState_resolution_resolution_min_item, f_num_valuators, byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_DeviceState_resolution_resolution_max, hf_x11_struct_xinput_DeviceState_resolution_resolution_max_item, f_num_valuators, byte_order); + } + if ((f_control_id == 2)) { + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_calib_min_x, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_calib_max_x, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_calib_min_y, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_calib_max_y, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_calib_flip_x, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_calib_flip_y, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_calib_rotation, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_calib_button_threshold, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_control_id == 3)) { + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_core_status, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_core_iscore, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + UNUSED(2); + } + if ((f_control_id == 4)) { + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_enable_enable, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + UNUSED(3); + } + if ((f_control_id == 5)) { + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_area_offset_x, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_area_offset_y, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_area_width, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_area_height, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_area_screen, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceState_abs_area_following, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } } } @@ -17485,7 +18190,8 @@ static void xinputGetDeviceControl_Reply(tvbuff_t *tvb, packet_info *pinfo, int col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceControl"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_GetDeviceControl_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-GetDeviceControl)", sequence_number); @@ -17497,12 +18203,9 @@ static void xinputGetDeviceControl_Reply(tvbuff_t *tvb, packet_info *pinfo, int struct_xinput_DeviceState(tvb, offsetp, t, byte_order, 1); } -static int struct_size_xinput_DeviceCtl(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xinput_DeviceCtl(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; - int f_len; - f_len = VALUE16(tvb, *offsetp + size + 2); - size += (f_len - 4) * 1; return size + 4; } @@ -17512,15 +18215,65 @@ static void struct_xinput_DeviceCtl(tvbuff_t *tvb, int *offsetp, proto_tree *roo for (i = 0; i < count; i++) { proto_item *item; proto_tree *t; - int f_len; + int f_control_id; item = proto_tree_add_item(root, hf_x11_struct_xinput_DeviceCtl, tvb, *offsetp, struct_size_xinput_DeviceCtl(tvb, offsetp, byte_order), ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); - field16(tvb, offsetp, t, hf_x11_struct_xinput_DeviceCtl_control_id, byte_order); - f_len = VALUE16(tvb, *offsetp); + f_control_id = field16(tvb, offsetp, t, hf_x11_struct_xinput_DeviceCtl_control_id, byte_order); proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_len, tvb, *offsetp, 2, byte_order); *offsetp += 2; - listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_DeviceCtl_uninterpreted_data, (f_len - 4), byte_order); + if ((f_control_id == 1)) { + int f_num_valuators; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_resolution_first_valuator, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + f_num_valuators = VALUE8(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_resolution_num_valuators, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + UNUSED(2); + listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_DeviceCtl_resolution_resolution_values, hf_x11_struct_xinput_DeviceCtl_resolution_resolution_values_item, f_num_valuators, byte_order); + } + if ((f_control_id == 2)) { + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_calib_min_x, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_calib_max_x, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_calib_min_y, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_calib_max_y, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_calib_flip_x, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_calib_flip_y, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_calib_rotation, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_calib_button_threshold, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } + if ((f_control_id == 3)) { + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_core_status, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + UNUSED(3); + } + if ((f_control_id == 4)) { + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_enable_enable, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + UNUSED(3); + } + if ((f_control_id == 5)) { + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_area_offset_x, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_area_offset_y, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_area_width, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_area_height, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_area_screen, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceCtl_abs_area_following, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + } } } @@ -17539,7 +18292,8 @@ static void xinputChangeDeviceControl_Reply(tvbuff_t *tvb, packet_info *pinfo, i col_append_fstr(pinfo->cinfo, COL_INFO, "-ChangeDeviceControl"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceControl_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-ChangeDeviceControl)", sequence_number); @@ -17564,7 +18318,8 @@ static void xinputListDeviceProperties_Reply(tvbuff_t *tvb, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, "-ListDeviceProperties"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_ListDeviceProperties_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-ListDeviceProperties)", sequence_number); @@ -17594,15 +18349,23 @@ static void xinputChangeDeviceProperty(tvbuff_t *tvb, packet_info *pinfo _U_, in f_num_items = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceProperty_num_items, tvb, *offsetp, 4, byte_order); *offsetp += 4; - if ((f_format & (1U << 3))) { + if ((f_format == 8)) { listOfByte(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceProperty_8Bits_data8, f_num_items, byte_order); length -= f_num_items * 1; + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } + length = ((length + 3) & ~3); } - if ((f_format & (1U << 4))) { + if ((f_format == 16)) { listOfCard16(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceProperty_16Bits_data16, hf_x11_xinput_ChangeDeviceProperty_16Bits_data16_item, f_num_items, byte_order); length -= f_num_items * 2; + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } + length = ((length + 3) & ~3); } - if ((f_format & (1U << 5))) { + if ((f_format == 32)) { listOfCard32(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceProperty_32Bits_data32, hf_x11_xinput_ChangeDeviceProperty_32Bits_data32_item, f_num_items, byte_order); length -= f_num_items * 4; } @@ -17642,7 +18405,8 @@ static void xinputGetDeviceProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int col_append_fstr(pinfo->cinfo, COL_INFO, "-GetDeviceProperty"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_reply_xi_reply_type, tvb, *offsetp, 1, byte_order); + *offsetp += 1; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xinput-GetDeviceProperty)", sequence_number); @@ -17660,13 +18424,19 @@ static void xinputGetDeviceProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int proto_tree_add_item(t, hf_x11_xinput_GetDeviceProperty_reply_device_id, tvb, *offsetp, 1, byte_order); *offsetp += 1; UNUSED(10); - if ((f_format & (1U << 3))) { + if ((f_format == 8)) { listOfByte(tvb, offsetp, t, hf_x11_xinput_GetDeviceProperty_reply_8Bits_data8, f_num_items, byte_order); + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } } - if ((f_format & (1U << 4))) { + if ((f_format == 16)) { listOfCard16(tvb, offsetp, t, hf_x11_xinput_GetDeviceProperty_reply_16Bits_data16, hf_x11_xinput_GetDeviceProperty_reply_16Bits_data16_item, f_num_items, byte_order); + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } } - if ((f_format & (1U << 5))) { + if ((f_format == 32)) { listOfCard32(tvb, offsetp, t, hf_x11_xinput_GetDeviceProperty_reply_32Bits_data32, hf_x11_xinput_GetDeviceProperty_reply_32Bits_data32_item, f_num_items, byte_order); } } @@ -17788,12 +18558,9 @@ static void xinputXIChangeCursor(tvbuff_t *tvb, packet_info *pinfo _U_, int *off UNUSED(2); } -static int struct_size_xinput_HierarchyChange(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xinput_HierarchyChange(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; - int f_len; - f_len = VALUE16(tvb, *offsetp + size + 2); - size += ((f_len * 4) - 4) * 1; return size + 4; } @@ -17803,15 +18570,42 @@ static void struct_xinput_HierarchyChange(tvbuff_t *tvb, int *offsetp, proto_tre for (i = 0; i < count; i++) { proto_item *item; proto_tree *t; - int f_len; + int f_type; item = proto_tree_add_item(root, hf_x11_struct_xinput_HierarchyChange, tvb, *offsetp, struct_size_xinput_HierarchyChange(tvb, offsetp, byte_order), ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); - field16(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_type, byte_order); - f_len = VALUE16(tvb, *offsetp); + f_type = field16(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_type, byte_order); proto_tree_add_item(t, hf_x11_struct_xinput_HierarchyChange_len, tvb, *offsetp, 2, byte_order); *offsetp += 2; - listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_uninterpreted_data, ((f_len * 4) - 4), byte_order); + if ((f_type == 1)) { + int f_name_len; + f_name_len = VALUE16(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_struct_xinput_HierarchyChange_AddMaster_name_len, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_xinput_HierarchyChange_AddMaster_send_core, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + proto_tree_add_item(t, hf_x11_struct_xinput_HierarchyChange_AddMaster_enable, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_AddMaster_name, f_name_len, byte_order); + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } + } + if ((f_type == 2)) { + field16(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_RemoveMaster_deviceid, byte_order); + field8(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_RemoveMaster_return_mode, byte_order); + UNUSED(1); + field16(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_RemoveMaster_return_pointer, byte_order); + field16(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_RemoveMaster_return_keyboard, byte_order); + } + if ((f_type == 3)) { + field16(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_AttachSlave_deviceid, byte_order); + field16(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_AttachSlave_master, byte_order); + } + if ((f_type == 4)) { + field16(tvb, offsetp, t, hf_x11_struct_xinput_HierarchyChange_DetachSlave_deviceid, byte_order); + UNUSED(2); + } } } @@ -17860,7 +18654,7 @@ static void xinputXIGetClientPointer_Reply(tvbuff_t *tvb, packet_info *pinfo, in UNUSED(20); } -static int struct_size_xinput_EventMask(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xinput_EventMask(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_mask_len; @@ -17928,13 +18722,10 @@ static void xinputXIQueryVersion_Reply(tvbuff_t *tvb, packet_info *pinfo, int *o UNUSED(20); } -static int struct_size_xinput_DeviceClass(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xinput_DeviceClass(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; - int f_len; - f_len = VALUE16(tvb, *offsetp + size + 2); - size += ((f_len * 4) - 8) * 1; - return size + 8; + return size + 6; } static void struct_xinput_DeviceClass(tvbuff_t *tvb, int *offsetp, proto_tree *root, guint byte_order _U_, int count) @@ -17943,22 +18734,66 @@ static void struct_xinput_DeviceClass(tvbuff_t *tvb, int *offsetp, proto_tree *r for (i = 0; i < count; i++) { proto_item *item; proto_tree *t; - int f_len; + int f_type; item = proto_tree_add_item(root, hf_x11_struct_xinput_DeviceClass, tvb, *offsetp, struct_size_xinput_DeviceClass(tvb, offsetp, byte_order), ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); - field16(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_type, byte_order); - f_len = VALUE16(tvb, *offsetp); + f_type = field16(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_type, byte_order); proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_len, tvb, *offsetp, 2, byte_order); *offsetp += 2; proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_sourceid, tvb, *offsetp, 2, byte_order); *offsetp += 2; - UNUSED(2); - listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_uninterpreted_data, ((f_len * 4) - 8), byte_order); + if ((f_type == 0)) { + int f_num_keys; + f_num_keys = VALUE16(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_Key_num_keys, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_Key_keys, hf_x11_struct_xinput_DeviceClass_Key_keys_item, f_num_keys, byte_order); + } + if ((f_type == 1)) { + int f_num_buttons; + f_num_buttons = VALUE16(tvb, *offsetp); + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_Button_num_buttons, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_Button_state, hf_x11_struct_xinput_DeviceClass_Button_state_item, ((f_num_buttons + 31) / 32), byte_order); + listOfCard32(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_Button_labels, hf_x11_struct_xinput_DeviceClass_Button_labels_item, f_num_buttons, byte_order); + } + if ((f_type == 2)) { + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_Valuator_number, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_Valuator_label, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + struct_xinput_FP3232(tvb, offsetp, t, byte_order, 1); + struct_xinput_FP3232(tvb, offsetp, t, byte_order, 1); + struct_xinput_FP3232(tvb, offsetp, t, byte_order, 1); + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_Valuator_resolution, tvb, *offsetp, 4, byte_order); + *offsetp += 4; + field8(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_Valuator_mode, byte_order); + UNUSED(3); + } + if ((f_type == 3)) { + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_Scroll_number, tvb, *offsetp, 2, byte_order); + *offsetp += 2; + field16(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_Scroll_scroll_type, byte_order); + UNUSED(2); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_Scroll_flags, tvb, *offsetp, 4, byte_order); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_struct_xinput_DeviceClass_Scroll_flags_mask_NoEmulation, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_struct_xinput_DeviceClass_Scroll_flags_mask_Preferred, tvb, *offsetp, 4, byte_order); + } + *offsetp += 4; + struct_xinput_FP3232(tvb, offsetp, t, byte_order, 1); + } + if ((f_type == 8)) { + field8(tvb, offsetp, t, hf_x11_struct_xinput_DeviceClass_Touch_mode, byte_order); + proto_tree_add_item(t, hf_x11_struct_xinput_DeviceClass_Touch_num_touches, tvb, *offsetp, 1, byte_order); + *offsetp += 1; + } } } -static int struct_size_xinput_XIDeviceInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xinput_XIDeviceInfo(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int i, off; @@ -17966,7 +18801,8 @@ static int struct_size_xinput_XIDeviceInfo(tvbuff_t *tvb, int *offsetp, guint by int f_num_classes; f_num_classes = VALUE16(tvb, *offsetp + size + 6); f_name_len = VALUE16(tvb, *offsetp + size + 8); - size += (((f_name_len + 3) / 4) * 4) * 1; + size += f_name_len * 1; + size = (size + 3) & ~3; for (i = 0; i < f_num_classes; i++) { off = (*offsetp) + size + 12; size += struct_size_xinput_DeviceClass(tvb, &off, byte_order); @@ -17997,7 +18833,10 @@ static void struct_xinput_XIDeviceInfo(tvbuff_t *tvb, int *offsetp, proto_tree * proto_tree_add_item(t, hf_x11_struct_xinput_XIDeviceInfo_enabled, tvb, *offsetp, 1, byte_order); *offsetp += 1; UNUSED(1); - listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_XIDeviceInfo_name, (((f_name_len + 3) / 4) * 4), byte_order); + listOfByte(tvb, offsetp, t, hf_x11_struct_xinput_XIDeviceInfo_name, f_name_len, byte_order); + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } struct_xinput_DeviceClass(tvb, offsetp, t, byte_order, f_num_classes); } } @@ -18241,15 +19080,23 @@ static void xinputXIChangeProperty(tvbuff_t *tvb, packet_info *pinfo _U_, int *o f_num_items = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xinput_XIChangeProperty_num_items, tvb, *offsetp, 4, byte_order); *offsetp += 4; - if ((f_format & (1U << 3))) { + if ((f_format == 8)) { listOfByte(tvb, offsetp, t, hf_x11_xinput_XIChangeProperty_8Bits_data8, f_num_items, byte_order); length -= f_num_items * 1; + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } + length = ((length + 3) & ~3); } - if ((f_format & (1U << 4))) { + if ((f_format == 16)) { listOfCard16(tvb, offsetp, t, hf_x11_xinput_XIChangeProperty_16Bits_data16, hf_x11_xinput_XIChangeProperty_16Bits_data16_item, f_num_items, byte_order); length -= f_num_items * 2; + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } + length = ((length + 3) & ~3); } - if ((f_format & (1U << 5))) { + if ((f_format == 32)) { listOfCard32(tvb, offsetp, t, hf_x11_xinput_XIChangeProperty_32Bits_data32, hf_x11_xinput_XIChangeProperty_32Bits_data32_item, f_num_items, byte_order); length -= f_num_items * 4; } @@ -18303,13 +19150,19 @@ static void xinputXIGetProperty_Reply(tvbuff_t *tvb, packet_info *pinfo, int *of *offsetp += 4; f_format = field8(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_reply_format, byte_order); UNUSED(11); - if ((f_format & (1U << 3))) { + if ((f_format == 8)) { listOfByte(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_reply_8Bits_data8, f_num_items, byte_order); + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } } - if ((f_format & (1U << 4))) { + if ((f_format == 16)) { listOfCard16(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_reply_16Bits_data16, hf_x11_xinput_XIGetProperty_reply_16Bits_data16_item, f_num_items, byte_order); + if (*offsetp % 4) { + UNUSED(4 - *offsetp % 4); + } } - if ((f_format & (1U << 5))) { + if ((f_format == 32)) { listOfCard32(tvb, offsetp, t, hf_x11_xinput_XIGetProperty_reply_32Bits_data32, hf_x11_xinput_XIGetProperty_reply_32Bits_data32_item, f_num_items, byte_order); } } @@ -18390,7 +19243,23 @@ static void xinputDeviceKeyPress(tvbuff_t *tvb, int *offsetp, proto_tree *t, gui *offsetp += 2; proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_event_y, tvb, *offsetp, 2, byte_order); *offsetp += 2; - proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_state, tvb, *offsetp, 2, byte_order); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_state, tvb, *offsetp, 2, byte_order); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Shift, tvb, *offsetp, 2, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Lock, tvb, *offsetp, 2, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Control, tvb, *offsetp, 2, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Mod1, tvb, *offsetp, 2, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Mod2, tvb, *offsetp, 2, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Mod3, tvb, *offsetp, 2, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Mod4, tvb, *offsetp, 2, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Mod5, tvb, *offsetp, 2, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Button1, tvb, *offsetp, 2, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Button2, tvb, *offsetp, 2, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Button3, tvb, *offsetp, 2, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Button4, tvb, *offsetp, 2, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceKeyPress_state_mask_Button5, tvb, *offsetp, 2, byte_order); + } *offsetp += 2; proto_tree_add_item(t, hf_x11_xinput_DeviceKeyPress_same_screen, tvb, *offsetp, 1, byte_order); *offsetp += 1; @@ -18427,7 +19296,15 @@ static void xinputDeviceStateNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, *offsetp += 1; proto_tree_add_item(t, hf_x11_xinput_DeviceStateNotify_num_valuators, tvb, *offsetp, 1, byte_order); *offsetp += 1; - proto_tree_add_item(t, hf_x11_xinput_DeviceStateNotify_classes_reported, tvb, *offsetp, 1, byte_order); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_DeviceStateNotify_classes_reported, tvb, *offsetp, 1, byte_order); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceStateNotify_classes_reported_mask_ReportingKeys, tvb, *offsetp, 1, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceStateNotify_classes_reported_mask_ReportingButtons, tvb, *offsetp, 1, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceStateNotify_classes_reported_mask_ReportingValuators, tvb, *offsetp, 1, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceStateNotify_classes_reported_mask_DeviceModeAbsolute, tvb, *offsetp, 1, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_DeviceStateNotify_classes_reported_mask_OutOfProximity, tvb, *offsetp, 1, byte_order); + } *offsetp += 1; listOfByte(tvb, offsetp, t, hf_x11_xinput_DeviceStateNotify_buttons, 4, byte_order); listOfByte(tvb, offsetp, t, hf_x11_xinput_DeviceStateNotify_keys, 4, byte_order); @@ -18440,8 +19317,7 @@ static void xinputDeviceMappingNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t proto_tree_add_item(t, hf_x11_xinput_DeviceMappingNotify_device_id, tvb, *offsetp, 1, ENC_NA); *offsetp += 1; CARD16(event_sequencenumber); - proto_tree_add_item(t, hf_x11_xinput_DeviceMappingNotify_request, tvb, *offsetp, 1, byte_order); - *offsetp += 1; + field8(tvb, offsetp, t, hf_x11_xinput_DeviceMappingNotify_request, byte_order); proto_tree_add_item(t, hf_x11_xinput_DeviceMappingNotify_first_keycode, tvb, *offsetp, 1, byte_order); *offsetp += 1; proto_tree_add_item(t, hf_x11_xinput_DeviceMappingNotify_count, tvb, *offsetp, 1, byte_order); @@ -18460,8 +19336,7 @@ static void xinputChangeDeviceNotify(tvbuff_t *tvb, int *offsetp, proto_tree *t, CARD16(event_sequencenumber); proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceNotify_time, tvb, *offsetp, 4, byte_order); *offsetp += 4; - proto_tree_add_item(t, hf_x11_xinput_ChangeDeviceNotify_request, tvb, *offsetp, 1, byte_order); - *offsetp += 1; + field8(tvb, offsetp, t, hf_x11_xinput_ChangeDeviceNotify_request, byte_order); UNUSED(23); } @@ -18534,6 +19409,7 @@ static void xinputKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tr { int f_buttons_len; int f_valuators_len; + int sumof_valuator_mask = 0; proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 2, "opcode: KeyPress (2)"); field16(tvb, offsetp, t, hf_x11_xinput_KeyPress_deviceid, byte_order); @@ -18571,7 +19447,14 @@ static void xinputKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tr struct_xinput_ModifierInfo(tvb, offsetp, t, byte_order, 1); struct_xinput_GroupInfo(tvb, offsetp, t, byte_order, 1); listOfCard32(tvb, offsetp, t, hf_x11_xinput_KeyPress_button_mask, hf_x11_xinput_KeyPress_button_mask_item, f_buttons_len, byte_order); + { + int i; + for (i = 0; i < f_valuators_len; i++) { + sumof_valuator_mask += VALUE32(tvb, *offsetp + i * 4); + } + } listOfCard32(tvb, offsetp, t, hf_x11_xinput_KeyPress_valuator_mask, hf_x11_xinput_KeyPress_valuator_mask_item, f_valuators_len, byte_order); + struct_xinput_FP3232(tvb, offsetp, t, byte_order, sumof_valuator_mask); } @@ -18579,6 +19462,7 @@ static void xinputButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto { int f_buttons_len; int f_valuators_len; + int sumof_valuator_mask = 0; proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 4, "opcode: ButtonPress (4)"); field16(tvb, offsetp, t, hf_x11_xinput_ButtonPress_deviceid, byte_order); @@ -18616,7 +19500,14 @@ static void xinputButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto struct_xinput_ModifierInfo(tvb, offsetp, t, byte_order, 1); struct_xinput_GroupInfo(tvb, offsetp, t, byte_order, 1); listOfCard32(tvb, offsetp, t, hf_x11_xinput_ButtonPress_button_mask, hf_x11_xinput_ButtonPress_button_mask_item, f_buttons_len, byte_order); + { + int i; + for (i = 0; i < f_valuators_len; i++) { + sumof_valuator_mask += VALUE32(tvb, *offsetp + i * 4); + } + } listOfCard32(tvb, offsetp, t, hf_x11_xinput_ButtonPress_valuator_mask, hf_x11_xinput_ButtonPress_valuator_mask_item, f_valuators_len, byte_order); + struct_xinput_FP3232(tvb, offsetp, t, byte_order, sumof_valuator_mask); } @@ -18732,6 +19623,7 @@ static void xinputProperty(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tr static void xinputRawKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order) { int f_valuators_len; + int sumof_valuator_mask = 0; proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 13, "opcode: RawKeyPress (13)"); field16(tvb, offsetp, t, hf_x11_xinput_RawKeyPress_deviceid, byte_order); @@ -18750,13 +19642,22 @@ static void xinputRawKeyPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto } *offsetp += 4; UNUSED(4); + { + int i; + for (i = 0; i < f_valuators_len; i++) { + sumof_valuator_mask += VALUE32(tvb, *offsetp + i * 4); + } + } listOfCard32(tvb, offsetp, t, hf_x11_xinput_RawKeyPress_valuator_mask, hf_x11_xinput_RawKeyPress_valuator_mask_item, f_valuators_len, byte_order); + struct_xinput_FP3232(tvb, offsetp, t, byte_order, sumof_valuator_mask); + struct_xinput_FP3232(tvb, offsetp, t, byte_order, sumof_valuator_mask); } static void xinputRawButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order) { int f_valuators_len; + int sumof_valuator_mask = 0; proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 15, "opcode: RawButtonPress (15)"); field16(tvb, offsetp, t, hf_x11_xinput_RawButtonPress_deviceid, byte_order); @@ -18775,7 +19676,15 @@ static void xinputRawButtonPress(tvbuff_t *tvb, int length _U_, int *offsetp, pr } *offsetp += 4; UNUSED(4); + { + int i; + for (i = 0; i < f_valuators_len; i++) { + sumof_valuator_mask += VALUE32(tvb, *offsetp + i * 4); + } + } listOfCard32(tvb, offsetp, t, hf_x11_xinput_RawButtonPress_valuator_mask, hf_x11_xinput_RawButtonPress_valuator_mask_item, f_valuators_len, byte_order); + struct_xinput_FP3232(tvb, offsetp, t, byte_order, sumof_valuator_mask); + struct_xinput_FP3232(tvb, offsetp, t, byte_order, sumof_valuator_mask); } @@ -18783,6 +19692,7 @@ static void xinputTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, proto_ { int f_buttons_len; int f_valuators_len; + int sumof_valuator_mask = 0; proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 18, "opcode: TouchBegin (18)"); field16(tvb, offsetp, t, hf_x11_xinput_TouchBegin_deviceid, byte_order); @@ -18821,7 +19731,14 @@ static void xinputTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, proto_ struct_xinput_ModifierInfo(tvb, offsetp, t, byte_order, 1); struct_xinput_GroupInfo(tvb, offsetp, t, byte_order, 1); listOfCard32(tvb, offsetp, t, hf_x11_xinput_TouchBegin_button_mask, hf_x11_xinput_TouchBegin_button_mask_item, f_buttons_len, byte_order); + { + int i; + for (i = 0; i < f_valuators_len; i++) { + sumof_valuator_mask += VALUE32(tvb, *offsetp + i * 4); + } + } listOfCard32(tvb, offsetp, t, hf_x11_xinput_TouchBegin_valuator_mask, hf_x11_xinput_TouchBegin_valuator_mask_item, f_valuators_len, byte_order); + struct_xinput_FP3232(tvb, offsetp, t, byte_order, sumof_valuator_mask); } @@ -18849,6 +19766,7 @@ static void xinputTouchOwnership(tvbuff_t *tvb, int length _U_, int *offsetp, pr static void xinputRawTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, proto_tree *t, guint byte_order) { int f_valuators_len; + int sumof_valuator_mask = 0; proto_tree_add_uint_format(t, hf_x11_minor_opcode, tvb, *offsetp, 2, 22, "opcode: RawTouchBegin (22)"); field16(tvb, offsetp, t, hf_x11_xinput_RawTouchBegin_deviceid, byte_order); @@ -18868,7 +19786,15 @@ static void xinputRawTouchBegin(tvbuff_t *tvb, int length _U_, int *offsetp, pro } *offsetp += 4; UNUSED(4); + { + int i; + for (i = 0; i < f_valuators_len; i++) { + sumof_valuator_mask += VALUE32(tvb, *offsetp + i * 4); + } + } listOfCard32(tvb, offsetp, t, hf_x11_xinput_RawTouchBegin_valuator_mask, hf_x11_xinput_RawTouchBegin_valuator_mask_item, f_valuators_len, byte_order); + struct_xinput_FP3232(tvb, offsetp, t, byte_order, sumof_valuator_mask); + struct_xinput_FP3232(tvb, offsetp, t, byte_order, sumof_valuator_mask); } @@ -18888,7 +19814,12 @@ static void xinputBarrierHit(tvbuff_t *tvb, int length _U_, int *offsetp, proto_ *offsetp += 4; proto_tree_add_item(t, hf_x11_xinput_BarrierHit_dtime, tvb, *offsetp, 4, byte_order); *offsetp += 4; - proto_tree_add_item(t, hf_x11_xinput_BarrierHit_flags, tvb, *offsetp, 4, byte_order); + { + proto_item *ti = proto_tree_add_item(t, hf_x11_xinput_BarrierHit_flags, tvb, *offsetp, 4, byte_order); + proto_tree *bitmask_tree = proto_item_add_subtree(ti, ett_x11_rectangle); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_BarrierHit_flags_mask_PointerReleased, tvb, *offsetp, 4, byte_order); + proto_tree_add_item(bitmask_tree, hf_x11_xinput_BarrierHit_flags_mask_DeviceIsGrabbed, tvb, *offsetp, 4, byte_order); + } *offsetp += 4; field16(tvb, offsetp, t, hf_x11_xinput_BarrierHit_sourceid, byte_order); UNUSED(2); @@ -19383,7 +20314,7 @@ static void struct_xkb_KeyName(tvbuff_t *tvb, int *offsetp, proto_tree *root, gu proto_item *item; proto_tree *t; - item = proto_tree_add_item(root, hf_x11_struct_xkb_KeyName, tvb, *offsetp, 1, ENC_NA); + item = proto_tree_add_item(root, hf_x11_struct_xkb_KeyName, tvb, *offsetp, 4, ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_KeyName_name, 4, byte_order); } @@ -19396,14 +20327,14 @@ static void struct_xkb_KeyAlias(tvbuff_t *tvb, int *offsetp, proto_tree *root, g proto_item *item; proto_tree *t; - item = proto_tree_add_item(root, hf_x11_struct_xkb_KeyAlias, tvb, *offsetp, 2, ENC_NA); + item = proto_tree_add_item(root, hf_x11_struct_xkb_KeyAlias, tvb, *offsetp, 8, ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_KeyAlias_real, 4, byte_order); listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_KeyAlias_alias, 4, byte_order); } } -static int struct_size_xkb_CountedString16(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xkb_CountedString16(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_length; @@ -19497,7 +20428,7 @@ static void struct_xkb_KTMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *root, } } -static int struct_size_xkb_KeyType(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xkb_KeyType(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_hasPreserve; @@ -19583,7 +20514,7 @@ static void struct_xkb_KeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, gu } } -static int struct_size_xkb_KeySymMap(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xkb_KeySymMap(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_nSyms; @@ -19871,7 +20802,7 @@ static void struct_xkb_KTSetMapEntry(tvbuff_t *tvb, int *offsetp, proto_tree *ro } } -static int struct_size_xkb_SetKeyType(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xkb_SetKeyType(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_nMapEntries; @@ -19957,7 +20888,7 @@ static void struct_xkb_SetKeyType(tvbuff_t *tvb, int *offsetp, proto_tree *root, } } -static int struct_size_xkb_Listing(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xkb_Listing(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_length; @@ -19985,7 +20916,7 @@ static void struct_xkb_Listing(tvbuff_t *tvb, int *offsetp, proto_tree *root, gu } } -static int struct_size_xkb_DeviceLedInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xkb_DeviceLedInfo(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_mapsPresent; @@ -20402,7 +21333,7 @@ static void struct_xkb_SAActionMessage(tvbuff_t *tvb, int *offsetp, proto_tree * proto_item *item; proto_tree *t; - item = proto_tree_add_item(root, hf_x11_struct_xkb_SAActionMessage, tvb, *offsetp, 3, ENC_NA); + item = proto_tree_add_item(root, hf_x11_struct_xkb_SAActionMessage, tvb, *offsetp, 8, ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); field8(tvb, offsetp, t, hf_x11_struct_xkb_SAActionMessage_type, byte_order); { @@ -20592,7 +21523,7 @@ static void struct_xkb_SIAction(tvbuff_t *tvb, int *offsetp, proto_tree *root, g proto_item *item; proto_tree *t; - item = proto_tree_add_item(root, hf_x11_struct_xkb_SIAction, tvb, *offsetp, 2, ENC_NA); + item = proto_tree_add_item(root, hf_x11_struct_xkb_SIAction, tvb, *offsetp, 8, ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); field8(tvb, offsetp, t, hf_x11_struct_xkb_SIAction_type, byte_order); listOfByte(tvb, offsetp, t, hf_x11_struct_xkb_SIAction_data, 7, byte_order); @@ -20606,7 +21537,7 @@ static void struct_xkb_SymInterpret(tvbuff_t *tvb, int *offsetp, proto_tree *roo proto_item *item; proto_tree *t; - item = proto_tree_add_item(root, hf_x11_struct_xkb_SymInterpret, tvb, *offsetp, 10, ENC_NA); + item = proto_tree_add_item(root, hf_x11_struct_xkb_SymInterpret, tvb, *offsetp, 16, ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); proto_tree_add_item(t, hf_x11_struct_xkb_SymInterpret_sym, tvb, *offsetp, 4, byte_order); *offsetp += 4; @@ -22318,7 +23249,7 @@ static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, *offsetp += 2; UNUSED(2); struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSI); - length -= f_nSI * 10; + length -= f_nSI * 16; struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groups)); length -= popcount(f_groups) * 4; } @@ -22973,11 +23904,11 @@ static void xkbSetNames(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, pro } if ((f_which & (1U << 9))) { struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys); - length -= f_nKeys * 1; + length -= f_nKeys * 4; } if ((f_which & (1U << 10))) { struct_xkb_KeyAlias(tvb, offsetp, t, byte_order, f_nKeyAliases); - length -= f_nKeyAliases * 2; + length -= f_nKeyAliases * 8; } if ((f_which & (1U << 13))) { listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_RGNames_radioGroupNames, hf_x11_xkb_SetNames_RGNames_radioGroupNames_item, f_nRadioGroups, byte_order); @@ -24619,7 +25550,7 @@ static void register_xkb(void) set_handler("XKEYBOARD", dispatch_xkb, xkb_errors, xkb_events, NULL, xkb_replies); } -static int struct_size_xprint_PRINTER(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xprint_PRINTER(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_descLen; @@ -24816,19 +25747,25 @@ static void xprintPrintEndDoc(tvbuff_t *tvb, packet_info *pinfo _U_, int *offset static void xprintPrintPutDocumentData(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) { int f_len_data; + int f_len_fmt; + int f_len_options; proto_tree_add_item(t, hf_x11_xprint_PrintPutDocumentData_drawable, tvb, *offsetp, 4, byte_order); *offsetp += 4; f_len_data = VALUE32(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xprint_PrintPutDocumentData_len_data, tvb, *offsetp, 4, byte_order); *offsetp += 4; + f_len_fmt = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xprint_PrintPutDocumentData_len_fmt, tvb, *offsetp, 2, byte_order); *offsetp += 2; + f_len_options = VALUE16(tvb, *offsetp); proto_tree_add_item(t, hf_x11_xprint_PrintPutDocumentData_len_options, tvb, *offsetp, 2, byte_order); *offsetp += 2; listOfByte(tvb, offsetp, t, hf_x11_xprint_PrintPutDocumentData_data, f_len_data, byte_order); length -= f_len_data * 1; - listOfByte(tvb, offsetp, t, hf_x11_xprint_PrintPutDocumentData_doc_format, (length - 16) / 1, byte_order); - listOfByte(tvb, offsetp, t, hf_x11_xprint_PrintPutDocumentData_options, (length - 16) / 1, byte_order); + listOfByte(tvb, offsetp, t, hf_x11_xprint_PrintPutDocumentData_doc_format, f_len_fmt, byte_order); + length -= f_len_fmt * 1; + listOfByte(tvb, offsetp, t, hf_x11_xprint_PrintPutDocumentData_options, f_len_options, byte_order); + length -= f_len_options * 1; } static void xprintPrintGetDocumentData(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@ -24881,6 +25818,8 @@ static void xprintPrintSelectInput(tvbuff_t *tvb, packet_info *pinfo _U_, int *o { proto_tree_add_item(t, hf_x11_xprint_PrintSelectInput_context, tvb, *offsetp, 4, byte_order); *offsetp += 4; + proto_tree_add_item(t, hf_x11_xprint_PrintSelectInput_event_mask, tvb, *offsetp, 4, byte_order); + *offsetp += 4; } static void xprintPrintInputSelected(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@ -24895,13 +25834,16 @@ static void xprintPrintInputSelected_Reply(tvbuff_t *tvb, packet_info *pinfo, in col_append_fstr(pinfo->cinfo, COL_INFO, "-PrintInputSelected"); REPLY(reply); - UNUSED(1); + proto_tree_add_item(t, hf_x11_xprint_PrintInputSelected_reply_event_mask, tvb, *offsetp, 4, byte_order); + *offsetp += 4; sequence_number = VALUE16(tvb, *offsetp); proto_tree_add_uint_format(t, hf_x11_reply_sequencenumber, tvb, *offsetp, 2, sequence_number, "sequencenumber: %d (xprint-PrintInputSelected)", sequence_number); *offsetp += 2; proto_tree_add_item(t, hf_x11_replylength, tvb, *offsetp, 4, byte_order); *offsetp += 4; + proto_tree_add_item(t, hf_x11_xprint_PrintInputSelected_reply_all_events_mask, tvb, *offsetp, 4, byte_order); + *offsetp += 4; } static void xprintPrintGetAttributes(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) @@ -25406,7 +26348,7 @@ static void xselinuxGetWindowContext_Reply(tvbuff_t *tvb, packet_info *pinfo, in listOfByte(tvb, offsetp, t, hf_x11_xselinux_GetWindowContext_reply_context, f_context_len, byte_order); } -static int struct_size_xselinux_ListItem(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xselinux_ListItem(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_data_context_len; @@ -26069,7 +27011,7 @@ static void struct_xv_Format(tvbuff_t *tvb, int *offsetp, proto_tree *root, guin } } -static int struct_size_xv_AdaptorInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xv_AdaptorInfo(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_name_size; @@ -26122,7 +27064,7 @@ static void struct_xv_AdaptorInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root, } } -static int struct_size_xv_EncodingInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xv_EncodingInfo(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_name_size; @@ -26156,7 +27098,7 @@ static void struct_xv_EncodingInfo(tvbuff_t *tvb, int *offsetp, proto_tree *root } } -static int struct_size_xv_AttributeInfo(tvbuff_t *tvb, int *offsetp, guint byte_order _U_) +static int struct_size_xv_AttributeInfo(tvbuff_t *tvb _U_, int *offsetp _U_, guint byte_order _U_) { int size = 0; int f_size; @@ -26200,7 +27142,7 @@ static void struct_xv_ImageFormatInfo(tvbuff_t *tvb, int *offsetp, proto_tree *r proto_item *item; proto_tree *t; - item = proto_tree_add_item(root, hf_x11_struct_xv_ImageFormatInfo, tvb, *offsetp, 82, ENC_NA); + item = proto_tree_add_item(root, hf_x11_struct_xv_ImageFormatInfo, tvb, *offsetp, 128, ENC_NA); t = proto_item_add_subtree(item, ett_x11_rectangle); proto_tree_add_item(t, hf_x11_struct_xv_ImageFormatInfo_id, tvb, *offsetp, 4, byte_order); *offsetp += 4; diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h index 4362a2a356..22041242b1 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 10.3-branchpoint-14-ge7f2f2d */ + using mesa version 11.0-branchpoint-1337-gc188235 */ /* * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com> * @@ -1303,6 +1303,7 @@ static const value_string mesa_enum[] = { /* OpenGL extension GL_ARB_transform_feedback3 */ { 0x8E70, "MAX_TRANSFORM_FEEDBACK_BUFFERS" }, { 0x8E71, "MAX_VERTEX_STREAMS" }, +/* OpenGL extension GL_ARB_shader_precision */ /* OpenGL extension GL_ARB_transform_feedback_instanced */ /* OpenGL extension GL_ARB_map_buffer_alignment */ { 0x90BC, "MIN_MAP_BUFFER_ALIGNMENT" }, @@ -1978,6 +1979,10 @@ static const value_string mesa_enum[] = { { 0x8A48, "TEXTURE_SRGB_DECODE_EXT" }, { 0x8A49, "DECODE_EXT" }, { 0x8A4A, "SKIP_DECODE_EXT" }, +/* OpenGL extension GL_AMD_pinned_memory */ + { 0x9160, "EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD" }, +/* OpenGL extension GL_EXT_polygon_offset_clamp */ + { 0x8E1B, "POLYGON_OFFSET_CLAMP_EXT" }, /* OpenGL extension GL_ATI_blend_equation_separate */ /* OpenGL extension GL_ATI_separate_stencil */ { 0x8800, "STENCIL_BACK_FUNC_ATI" }, diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h index c0f326256a..59fc09947c 100644 --- a/epan/dissectors/x11-register-info.h +++ b/epan/dissectors/x11-register-info.h @@ -2371,6 +2371,9 @@ { &hf_x11_glx_GetTexLevelParameteriv_reply_datum, { "datum", "x11.glx.GetTexLevelParameteriv.reply.datum", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_GetTexLevelParameteriv_reply_data, { "data", "x11.glx.GetTexLevelParameteriv.reply.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_GetTexLevelParameteriv_reply_data_item, { "data", "x11.glx.GetTexLevelParameteriv.reply.data", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_IsEnabled_context_tag, { "context_tag", "x11.glx.IsEnabled.context_tag", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_IsEnabled_capability, { "capability", "x11.glx.IsEnabled.capability", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_glx_IsEnabled_reply_ret_val, { "ret_val", "x11.glx.IsEnabled.reply.ret_val", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_IsList_context_tag, { "context_tag", "x11.glx.IsList.context_tag", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_IsList_list, { "list", "x11.glx.IsList.list", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_glx_IsList_reply_ret_val, { "ret_val", "x11.glx.IsList.reply.ret_val", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -2613,6 +2616,19 @@ { &hf_x11_struct_randr_ResourceChange, { "randr_ResourceChange", "x11.struct.randr_ResourceChange", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_randr_ResourceChange_timestamp, { "timestamp", "x11.struct.randr_ResourceChange.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_randr_ResourceChange_window, { "window", "x11.struct.randr_ResourceChange.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo, { "randr_MonitorInfo", "x11.struct.randr_MonitorInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo_name, { "name", "x11.struct.randr_MonitorInfo.name", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo_primary, { "primary", "x11.struct.randr_MonitorInfo.primary", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo_automatic, { "automatic", "x11.struct.randr_MonitorInfo.automatic", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo_nOutput, { "nOutput", "x11.struct.randr_MonitorInfo.nOutput", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo_x, { "x", "x11.struct.randr_MonitorInfo.x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo_y, { "y", "x11.struct.randr_MonitorInfo.y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo_width, { "width", "x11.struct.randr_MonitorInfo.width", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo_height, { "height", "x11.struct.randr_MonitorInfo.height", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo_width_in_millimeters, { "width_in_millimeters", "x11.struct.randr_MonitorInfo.width_in_millimeters", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo_height_in_millimeters, { "height_in_millimeters", "x11.struct.randr_MonitorInfo.height_in_millimeters", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo_outputs, { "outputs", "x11.struct.randr_MonitorInfo.outputs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_randr_MonitorInfo_outputs_item, { "outputs", "x11.struct.randr_MonitorInfo.outputs", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_sync_INT64, { "sync_INT64", "x11.struct.sync_INT64", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_sync_INT64_hi, { "hi", "x11.struct.sync_INT64.hi", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_sync_INT64_lo, { "lo", "x11.struct.sync_INT64.lo", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -3061,6 +3077,16 @@ { &hf_x11_union_randr_NotifyData_rc, { "rc", "x11.union.randr_NotifyData.rc", 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_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_GetMonitors_window, { "window", "x11.randr.GetMonitors.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetMonitors_get_active, { "get_active", "x11.randr.GetMonitors.get_active", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetMonitors_reply_timestamp, { "timestamp", "x11.randr.GetMonitors.reply.timestamp", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetMonitors_reply_nMonitors, { "nMonitors", "x11.randr.GetMonitors.reply.nMonitors", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetMonitors_reply_nOutputs, { "nOutputs", "x11.randr.GetMonitors.reply.nOutputs", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_GetMonitors_reply_monitors, { "monitors", "x11.randr.GetMonitors.reply.monitors", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_SetMonitor_window, { "window", "x11.randr.SetMonitor.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_SetMonitor_monitorinfo, { "monitorinfo", "x11.randr.SetMonitor.monitorinfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_DeleteMonitor_window, { "window", "x11.randr.DeleteMonitor.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_randr_DeleteMonitor_name, { "name", "x11.randr.DeleteMonitor.name", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_randr_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(randr_extension_minor), 0, "minor opcode", HFILL }}, { &hf_x11_struct_record_Range8, { "record_Range8", "x11.struct.record_Range8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -3149,7 +3175,61 @@ { &hf_x11_render_CreatePicture_pid, { "pid", "x11.render.CreatePicture.pid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CreatePicture_drawable, { "drawable", "x11.render.CreatePicture.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_CreatePicture_format, { "format", "x11.render.CreatePicture.format", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_Repeat, { "Repeat", "x11.render.CreatePicture.value_mask.Repeat", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_AlphaMap, { "AlphaMap", "x11.render.CreatePicture.value_mask.AlphaMap", FT_BOOLEAN, 32, NULL, 1U << 1, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_AlphaXOrigin, { "AlphaXOrigin", "x11.render.CreatePicture.value_mask.AlphaXOrigin", FT_BOOLEAN, 32, NULL, 1U << 2, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_AlphaYOrigin, { "AlphaYOrigin", "x11.render.CreatePicture.value_mask.AlphaYOrigin", FT_BOOLEAN, 32, NULL, 1U << 3, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_ClipXOrigin, { "ClipXOrigin", "x11.render.CreatePicture.value_mask.ClipXOrigin", FT_BOOLEAN, 32, NULL, 1U << 4, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_ClipYOrigin, { "ClipYOrigin", "x11.render.CreatePicture.value_mask.ClipYOrigin", FT_BOOLEAN, 32, NULL, 1U << 5, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_ClipMask, { "ClipMask", "x11.render.CreatePicture.value_mask.ClipMask", FT_BOOLEAN, 32, NULL, 1U << 6, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_GraphicsExposure, { "GraphicsExposure", "x11.render.CreatePicture.value_mask.GraphicsExposure", FT_BOOLEAN, 32, NULL, 1U << 7, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_SubwindowMode, { "SubwindowMode", "x11.render.CreatePicture.value_mask.SubwindowMode", FT_BOOLEAN, 32, NULL, 1U << 8, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_PolyEdge, { "PolyEdge", "x11.render.CreatePicture.value_mask.PolyEdge", FT_BOOLEAN, 32, NULL, 1U << 9, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_PolyMode, { "PolyMode", "x11.render.CreatePicture.value_mask.PolyMode", FT_BOOLEAN, 32, NULL, 1U << 10, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_Dither, { "Dither", "x11.render.CreatePicture.value_mask.Dither", FT_BOOLEAN, 32, NULL, 1U << 11, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask_mask_ComponentAlpha, { "ComponentAlpha", "x11.render.CreatePicture.value_mask.ComponentAlpha", FT_BOOLEAN, 32, NULL, 1U << 12, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_value_mask, { "value_mask", "x11.render.CreatePicture.value_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_Repeat_repeat, { "repeat", "x11.render.CreatePicture.Repeat.repeat", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_render_Repeat), 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_AlphaMap_alphamap, { "alphamap", "x11.render.CreatePicture.AlphaMap.alphamap", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_AlphaXOrigin_alphaxorigin, { "alphaxorigin", "x11.render.CreatePicture.AlphaXOrigin.alphaxorigin", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_AlphaYOrigin_alphayorigin, { "alphayorigin", "x11.render.CreatePicture.AlphaYOrigin.alphayorigin", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_ClipXOrigin_clipxorigin, { "clipxorigin", "x11.render.CreatePicture.ClipXOrigin.clipxorigin", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_ClipYOrigin_clipyorigin, { "clipyorigin", "x11.render.CreatePicture.ClipYOrigin.clipyorigin", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_ClipMask_clipmask, { "clipmask", "x11.render.CreatePicture.ClipMask.clipmask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_GraphicsExposure_graphicsexposure, { "graphicsexposure", "x11.render.CreatePicture.GraphicsExposure.graphicsexposure", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_SubwindowMode_subwindowmode, { "subwindowmode", "x11.render.CreatePicture.SubwindowMode.subwindowmode", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_SubwindowMode), 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_PolyEdge_polyedge, { "polyedge", "x11.render.CreatePicture.PolyEdge.polyedge", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_render_PolyEdge), 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_PolyMode_polymode, { "polymode", "x11.render.CreatePicture.PolyMode.polymode", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_render_PolyMode), 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_Dither_dither, { "dither", "x11.render.CreatePicture.Dither.dither", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_CreatePicture_ComponentAlpha_componentalpha, { "componentalpha", "x11.render.CreatePicture.ComponentAlpha.componentalpha", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_ChangePicture_picture, { "picture", "x11.render.ChangePicture.picture", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_Repeat, { "Repeat", "x11.render.ChangePicture.value_mask.Repeat", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_AlphaMap, { "AlphaMap", "x11.render.ChangePicture.value_mask.AlphaMap", FT_BOOLEAN, 32, NULL, 1U << 1, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_AlphaXOrigin, { "AlphaXOrigin", "x11.render.ChangePicture.value_mask.AlphaXOrigin", FT_BOOLEAN, 32, NULL, 1U << 2, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_AlphaYOrigin, { "AlphaYOrigin", "x11.render.ChangePicture.value_mask.AlphaYOrigin", FT_BOOLEAN, 32, NULL, 1U << 3, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_ClipXOrigin, { "ClipXOrigin", "x11.render.ChangePicture.value_mask.ClipXOrigin", FT_BOOLEAN, 32, NULL, 1U << 4, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_ClipYOrigin, { "ClipYOrigin", "x11.render.ChangePicture.value_mask.ClipYOrigin", FT_BOOLEAN, 32, NULL, 1U << 5, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_ClipMask, { "ClipMask", "x11.render.ChangePicture.value_mask.ClipMask", FT_BOOLEAN, 32, NULL, 1U << 6, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_GraphicsExposure, { "GraphicsExposure", "x11.render.ChangePicture.value_mask.GraphicsExposure", FT_BOOLEAN, 32, NULL, 1U << 7, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_SubwindowMode, { "SubwindowMode", "x11.render.ChangePicture.value_mask.SubwindowMode", FT_BOOLEAN, 32, NULL, 1U << 8, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_PolyEdge, { "PolyEdge", "x11.render.ChangePicture.value_mask.PolyEdge", FT_BOOLEAN, 32, NULL, 1U << 9, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_PolyMode, { "PolyMode", "x11.render.ChangePicture.value_mask.PolyMode", FT_BOOLEAN, 32, NULL, 1U << 10, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_Dither, { "Dither", "x11.render.ChangePicture.value_mask.Dither", FT_BOOLEAN, 32, NULL, 1U << 11, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask_mask_ComponentAlpha, { "ComponentAlpha", "x11.render.ChangePicture.value_mask.ComponentAlpha", FT_BOOLEAN, 32, NULL, 1U << 12, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_value_mask, { "value_mask", "x11.render.ChangePicture.value_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_Repeat_repeat, { "repeat", "x11.render.ChangePicture.Repeat.repeat", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_render_Repeat), 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_AlphaMap_alphamap, { "alphamap", "x11.render.ChangePicture.AlphaMap.alphamap", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_AlphaXOrigin_alphaxorigin, { "alphaxorigin", "x11.render.ChangePicture.AlphaXOrigin.alphaxorigin", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_AlphaYOrigin_alphayorigin, { "alphayorigin", "x11.render.ChangePicture.AlphaYOrigin.alphayorigin", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_ClipXOrigin_clipxorigin, { "clipxorigin", "x11.render.ChangePicture.ClipXOrigin.clipxorigin", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_ClipYOrigin_clipyorigin, { "clipyorigin", "x11.render.ChangePicture.ClipYOrigin.clipyorigin", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_ClipMask_clipmask, { "clipmask", "x11.render.ChangePicture.ClipMask.clipmask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_GraphicsExposure_graphicsexposure, { "graphicsexposure", "x11.render.ChangePicture.GraphicsExposure.graphicsexposure", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_SubwindowMode_subwindowmode, { "subwindowmode", "x11.render.ChangePicture.SubwindowMode.subwindowmode", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_SubwindowMode), 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_PolyEdge_polyedge, { "polyedge", "x11.render.ChangePicture.PolyEdge.polyedge", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_render_PolyEdge), 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_PolyMode_polymode, { "polymode", "x11.render.ChangePicture.PolyMode.polymode", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_render_PolyMode), 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_Dither_dither, { "dither", "x11.render.ChangePicture.Dither.dither", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_render_ChangePicture_ComponentAlpha_componentalpha, { "componentalpha", "x11.render.ChangePicture.ComponentAlpha.componentalpha", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_SetPictureClipRectangles_picture, { "picture", "x11.render.SetPictureClipRectangles.picture", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_render_SetPictureClipRectangles_clip_x_origin, { "clip_x_origin", "x11.render.SetPictureClipRectangles.clip_x_origin", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_render_SetPictureClipRectangles_clip_y_origin, { "clip_y_origin", "x11.render.SetPictureClipRectangles.clip_y_origin", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -3379,6 +3459,87 @@ { &hf_x11_screensaver_SetAttributes_class, { "class", "x11.screensaver.SetAttributes.class", FT_UINT8, BASE_DEC, VALS(x11_enum_xproto_WindowClass), 0, NULL, HFILL }}, { &hf_x11_screensaver_SetAttributes_depth, { "depth", "x11.screensaver.SetAttributes.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_SetAttributes_visual, { "visual", "x11.screensaver.SetAttributes.visual", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_BackPixmap, { "BackPixmap", "x11.screensaver.SetAttributes.value_mask.BackPixmap", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_BackPixel, { "BackPixel", "x11.screensaver.SetAttributes.value_mask.BackPixel", FT_BOOLEAN, 32, NULL, 1U << 1, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_BorderPixmap, { "BorderPixmap", "x11.screensaver.SetAttributes.value_mask.BorderPixmap", FT_BOOLEAN, 32, NULL, 1U << 2, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_BorderPixel, { "BorderPixel", "x11.screensaver.SetAttributes.value_mask.BorderPixel", FT_BOOLEAN, 32, NULL, 1U << 3, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_BitGravity, { "BitGravity", "x11.screensaver.SetAttributes.value_mask.BitGravity", FT_BOOLEAN, 32, NULL, 1U << 4, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_WinGravity, { "WinGravity", "x11.screensaver.SetAttributes.value_mask.WinGravity", FT_BOOLEAN, 32, NULL, 1U << 5, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_BackingStore, { "BackingStore", "x11.screensaver.SetAttributes.value_mask.BackingStore", FT_BOOLEAN, 32, NULL, 1U << 6, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_BackingPlanes, { "BackingPlanes", "x11.screensaver.SetAttributes.value_mask.BackingPlanes", FT_BOOLEAN, 32, NULL, 1U << 7, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_BackingPixel, { "BackingPixel", "x11.screensaver.SetAttributes.value_mask.BackingPixel", FT_BOOLEAN, 32, NULL, 1U << 8, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_OverrideRedirect, { "OverrideRedirect", "x11.screensaver.SetAttributes.value_mask.OverrideRedirect", FT_BOOLEAN, 32, NULL, 1U << 9, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_SaveUnder, { "SaveUnder", "x11.screensaver.SetAttributes.value_mask.SaveUnder", FT_BOOLEAN, 32, NULL, 1U << 10, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_EventMask, { "EventMask", "x11.screensaver.SetAttributes.value_mask.EventMask", FT_BOOLEAN, 32, NULL, 1U << 11, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_DontPropagate, { "DontPropagate", "x11.screensaver.SetAttributes.value_mask.DontPropagate", FT_BOOLEAN, 32, NULL, 1U << 12, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_Colormap, { "Colormap", "x11.screensaver.SetAttributes.value_mask.Colormap", FT_BOOLEAN, 32, NULL, 1U << 13, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask_mask_Cursor, { "Cursor", "x11.screensaver.SetAttributes.value_mask.Cursor", FT_BOOLEAN, 32, NULL, 1U << 14, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_value_mask, { "value_mask", "x11.screensaver.SetAttributes.value_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_BackPixmap_background_pixmap, { "background_pixmap", "x11.screensaver.SetAttributes.BackPixmap.background_pixmap", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_BackPixmap), 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_BackPixel_background_pixel, { "background_pixel", "x11.screensaver.SetAttributes.BackPixel.background_pixel", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_BorderPixmap_border_pixmap, { "border_pixmap", "x11.screensaver.SetAttributes.BorderPixmap.border_pixmap", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_Pixmap), 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_BorderPixel_border_pixel, { "border_pixel", "x11.screensaver.SetAttributes.BorderPixel.border_pixel", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_BitGravity_bit_gravity, { "bit_gravity", "x11.screensaver.SetAttributes.BitGravity.bit_gravity", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_Gravity), 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_WinGravity_win_gravity, { "win_gravity", "x11.screensaver.SetAttributes.WinGravity.win_gravity", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_Gravity), 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_BackingStore_backing_store, { "backing_store", "x11.screensaver.SetAttributes.BackingStore.backing_store", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_BackingStore), 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_BackingPlanes_backing_planes, { "backing_planes", "x11.screensaver.SetAttributes.BackingPlanes.backing_planes", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_BackingPixel_backing_pixel, { "backing_pixel", "x11.screensaver.SetAttributes.BackingPixel.backing_pixel", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_OverrideRedirect_override_redirect, { "override_redirect", "x11.screensaver.SetAttributes.OverrideRedirect.override_redirect", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_SaveUnder_save_under, { "save_under", "x11.screensaver.SetAttributes.SaveUnder.save_under", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_KeyPress, { "KeyPress", "x11.screensaver.SetAttributes.EventMask.event_mask.KeyPress", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_KeyRelease, { "KeyRelease", "x11.screensaver.SetAttributes.EventMask.event_mask.KeyRelease", FT_BOOLEAN, 32, NULL, 1U << 1, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ButtonPress, { "ButtonPress", "x11.screensaver.SetAttributes.EventMask.event_mask.ButtonPress", FT_BOOLEAN, 32, NULL, 1U << 2, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ButtonRelease, { "ButtonRelease", "x11.screensaver.SetAttributes.EventMask.event_mask.ButtonRelease", FT_BOOLEAN, 32, NULL, 1U << 3, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_EnterWindow, { "EnterWindow", "x11.screensaver.SetAttributes.EventMask.event_mask.EnterWindow", FT_BOOLEAN, 32, NULL, 1U << 4, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_LeaveWindow, { "LeaveWindow", "x11.screensaver.SetAttributes.EventMask.event_mask.LeaveWindow", FT_BOOLEAN, 32, NULL, 1U << 5, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_PointerMotion, { "PointerMotion", "x11.screensaver.SetAttributes.EventMask.event_mask.PointerMotion", FT_BOOLEAN, 32, NULL, 1U << 6, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_PointerMotionHint, { "PointerMotionHint", "x11.screensaver.SetAttributes.EventMask.event_mask.PointerMotionHint", FT_BOOLEAN, 32, NULL, 1U << 7, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button1Motion, { "Button1Motion", "x11.screensaver.SetAttributes.EventMask.event_mask.Button1Motion", FT_BOOLEAN, 32, NULL, 1U << 8, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button2Motion, { "Button2Motion", "x11.screensaver.SetAttributes.EventMask.event_mask.Button2Motion", FT_BOOLEAN, 32, NULL, 1U << 9, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button3Motion, { "Button3Motion", "x11.screensaver.SetAttributes.EventMask.event_mask.Button3Motion", FT_BOOLEAN, 32, NULL, 1U << 10, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button4Motion, { "Button4Motion", "x11.screensaver.SetAttributes.EventMask.event_mask.Button4Motion", FT_BOOLEAN, 32, NULL, 1U << 11, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Button5Motion, { "Button5Motion", "x11.screensaver.SetAttributes.EventMask.event_mask.Button5Motion", FT_BOOLEAN, 32, NULL, 1U << 12, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ButtonMotion, { "ButtonMotion", "x11.screensaver.SetAttributes.EventMask.event_mask.ButtonMotion", FT_BOOLEAN, 32, NULL, 1U << 13, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_KeymapState, { "KeymapState", "x11.screensaver.SetAttributes.EventMask.event_mask.KeymapState", FT_BOOLEAN, 32, NULL, 1U << 14, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_Exposure, { "Exposure", "x11.screensaver.SetAttributes.EventMask.event_mask.Exposure", FT_BOOLEAN, 32, NULL, 1U << 15, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_VisibilityChange, { "VisibilityChange", "x11.screensaver.SetAttributes.EventMask.event_mask.VisibilityChange", FT_BOOLEAN, 32, NULL, 1U << 16, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_StructureNotify, { "StructureNotify", "x11.screensaver.SetAttributes.EventMask.event_mask.StructureNotify", FT_BOOLEAN, 32, NULL, 1U << 17, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ResizeRedirect, { "ResizeRedirect", "x11.screensaver.SetAttributes.EventMask.event_mask.ResizeRedirect", FT_BOOLEAN, 32, NULL, 1U << 18, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_SubstructureNotify, { "SubstructureNotify", "x11.screensaver.SetAttributes.EventMask.event_mask.SubstructureNotify", FT_BOOLEAN, 32, NULL, 1U << 19, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_SubstructureRedirect, { "SubstructureRedirect", "x11.screensaver.SetAttributes.EventMask.event_mask.SubstructureRedirect", FT_BOOLEAN, 32, NULL, 1U << 20, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_FocusChange, { "FocusChange", "x11.screensaver.SetAttributes.EventMask.event_mask.FocusChange", FT_BOOLEAN, 32, NULL, 1U << 21, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_PropertyChange, { "PropertyChange", "x11.screensaver.SetAttributes.EventMask.event_mask.PropertyChange", FT_BOOLEAN, 32, NULL, 1U << 22, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_ColorMapChange, { "ColorMapChange", "x11.screensaver.SetAttributes.EventMask.event_mask.ColorMapChange", FT_BOOLEAN, 32, NULL, 1U << 23, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask_mask_OwnerGrabButton, { "OwnerGrabButton", "x11.screensaver.SetAttributes.EventMask.event_mask.OwnerGrabButton", FT_BOOLEAN, 32, NULL, 1U << 24, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_EventMask_event_mask, { "event_mask", "x11.screensaver.SetAttributes.EventMask.event_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_KeyPress, { "KeyPress", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.KeyPress", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_KeyRelease, { "KeyRelease", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.KeyRelease", FT_BOOLEAN, 32, NULL, 1U << 1, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ButtonPress, { "ButtonPress", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.ButtonPress", FT_BOOLEAN, 32, NULL, 1U << 2, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ButtonRelease, { "ButtonRelease", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.ButtonRelease", FT_BOOLEAN, 32, NULL, 1U << 3, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_EnterWindow, { "EnterWindow", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.EnterWindow", FT_BOOLEAN, 32, NULL, 1U << 4, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_LeaveWindow, { "LeaveWindow", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.LeaveWindow", FT_BOOLEAN, 32, NULL, 1U << 5, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_PointerMotion, { "PointerMotion", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.PointerMotion", FT_BOOLEAN, 32, NULL, 1U << 6, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_PointerMotionHint, { "PointerMotionHint", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.PointerMotionHint", FT_BOOLEAN, 32, NULL, 1U << 7, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button1Motion, { "Button1Motion", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.Button1Motion", FT_BOOLEAN, 32, NULL, 1U << 8, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button2Motion, { "Button2Motion", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.Button2Motion", FT_BOOLEAN, 32, NULL, 1U << 9, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button3Motion, { "Button3Motion", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.Button3Motion", FT_BOOLEAN, 32, NULL, 1U << 10, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button4Motion, { "Button4Motion", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.Button4Motion", FT_BOOLEAN, 32, NULL, 1U << 11, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Button5Motion, { "Button5Motion", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.Button5Motion", FT_BOOLEAN, 32, NULL, 1U << 12, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ButtonMotion, { "ButtonMotion", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.ButtonMotion", FT_BOOLEAN, 32, NULL, 1U << 13, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_KeymapState, { "KeymapState", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.KeymapState", FT_BOOLEAN, 32, NULL, 1U << 14, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_Exposure, { "Exposure", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.Exposure", FT_BOOLEAN, 32, NULL, 1U << 15, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_VisibilityChange, { "VisibilityChange", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.VisibilityChange", FT_BOOLEAN, 32, NULL, 1U << 16, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_StructureNotify, { "StructureNotify", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.StructureNotify", FT_BOOLEAN, 32, NULL, 1U << 17, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ResizeRedirect, { "ResizeRedirect", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.ResizeRedirect", FT_BOOLEAN, 32, NULL, 1U << 18, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_SubstructureNotify, { "SubstructureNotify", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.SubstructureNotify", FT_BOOLEAN, 32, NULL, 1U << 19, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_SubstructureRedirect, { "SubstructureRedirect", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.SubstructureRedirect", FT_BOOLEAN, 32, NULL, 1U << 20, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_FocusChange, { "FocusChange", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.FocusChange", FT_BOOLEAN, 32, NULL, 1U << 21, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_PropertyChange, { "PropertyChange", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.PropertyChange", FT_BOOLEAN, 32, NULL, 1U << 22, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_ColorMapChange, { "ColorMapChange", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.ColorMapChange", FT_BOOLEAN, 32, NULL, 1U << 23, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask_mask_OwnerGrabButton, { "OwnerGrabButton", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask.OwnerGrabButton", FT_BOOLEAN, 32, NULL, 1U << 24, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_DontPropagate_do_not_propogate_mask, { "do_not_propogate_mask", "x11.screensaver.SetAttributes.DontPropagate.do_not_propogate_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_Colormap_colormap, { "colormap", "x11.screensaver.SetAttributes.Colormap.colormap", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_Colormap), 0, NULL, HFILL }}, +{ &hf_x11_screensaver_SetAttributes_Cursor_cursor, { "cursor", "x11.screensaver.SetAttributes.Cursor.cursor", FT_UINT32, BASE_HEX, VALS(x11_enum_xproto_Cursor), 0, NULL, HFILL }}, { &hf_x11_screensaver_UnsetAttributes_drawable, { "drawable", "x11.screensaver.UnsetAttributes.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_Suspend_suspend, { "suspend", "x11.screensaver.Suspend.suspend", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_screensaver_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(screensaver_extension_minor), 0, "minor opcode", HFILL }}, @@ -3455,7 +3616,7 @@ { &hf_x11_shm_PutImage_dst_y, { "dst_y", "x11.shm.PutImage.dst_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_PutImage_depth, { "depth", "x11.shm.PutImage.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_PutImage_format, { "format", "x11.shm.PutImage.format", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_shm_PutImage_send_event, { "send_event", "x11.shm.PutImage.send_event", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_shm_PutImage_send_event, { "send_event", "x11.shm.PutImage.send_event", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_PutImage_shmseg, { "shmseg", "x11.shm.PutImage.shmseg", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_PutImage_offset, { "offset", "x11.shm.PutImage.offset", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_shm_GetImage_drawable, { "drawable", "x11.shm.GetImage.drawable", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -4026,9 +4187,9 @@ { &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_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 }}, { &hf_x11_xfixes_GetCursorImageAndName_reply_cursor_image_item, { "cursor_image", "x11.xfixes.GetCursorImageAndName.reply.cursor_image", FT_UINT32, 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_ChangeCursor_source, { "source", "x11.xfixes.ChangeCursor.source", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_ChangeCursor_destination, { "destination", "x11.xfixes.ChangeCursor.destination", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xfixes_ChangeCursorByName_src, { "src", "x11.xfixes.ChangeCursorByName.src", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -4091,6 +4252,7 @@ { &hf_x11_struct_xinput_FP3232_frac, { "frac", "x11.struct.xinput_FP3232.frac", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetExtensionVersion_name_len, { "name_len", "x11.xinput.GetExtensionVersion.name_len", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetExtensionVersion_name, { "name", "x11.xinput.GetExtensionVersion.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetExtensionVersion_reply_xi_reply_type, { "xi_reply_type", "x11.xinput.GetExtensionVersion.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetExtensionVersion_reply_server_major, { "server_major", "x11.xinput.GetExtensionVersion.reply.server_major", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetExtensionVersion_reply_server_minor, { "server_minor", "x11.xinput.GetExtensionVersion.reply.server_minor", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetExtensionVersion_reply_present, { "present", "x11.xinput.GetExtensionVersion.reply.present", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -4099,25 +4261,47 @@ { &hf_x11_struct_xinput_DeviceInfo_device_id, { "device_id", "x11.struct.xinput_DeviceInfo.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_DeviceInfo_num_class_info, { "num_class_info", "x11.struct.xinput_DeviceInfo.num_class_info", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_DeviceInfo_device_use, { "device_use", "x11.struct.xinput_DeviceInfo.device_use", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_DeviceUse), 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_AxisInfo, { "xinput_AxisInfo", "x11.struct.xinput_AxisInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_AxisInfo_resolution, { "resolution", "x11.struct.xinput_AxisInfo.resolution", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_AxisInfo_minimum, { "minimum", "x11.struct.xinput_AxisInfo.minimum", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_AxisInfo_maximum, { "maximum", "x11.struct.xinput_AxisInfo.maximum", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputInfo, { "xinput_InputInfo", "x11.struct.xinput_InputInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputInfo_class_id, { "class_id", "x11.struct.xinput_InputInfo.class_id", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_InputClass), 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputInfo_len, { "len", "x11.struct.xinput_InputInfo.len", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputInfo_Key_min_keycode, { "min_keycode", "x11.struct.xinput_InputInfo.Key.min_keycode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputInfo_Key_max_keycode, { "max_keycode", "x11.struct.xinput_InputInfo.Key.max_keycode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputInfo_Key_num_keys, { "num_keys", "x11.struct.xinput_InputInfo.Key.num_keys", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputInfo_Button_num_buttons, { "num_buttons", "x11.struct.xinput_InputInfo.Button.num_buttons", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputInfo_Valuator_axes_len, { "axes_len", "x11.struct.xinput_InputInfo.Valuator.axes_len", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputInfo_Valuator_mode, { "mode", "x11.struct.xinput_InputInfo.Valuator.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_ValuatorMode), 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputInfo_Valuator_motion_size, { "motion_size", "x11.struct.xinput_InputInfo.Valuator.motion_size", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputInfo_Valuator_axes, { "axes", "x11.struct.xinput_InputInfo.Valuator.axes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputInfo_Valuator_axes_item, { "axes", "x11.struct.xinput_InputInfo.Valuator.axes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ListInputDevices_reply_xi_reply_type, { "xi_reply_type", "x11.xinput.ListInputDevices.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 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_xinput_ListInputDevices_reply_infos, { "infos", "x11.xinput.ListInputDevices.reply.infos", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ListInputDevices_reply_names, { "names", "x11.xinput.ListInputDevices.reply.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_InputClassInfo, { "xinput_InputClassInfo", "x11.struct.xinput_InputClassInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_InputClassInfo_class_id, { "class_id", "x11.struct.xinput_InputClassInfo.class_id", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_InputClass), 0, NULL, HFILL }}, { &hf_x11_struct_xinput_InputClassInfo_event_type_base, { "event_type_base", "x11.struct.xinput_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_xi_reply_type, { "xi_reply_type", "x11.xinput.OpenDevice.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_OpenDevice_reply_num_classes, { "num_classes", "x11.xinput.OpenDevice.reply.num_classes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_OpenDevice_reply_class_info, { "class_info", "x11.xinput.OpenDevice.reply.class_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_OpenDevice_reply_class_info_item, { "class_info", "x11.xinput.OpenDevice.reply.class_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_CloseDevice_device_id, { "device_id", "x11.xinput.CloseDevice.device_id", FT_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_xinput_ValuatorMode), 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceMode_reply_xi_reply_type, { "xi_reply_type", "x11.xinput.SetDeviceMode.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 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 }}, { &hf_x11_xinput_SelectExtensionEvent_classes_item, { "classes", "x11.xinput.SelectExtensionEvent.classes", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetSelectedExtensionEvents_window, { "window", "x11.xinput.GetSelectedExtensionEvents.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetSelectedExtensionEvents_reply_xi_reply_type, { "xi_reply_type", "x11.xinput.GetSelectedExtensionEvents.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetSelectedExtensionEvents_reply_num_this_classes, { "num_this_classes", "x11.xinput.GetSelectedExtensionEvents.reply.num_this_classes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetSelectedExtensionEvents_reply_num_all_classes, { "num_all_classes", "x11.xinput.GetSelectedExtensionEvents.reply.num_all_classes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetSelectedExtensionEvents_reply_this_classes, { "this_classes", "x11.xinput.GetSelectedExtensionEvents.reply.this_classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -4130,20 +4314,29 @@ { &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 }}, +{ &hf_x11_xinput_GetDeviceDontPropagateList_reply_xi_reply_type, { "xi_reply_type", "x11.xinput.GetDeviceDontPropagateList.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceDontPropagateList_reply_num_classes, { "num_classes", "x11.xinput.GetDeviceDontPropagateList.reply.num_classes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &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_struct_xinput_DeviceTimeCoord, { "xinput_DeviceTimeCoord", "x11.struct.xinput_DeviceTimeCoord", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceTimeCoord_time, { "time", "x11.struct.xinput_DeviceTimeCoord.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceTimeCoord_axisvalues, { "axisvalues", "x11.struct.xinput_DeviceTimeCoord.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceTimeCoord_axisvalues_item, { "axisvalues", "x11.struct.xinput_DeviceTimeCoord.axisvalues", FT_INT32, BASE_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_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_xi_reply_type, { "xi_reply_type", "x11.xinput.GetDeviceMotionEvents.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceMotionEvents_reply_num_events, { "num_events", "x11.xinput.GetDeviceMotionEvents.reply.num_events", 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_xinput_ValuatorMode), 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceMotionEvents_reply_events, { "events", "x11.xinput.GetDeviceMotionEvents.reply.events", FT_NONE, BASE_NONE, NULL, 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_xi_reply_type, { "xi_reply_type", "x11.xinput.ChangeKeyboardDevice.reply.xi_reply_type", 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_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_xi_reply_type, { "xi_reply_type", "x11.xinput.ChangePointerDevice.reply.xi_reply_type", 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_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_xproto_Time), 0, NULL, HFILL }}, @@ -4154,6 +4347,7 @@ { &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_xi_reply_type, { "xi_reply_type", "x11.xinput.GrabDevice.reply.xi_reply_type", FT_UINT8, 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_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 }}, @@ -4169,7 +4363,7 @@ { &hf_x11_xinput_GrabDeviceKey_modifiers_mask_5, { "5", "x11.xinput.GrabDeviceKey.modifiers.5", FT_BOOLEAN, 16, NULL, 1U << 7, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceKey_modifiers_mask_Any, { "Any", "x11.xinput.GrabDeviceKey.modifiers.Any", FT_BOOLEAN, 16, NULL, 1U << 15, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceKey_modifiers, { "modifiers", "x11.xinput.GrabDeviceKey.modifiers", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_GrabDeviceKey_modifier_device, { "modifier_device", "x11.xinput.GrabDeviceKey.modifier_device", FT_UINT8, 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, VALS(x11_enum_xinput_ModifierDevice), 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_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 }}, @@ -4188,12 +4382,12 @@ { &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_5, { "5", "x11.xinput.UngrabDeviceKey.modifiers.5", FT_BOOLEAN, 16, NULL, 1U << 7, NULL, HFILL }}, { &hf_x11_xinput_UngrabDeviceKey_modifiers_mask_Any, { "Any", "x11.xinput.UngrabDeviceKey.modifiers.Any", FT_BOOLEAN, 16, NULL, 1U << 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_modifier_device, { "modifier_device", "x11.xinput.UngrabDeviceKey.modifier_device", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_ModifierDevice), 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 }}, -{ &hf_x11_xinput_GrabDeviceButton_modifier_device, { "modifier_device", "x11.xinput.GrabDeviceButton.modifier_device", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GrabDeviceButton_modifier_device, { "modifier_device", "x11.xinput.GrabDeviceButton.modifier_device", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_ModifierDevice), 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceButton_num_classes, { "num_classes", "x11.xinput.GrabDeviceButton.num_classes", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceButton_modifiers_mask_Shift, { "Shift", "x11.xinput.GrabDeviceButton.modifiers.Shift", FT_BOOLEAN, 16, NULL, 1U << 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceButton_modifiers_mask_Lock, { "Lock", "x11.xinput.GrabDeviceButton.modifiers.Lock", FT_BOOLEAN, 16, NULL, 1U << 1, NULL, HFILL }}, @@ -4208,7 +4402,7 @@ { &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_owner_events, { "owner_events", "x11.xinput.GrabDeviceButton.owner_events", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceButton_classes, { "classes", "x11.xinput.GrabDeviceButton.classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GrabDeviceButton_classes_item, { "classes", "x11.xinput.GrabDeviceButton.classes", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_UngrabDeviceButton_grab_window, { "grab_window", "x11.xinput.UngrabDeviceButton.grab_window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -4222,13 +4416,14 @@ { &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_5, { "5", "x11.xinput.UngrabDeviceButton.modifiers.5", FT_BOOLEAN, 16, NULL, 1U << 7, NULL, HFILL }}, { &hf_x11_xinput_UngrabDeviceButton_modifiers_mask_Any, { "Any", "x11.xinput.UngrabDeviceButton.modifiers.Any", FT_BOOLEAN, 16, NULL, 1U << 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_modifier_device, { "modifier_device", "x11.xinput.UngrabDeviceButton.modifier_device", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_ModifierDevice), 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_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_xi_reply_type, { "xi_reply_type", "x11.xinput.GetDeviceFocus.reply.xi_reply_type", 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_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_xproto_InputFocus), 0, NULL, HFILL }}, @@ -4240,15 +4435,65 @@ { &hf_x11_struct_xinput_FeedbackState_class_id, { "class_id", "x11.struct.xinput_FeedbackState.class_id", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_FeedbackClass), 0, NULL, HFILL }}, { &hf_x11_struct_xinput_FeedbackState_feedback_id, { "feedback_id", "x11.struct.xinput_FeedbackState.feedback_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_FeedbackState_len, { "len", "x11.struct.xinput_FeedbackState.len", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_xinput_FeedbackState_uninterpreted_data, { "uninterpreted_data", "x11.struct.xinput_FeedbackState.uninterpreted_data", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Keyboard_pitch, { "pitch", "x11.struct.xinput_FeedbackState.Keyboard.pitch", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Keyboard_duration, { "duration", "x11.struct.xinput_FeedbackState.Keyboard.duration", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Keyboard_led_mask, { "led_mask", "x11.struct.xinput_FeedbackState.Keyboard.led_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Keyboard_led_values, { "led_values", "x11.struct.xinput_FeedbackState.Keyboard.led_values", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Keyboard_global_auto_repeat, { "global_auto_repeat", "x11.struct.xinput_FeedbackState.Keyboard.global_auto_repeat", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Keyboard_click, { "click", "x11.struct.xinput_FeedbackState.Keyboard.click", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Keyboard_percent, { "percent", "x11.struct.xinput_FeedbackState.Keyboard.percent", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Keyboard_auto_repeats, { "auto_repeats", "x11.struct.xinput_FeedbackState.Keyboard.auto_repeats", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Pointer_accel_num, { "accel_num", "x11.struct.xinput_FeedbackState.Pointer.accel_num", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Pointer_accel_denom, { "accel_denom", "x11.struct.xinput_FeedbackState.Pointer.accel_denom", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Pointer_threshold, { "threshold", "x11.struct.xinput_FeedbackState.Pointer.threshold", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_String_max_symbols, { "max_symbols", "x11.struct.xinput_FeedbackState.String.max_symbols", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_String_num_keysyms, { "num_keysyms", "x11.struct.xinput_FeedbackState.String.num_keysyms", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_String_keysyms, { "keysyms", "x11.struct.xinput_FeedbackState.String.keysyms", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_String_keysyms_item, { "keysyms", "x11.struct.xinput_FeedbackState.String.keysyms", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Integer_resolution, { "resolution", "x11.struct.xinput_FeedbackState.Integer.resolution", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Integer_min_value, { "min_value", "x11.struct.xinput_FeedbackState.Integer.min_value", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Integer_max_value, { "max_value", "x11.struct.xinput_FeedbackState.Integer.max_value", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Led_led_mask, { "led_mask", "x11.struct.xinput_FeedbackState.Led.led_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Led_led_values, { "led_values", "x11.struct.xinput_FeedbackState.Led.led_values", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Bell_percent, { "percent", "x11.struct.xinput_FeedbackState.Bell.percent", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Bell_pitch, { "pitch", "x11.struct.xinput_FeedbackState.Bell.pitch", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackState_Bell_duration, { "duration", "x11.struct.xinput_FeedbackState.Bell.duration", FT_UINT16, 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_xi_reply_type, { "xi_reply_type", "x11.xinput.GetFeedbackControl.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetFeedbackControl_reply_num_feedbacks, { "num_feedbacks", "x11.xinput.GetFeedbackControl.reply.num_feedbacks", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetFeedbackControl_reply_feedbacks, { "feedbacks", "x11.xinput.GetFeedbackControl.reply.feedbacks", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_FeedbackCtl, { "xinput_FeedbackCtl", "x11.struct.xinput_FeedbackCtl", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_FeedbackCtl_class_id, { "class_id", "x11.struct.xinput_FeedbackCtl.class_id", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_FeedbackClass), 0, NULL, HFILL }}, { &hf_x11_struct_xinput_FeedbackCtl_feedback_id, { "feedback_id", "x11.struct.xinput_FeedbackCtl.feedback_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_FeedbackCtl_len, { "len", "x11.struct.xinput_FeedbackCtl.len", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_xinput_FeedbackCtl_uninterpreted_data, { "uninterpreted_data", "x11.struct.xinput_FeedbackCtl.uninterpreted_data", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Keyboard_key, { "key", "x11.struct.xinput_FeedbackCtl.Keyboard.key", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Keyboard_auto_repeat_mode, { "auto_repeat_mode", "x11.struct.xinput_FeedbackCtl.Keyboard.auto_repeat_mode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Keyboard_key_click_percent, { "key_click_percent", "x11.struct.xinput_FeedbackCtl.Keyboard.key_click_percent", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Keyboard_bell_percent, { "bell_percent", "x11.struct.xinput_FeedbackCtl.Keyboard.bell_percent", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Keyboard_bell_pitch, { "bell_pitch", "x11.struct.xinput_FeedbackCtl.Keyboard.bell_pitch", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Keyboard_bell_duration, { "bell_duration", "x11.struct.xinput_FeedbackCtl.Keyboard.bell_duration", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Keyboard_led_mask, { "led_mask", "x11.struct.xinput_FeedbackCtl.Keyboard.led_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Keyboard_led_values, { "led_values", "x11.struct.xinput_FeedbackCtl.Keyboard.led_values", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Pointer_num, { "num", "x11.struct.xinput_FeedbackCtl.Pointer.num", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Pointer_denom, { "denom", "x11.struct.xinput_FeedbackCtl.Pointer.denom", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Pointer_threshold, { "threshold", "x11.struct.xinput_FeedbackCtl.Pointer.threshold", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_String_num_keysyms, { "num_keysyms", "x11.struct.xinput_FeedbackCtl.String.num_keysyms", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_String_keysyms, { "keysyms", "x11.struct.xinput_FeedbackCtl.String.keysyms", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_String_keysyms_item, { "keysyms", "x11.struct.xinput_FeedbackCtl.String.keysyms", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Integer_int_to_display, { "int_to_display", "x11.struct.xinput_FeedbackCtl.Integer.int_to_display", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Led_led_mask, { "led_mask", "x11.struct.xinput_FeedbackCtl.Led.led_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Led_led_values, { "led_values", "x11.struct.xinput_FeedbackCtl.Led.led_values", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Bell_percent, { "percent", "x11.struct.xinput_FeedbackCtl.Bell.percent", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Bell_pitch, { "pitch", "x11.struct.xinput_FeedbackCtl.Bell.pitch", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_FeedbackCtl_Bell_duration, { "duration", "x11.struct.xinput_FeedbackCtl.Bell.duration", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeFeedbackControl_mask_mask_AccelNum, { "AccelNum", "x11.xinput.ChangeFeedbackControl.mask.AccelNum", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeFeedbackControl_mask_mask_AccelDenom, { "AccelDenom", "x11.xinput.ChangeFeedbackControl.mask.AccelDenom", FT_BOOLEAN, 32, NULL, 1U << 1, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeFeedbackControl_mask_mask_Threshold, { "Threshold", "x11.xinput.ChangeFeedbackControl.mask.Threshold", FT_BOOLEAN, 32, NULL, 1U << 2, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeFeedbackControl_mask_mask_Duration, { "Duration", "x11.xinput.ChangeFeedbackControl.mask.Duration", FT_BOOLEAN, 32, NULL, 1U << 3, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeFeedbackControl_mask_mask_Led, { "Led", "x11.xinput.ChangeFeedbackControl.mask.Led", FT_BOOLEAN, 32, NULL, 1U << 4, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeFeedbackControl_mask_mask_LedMode, { "LedMode", "x11.xinput.ChangeFeedbackControl.mask.LedMode", FT_BOOLEAN, 32, NULL, 1U << 5, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeFeedbackControl_mask_mask_Key, { "Key", "x11.xinput.ChangeFeedbackControl.mask.Key", FT_BOOLEAN, 32, NULL, 1U << 6, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeFeedbackControl_mask_mask_AutoRepeatMode, { "AutoRepeatMode", "x11.xinput.ChangeFeedbackControl.mask.AutoRepeatMode", FT_BOOLEAN, 32, NULL, 1U << 7, NULL, HFILL }}, { &hf_x11_xinput_ChangeFeedbackControl_mask, { "mask", "x11.xinput.ChangeFeedbackControl.mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeFeedbackControl_device_id, { "device_id", "x11.xinput.ChangeFeedbackControl.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeFeedbackControl_feedback_id, { "feedback_id", "x11.xinput.ChangeFeedbackControl.feedback_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -4256,6 +4501,7 @@ { &hf_x11_xinput_GetDeviceKeyMapping_device_id, { "device_id", "x11.xinput.GetDeviceKeyMapping.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceKeyMapping_first_keycode, { "first_keycode", "x11.xinput.GetDeviceKeyMapping.first_keycode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceKeyMapping_count, { "count", "x11.xinput.GetDeviceKeyMapping.count", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceKeyMapping_reply_xi_reply_type, { "xi_reply_type", "x11.xinput.GetDeviceKeyMapping.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceKeyMapping_reply_keysyms_per_keycode, { "keysyms_per_keycode", "x11.xinput.GetDeviceKeyMapping.reply.keysyms_per_keycode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceKeyMapping_reply_keysyms, { "keysyms", "x11.xinput.GetDeviceKeyMapping.reply.keysyms", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceKeyMapping_reply_keysyms_item, { "keysyms", "x11.xinput.GetDeviceKeyMapping.reply.keysyms", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -4266,25 +4512,38 @@ { &hf_x11_xinput_ChangeDeviceKeyMapping_keysyms, { "keysyms", "x11.xinput.ChangeDeviceKeyMapping.keysyms", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceKeyMapping_keysyms_item, { "keysyms", "x11.xinput.ChangeDeviceKeyMapping.keysyms", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceModifierMapping_device_id, { "device_id", "x11.xinput.GetDeviceModifierMapping.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceModifierMapping_reply_xi_reply_type, { "xi_reply_type", "x11.xinput.GetDeviceModifierMapping.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceModifierMapping_reply_keycodes_per_modifier, { "keycodes_per_modifier", "x11.xinput.GetDeviceModifierMapping.reply.keycodes_per_modifier", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceModifierMapping_reply_keymaps, { "keymaps", "x11.xinput.GetDeviceModifierMapping.reply.keymaps", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SetDeviceModifierMapping_device_id, { "device_id", "x11.xinput.SetDeviceModifierMapping.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SetDeviceModifierMapping_keycodes_per_modifier, { "keycodes_per_modifier", "x11.xinput.SetDeviceModifierMapping.keycodes_per_modifier", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SetDeviceModifierMapping_keymaps, { "keymaps", "x11.xinput.SetDeviceModifierMapping.keymaps", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_SetDeviceModifierMapping_reply_xi_reply_type, { "xi_reply_type", "x11.xinput.SetDeviceModifierMapping.reply.xi_reply_type", 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_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_xi_reply_type, { "xi_reply_type", "x11.xinput.GetDeviceButtonMapping.reply.xi_reply_type", 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_xi_reply_type, { "xi_reply_type", "x11.xinput.SetDeviceButtonMapping.reply.xi_reply_type", 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_xproto_MappingStatus), 0, NULL, HFILL }}, { &hf_x11_struct_xinput_InputState, { "xinput_InputState", "x11.struct.xinput_InputState", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_InputState_class_id, { "class_id", "x11.struct.xinput_InputState.class_id", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_InputClass), 0, NULL, HFILL }}, { &hf_x11_struct_xinput_InputState_len, { "len", "x11.struct.xinput_InputState.len", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_xinput_InputState_num_items, { "num_items", "x11.struct.xinput_InputState.num_items", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_xinput_InputState_uninterpreted_data, { "uninterpreted_data", "x11.struct.xinput_InputState.uninterpreted_data", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputState_Key_num_keys, { "num_keys", "x11.struct.xinput_InputState.Key.num_keys", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputState_Key_keys, { "keys", "x11.struct.xinput_InputState.Key.keys", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputState_Button_num_buttons, { "num_buttons", "x11.struct.xinput_InputState.Button.num_buttons", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputState_Button_buttons, { "buttons", "x11.struct.xinput_InputState.Button.buttons", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputState_Valuator_num_valuators, { "num_valuators", "x11.struct.xinput_InputState.Valuator.num_valuators", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputState_Valuator_mode_mask_DeviceModeAbsolute, { "DeviceModeAbsolute", "x11.struct.xinput_InputState.Valuator.mode.DeviceModeAbsolute", FT_BOOLEAN, 8, NULL, 1U << 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputState_Valuator_mode_mask_OutOfProximity, { "OutOfProximity", "x11.struct.xinput_InputState.Valuator.mode.OutOfProximity", FT_BOOLEAN, 8, NULL, 1U << 1, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputState_Valuator_mode, { "mode", "x11.struct.xinput_InputState.Valuator.mode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputState_Valuator_valuators, { "valuators", "x11.struct.xinput_InputState.Valuator.valuators", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_InputState_Valuator_valuators_item, { "valuators", "x11.struct.xinput_InputState.Valuator.valuators", FT_INT32, BASE_DEC, NULL, 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_xi_reply_type, { "xi_reply_type", "x11.xinput.QueryDeviceState.reply.xi_reply_type", 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_QueryDeviceState_reply_classes, { "classes", "x11.xinput.QueryDeviceState.reply.classes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_SendExtensionEvent_destination, { "destination", "x11.xinput.SendExtensionEvent.destination", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -4304,24 +4563,70 @@ { &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_xi_reply_type, { "xi_reply_type", "x11.xinput.SetDeviceValuators.reply.xi_reply_type", FT_UINT8, BASE_HEX_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_xproto_GrabStatus), 0, NULL, HFILL }}, { &hf_x11_struct_xinput_DeviceState, { "xinput_DeviceState", "x11.struct.xinput_DeviceState", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_DeviceState_control_id, { "control_id", "x11.struct.xinput_DeviceState.control_id", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_DeviceControl), 0, NULL, HFILL }}, { &hf_x11_struct_xinput_DeviceState_len, { "len", "x11.struct.xinput_DeviceState.len", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_xinput_DeviceState_uninterpreted_data, { "uninterpreted_data", "x11.struct.xinput_DeviceState.uninterpreted_data", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_resolution_num_valuators, { "num_valuators", "x11.struct.xinput_DeviceState.resolution.num_valuators", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_resolution_resolution_values, { "resolution_values", "x11.struct.xinput_DeviceState.resolution.resolution_values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_resolution_resolution_values_item, { "resolution_values", "x11.struct.xinput_DeviceState.resolution.resolution_values", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_resolution_resolution_min, { "resolution_min", "x11.struct.xinput_DeviceState.resolution.resolution_min", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_resolution_resolution_min_item, { "resolution_min", "x11.struct.xinput_DeviceState.resolution.resolution_min", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_resolution_resolution_max, { "resolution_max", "x11.struct.xinput_DeviceState.resolution.resolution_max", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_resolution_resolution_max_item, { "resolution_max", "x11.struct.xinput_DeviceState.resolution.resolution_max", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_calib_min_x, { "min_x", "x11.struct.xinput_DeviceState.abs_calib.min_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_calib_max_x, { "max_x", "x11.struct.xinput_DeviceState.abs_calib.max_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_calib_min_y, { "min_y", "x11.struct.xinput_DeviceState.abs_calib.min_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_calib_max_y, { "max_y", "x11.struct.xinput_DeviceState.abs_calib.max_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_calib_flip_x, { "flip_x", "x11.struct.xinput_DeviceState.abs_calib.flip_x", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_calib_flip_y, { "flip_y", "x11.struct.xinput_DeviceState.abs_calib.flip_y", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_calib_rotation, { "rotation", "x11.struct.xinput_DeviceState.abs_calib.rotation", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_calib_button_threshold, { "button_threshold", "x11.struct.xinput_DeviceState.abs_calib.button_threshold", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_core_status, { "status", "x11.struct.xinput_DeviceState.core.status", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_core_iscore, { "iscore", "x11.struct.xinput_DeviceState.core.iscore", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_enable_enable, { "enable", "x11.struct.xinput_DeviceState.enable.enable", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_area_offset_x, { "offset_x", "x11.struct.xinput_DeviceState.abs_area.offset_x", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_area_offset_y, { "offset_y", "x11.struct.xinput_DeviceState.abs_area.offset_y", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_area_width, { "width", "x11.struct.xinput_DeviceState.abs_area.width", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_area_height, { "height", "x11.struct.xinput_DeviceState.abs_area.height", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_area_screen, { "screen", "x11.struct.xinput_DeviceState.abs_area.screen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceState_abs_area_following, { "following", "x11.struct.xinput_DeviceState.abs_area.following", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceControl_control_id, { "control_id", "x11.xinput.GetDeviceControl.control_id", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_DeviceControl), 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_xi_reply_type, { "xi_reply_type", "x11.xinput.GetDeviceControl.reply.xi_reply_type", 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_xproto_GrabStatus), 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceControl_reply_control, { "control", "x11.xinput.GetDeviceControl.reply.control", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_DeviceCtl, { "xinput_DeviceCtl", "x11.struct.xinput_DeviceCtl", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_DeviceCtl_control_id, { "control_id", "x11.struct.xinput_DeviceCtl.control_id", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_DeviceControl), 0, NULL, HFILL }}, { &hf_x11_struct_xinput_DeviceCtl_len, { "len", "x11.struct.xinput_DeviceCtl.len", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_xinput_DeviceCtl_uninterpreted_data, { "uninterpreted_data", "x11.struct.xinput_DeviceCtl.uninterpreted_data", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_resolution_first_valuator, { "first_valuator", "x11.struct.xinput_DeviceCtl.resolution.first_valuator", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_resolution_num_valuators, { "num_valuators", "x11.struct.xinput_DeviceCtl.resolution.num_valuators", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_resolution_resolution_values, { "resolution_values", "x11.struct.xinput_DeviceCtl.resolution.resolution_values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_resolution_resolution_values_item, { "resolution_values", "x11.struct.xinput_DeviceCtl.resolution.resolution_values", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_calib_min_x, { "min_x", "x11.struct.xinput_DeviceCtl.abs_calib.min_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_calib_max_x, { "max_x", "x11.struct.xinput_DeviceCtl.abs_calib.max_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_calib_min_y, { "min_y", "x11.struct.xinput_DeviceCtl.abs_calib.min_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_calib_max_y, { "max_y", "x11.struct.xinput_DeviceCtl.abs_calib.max_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_calib_flip_x, { "flip_x", "x11.struct.xinput_DeviceCtl.abs_calib.flip_x", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_calib_flip_y, { "flip_y", "x11.struct.xinput_DeviceCtl.abs_calib.flip_y", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_calib_rotation, { "rotation", "x11.struct.xinput_DeviceCtl.abs_calib.rotation", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_calib_button_threshold, { "button_threshold", "x11.struct.xinput_DeviceCtl.abs_calib.button_threshold", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_core_status, { "status", "x11.struct.xinput_DeviceCtl.core.status", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_enable_enable, { "enable", "x11.struct.xinput_DeviceCtl.enable.enable", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_area_offset_x, { "offset_x", "x11.struct.xinput_DeviceCtl.abs_area.offset_x", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_area_offset_y, { "offset_y", "x11.struct.xinput_DeviceCtl.abs_area.offset_y", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_area_width, { "width", "x11.struct.xinput_DeviceCtl.abs_area.width", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_area_height, { "height", "x11.struct.xinput_DeviceCtl.abs_area.height", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_area_screen, { "screen", "x11.struct.xinput_DeviceCtl.abs_area.screen", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceCtl_abs_area_following, { "following", "x11.struct.xinput_DeviceCtl.abs_area.following", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceControl_control_id, { "control_id", "x11.xinput.ChangeDeviceControl.control_id", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_DeviceControl), 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceControl_device_id, { "device_id", "x11.xinput.ChangeDeviceControl.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceControl_control, { "control", "x11.xinput.ChangeDeviceControl.control", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeDeviceControl_reply_xi_reply_type, { "xi_reply_type", "x11.xinput.ChangeDeviceControl.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceControl_reply_status, { "status", "x11.xinput.ChangeDeviceControl.reply.status", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_GrabStatus), 0, NULL, HFILL }}, { &hf_x11_xinput_ListDeviceProperties_device_id, { "device_id", "x11.xinput.ListDeviceProperties.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ListDeviceProperties_reply_xi_reply_type, { "xi_reply_type", "x11.xinput.ListDeviceProperties.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ListDeviceProperties_reply_num_atoms, { "num_atoms", "x11.xinput.ListDeviceProperties.reply.num_atoms", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ListDeviceProperties_reply_atoms, { "atoms", "x11.xinput.ListDeviceProperties.reply.atoms", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ListDeviceProperties_reply_atoms_item, { "atoms", "x11.xinput.ListDeviceProperties.reply.atoms", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -4344,6 +4649,7 @@ { &hf_x11_xinput_GetDeviceProperty_len, { "len", "x11.xinput.GetDeviceProperty.len", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceProperty_device_id, { "device_id", "x11.xinput.GetDeviceProperty.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceProperty_delete, { "delete", "x11.xinput.GetDeviceProperty.delete", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_GetDeviceProperty_reply_xi_reply_type, { "xi_reply_type", "x11.xinput.GetDeviceProperty.reply.xi_reply_type", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceProperty_reply_type, { "type", "x11.xinput.GetDeviceProperty.reply.type", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceProperty_reply_bytes_after, { "bytes_after", "x11.xinput.GetDeviceProperty.reply.bytes_after", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_GetDeviceProperty_reply_num_items, { "num_items", "x11.xinput.GetDeviceProperty.reply.num_items", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -4372,7 +4678,7 @@ { &hf_x11_xinput_XIQueryPointer_reply_root_y, { "root_y", "x11.xinput.XIQueryPointer.reply.root_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_XIQueryPointer_reply_win_x, { "win_x", "x11.xinput.XIQueryPointer.reply.win_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_XIQueryPointer_reply_win_y, { "win_y", "x11.xinput.XIQueryPointer.reply.win_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_XIQueryPointer_reply_same_screen, { "same_screen", "x11.xinput.XIQueryPointer.reply.same_screen", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_XIQueryPointer_reply_same_screen, { "same_screen", "x11.xinput.XIQueryPointer.reply.same_screen", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_XIQueryPointer_reply_buttons_len, { "buttons_len", "x11.xinput.XIQueryPointer.reply.buttons_len", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_XIQueryPointer_reply_mods, { "mods", "x11.xinput.XIQueryPointer.reply.mods", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_XIQueryPointer_reply_group, { "group", "x11.xinput.XIQueryPointer.reply.group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -4393,7 +4699,17 @@ { &hf_x11_struct_xinput_HierarchyChange, { "xinput_HierarchyChange", "x11.struct.xinput_HierarchyChange", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_HierarchyChange_type, { "type", "x11.struct.xinput_HierarchyChange.type", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_HierarchyChangeType), 0, NULL, HFILL }}, { &hf_x11_struct_xinput_HierarchyChange_len, { "len", "x11.struct.xinput_HierarchyChange.len", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_xinput_HierarchyChange_uninterpreted_data, { "uninterpreted_data", "x11.struct.xinput_HierarchyChange.uninterpreted_data", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_HierarchyChange_AddMaster_name_len, { "name_len", "x11.struct.xinput_HierarchyChange.AddMaster.name_len", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_HierarchyChange_AddMaster_send_core, { "send_core", "x11.struct.xinput_HierarchyChange.AddMaster.send_core", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_HierarchyChange_AddMaster_enable, { "enable", "x11.struct.xinput_HierarchyChange.AddMaster.enable", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_HierarchyChange_AddMaster_name, { "name", "x11.struct.xinput_HierarchyChange.AddMaster.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_HierarchyChange_RemoveMaster_deviceid, { "deviceid", "x11.struct.xinput_HierarchyChange.RemoveMaster.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_HierarchyChange_RemoveMaster_return_mode, { "return_mode", "x11.struct.xinput_HierarchyChange.RemoveMaster.return_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_ChangeMode), 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_HierarchyChange_RemoveMaster_return_pointer, { "return_pointer", "x11.struct.xinput_HierarchyChange.RemoveMaster.return_pointer", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_HierarchyChange_RemoveMaster_return_keyboard, { "return_keyboard", "x11.struct.xinput_HierarchyChange.RemoveMaster.return_keyboard", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_HierarchyChange_AttachSlave_deviceid, { "deviceid", "x11.struct.xinput_HierarchyChange.AttachSlave.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_HierarchyChange_AttachSlave_master, { "master", "x11.struct.xinput_HierarchyChange.AttachSlave.master", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_HierarchyChange_DetachSlave_deviceid, { "deviceid", "x11.struct.xinput_HierarchyChange.DetachSlave.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, { &hf_x11_xinput_XIChangeHierarchy_num_changes, { "num_changes", "x11.xinput.XIChangeHierarchy.num_changes", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_XIChangeHierarchy_changes, { "changes", "x11.xinput.XIChangeHierarchy.changes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_XISetClientPointer_window, { "window", "x11.xinput.XISetClientPointer.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, @@ -4443,7 +4759,29 @@ { &hf_x11_struct_xinput_DeviceClass_type, { "type", "x11.struct.xinput_DeviceClass.type", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_DeviceClassType), 0, NULL, HFILL }}, { &hf_x11_struct_xinput_DeviceClass_len, { "len", "x11.struct.xinput_DeviceClass.len", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_DeviceClass_sourceid, { "sourceid", "x11.struct.xinput_DeviceClass.sourceid", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_struct_xinput_DeviceClass_uninterpreted_data, { "uninterpreted_data", "x11.struct.xinput_DeviceClass.uninterpreted_data", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Key_num_keys, { "num_keys", "x11.struct.xinput_DeviceClass.Key.num_keys", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Key_keys, { "keys", "x11.struct.xinput_DeviceClass.Key.keys", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Key_keys_item, { "keys", "x11.struct.xinput_DeviceClass.Key.keys", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Button_num_buttons, { "num_buttons", "x11.struct.xinput_DeviceClass.Button.num_buttons", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Button_state, { "state", "x11.struct.xinput_DeviceClass.Button.state", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Button_state_item, { "state", "x11.struct.xinput_DeviceClass.Button.state", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Button_labels, { "labels", "x11.struct.xinput_DeviceClass.Button.labels", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Button_labels_item, { "labels", "x11.struct.xinput_DeviceClass.Button.labels", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Valuator_number, { "number", "x11.struct.xinput_DeviceClass.Valuator.number", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Valuator_label, { "label", "x11.struct.xinput_DeviceClass.Valuator.label", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Valuator_min, { "min", "x11.struct.xinput_DeviceClass.Valuator.min", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Valuator_max, { "max", "x11.struct.xinput_DeviceClass.Valuator.max", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Valuator_value, { "value", "x11.struct.xinput_DeviceClass.Valuator.value", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Valuator_resolution, { "resolution", "x11.struct.xinput_DeviceClass.Valuator.resolution", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Valuator_mode, { "mode", "x11.struct.xinput_DeviceClass.Valuator.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_ValuatorMode), 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Scroll_number, { "number", "x11.struct.xinput_DeviceClass.Scroll.number", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Scroll_scroll_type, { "scroll_type", "x11.struct.xinput_DeviceClass.Scroll.scroll_type", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_ScrollType), 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Scroll_flags_mask_NoEmulation, { "NoEmulation", "x11.struct.xinput_DeviceClass.Scroll.flags.NoEmulation", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Scroll_flags_mask_Preferred, { "Preferred", "x11.struct.xinput_DeviceClass.Scroll.flags.Preferred", FT_BOOLEAN, 32, NULL, 1U << 1, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Scroll_flags, { "flags", "x11.struct.xinput_DeviceClass.Scroll.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Scroll_increment, { "increment", "x11.struct.xinput_DeviceClass.Scroll.increment", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Touch_mode, { "mode", "x11.struct.xinput_DeviceClass.Touch.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_TouchMode), 0, NULL, HFILL }}, +{ &hf_x11_struct_xinput_DeviceClass_Touch_num_touches, { "num_touches", "x11.struct.xinput_DeviceClass.Touch.num_touches", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_XIDeviceInfo, { "xinput_XIDeviceInfo", "x11.struct.xinput_XIDeviceInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_struct_xinput_XIDeviceInfo_deviceid, { "deviceid", "x11.struct.xinput_XIDeviceInfo.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, { &hf_x11_struct_xinput_XIDeviceInfo_type, { "type", "x11.struct.xinput_XIDeviceInfo.type", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_DeviceType), 0, NULL, HFILL }}, @@ -4558,6 +4896,19 @@ { &hf_x11_xinput_DeviceKeyPress_root_y, { "root_y", "x11.xinput.DeviceKeyPress.root_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_event_x, { "event_x", "x11.xinput.DeviceKeyPress.event_x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_event_y, { "event_y", "x11.xinput.DeviceKeyPress.event_y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Shift, { "Shift", "x11.xinput.DeviceKeyPress.state.Shift", FT_BOOLEAN, 16, NULL, 1U << 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Lock, { "Lock", "x11.xinput.DeviceKeyPress.state.Lock", FT_BOOLEAN, 16, NULL, 1U << 1, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Control, { "Control", "x11.xinput.DeviceKeyPress.state.Control", FT_BOOLEAN, 16, NULL, 1U << 2, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Mod1, { "Mod1", "x11.xinput.DeviceKeyPress.state.Mod1", FT_BOOLEAN, 16, NULL, 1U << 3, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Mod2, { "Mod2", "x11.xinput.DeviceKeyPress.state.Mod2", FT_BOOLEAN, 16, NULL, 1U << 4, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Mod3, { "Mod3", "x11.xinput.DeviceKeyPress.state.Mod3", FT_BOOLEAN, 16, NULL, 1U << 5, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Mod4, { "Mod4", "x11.xinput.DeviceKeyPress.state.Mod4", FT_BOOLEAN, 16, NULL, 1U << 6, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Mod5, { "Mod5", "x11.xinput.DeviceKeyPress.state.Mod5", FT_BOOLEAN, 16, NULL, 1U << 7, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Button1, { "Button1", "x11.xinput.DeviceKeyPress.state.Button1", FT_BOOLEAN, 16, NULL, 1U << 8, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Button2, { "Button2", "x11.xinput.DeviceKeyPress.state.Button2", FT_BOOLEAN, 16, NULL, 1U << 9, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Button3, { "Button3", "x11.xinput.DeviceKeyPress.state.Button3", FT_BOOLEAN, 16, NULL, 1U << 10, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Button4, { "Button4", "x11.xinput.DeviceKeyPress.state.Button4", FT_BOOLEAN, 16, NULL, 1U << 11, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceKeyPress_state_mask_Button5, { "Button5", "x11.xinput.DeviceKeyPress.state.Button5", FT_BOOLEAN, 16, NULL, 1U << 12, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_state, { "state", "x11.xinput.DeviceKeyPress.state", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_same_screen, { "same_screen", "x11.xinput.DeviceKeyPress.same_screen", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyPress_device_id, { "device_id", "x11.xinput.DeviceKeyPress.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -4571,19 +4922,24 @@ { &hf_x11_xinput_DeviceStateNotify_num_keys, { "num_keys", "x11.xinput.DeviceStateNotify.num_keys", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceStateNotify_num_buttons, { "num_buttons", "x11.xinput.DeviceStateNotify.num_buttons", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceStateNotify_num_valuators, { "num_valuators", "x11.xinput.DeviceStateNotify.num_valuators", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceStateNotify_classes_reported_mask_ReportingKeys, { "ReportingKeys", "x11.xinput.DeviceStateNotify.classes_reported.ReportingKeys", FT_BOOLEAN, 8, NULL, 1U << 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceStateNotify_classes_reported_mask_ReportingButtons, { "ReportingButtons", "x11.xinput.DeviceStateNotify.classes_reported.ReportingButtons", FT_BOOLEAN, 8, NULL, 1U << 1, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceStateNotify_classes_reported_mask_ReportingValuators, { "ReportingValuators", "x11.xinput.DeviceStateNotify.classes_reported.ReportingValuators", FT_BOOLEAN, 8, NULL, 1U << 2, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceStateNotify_classes_reported_mask_DeviceModeAbsolute, { "DeviceModeAbsolute", "x11.xinput.DeviceStateNotify.classes_reported.DeviceModeAbsolute", FT_BOOLEAN, 8, NULL, 1U << 6, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceStateNotify_classes_reported_mask_OutOfProximity, { "OutOfProximity", "x11.xinput.DeviceStateNotify.classes_reported.OutOfProximity", FT_BOOLEAN, 8, NULL, 1U << 7, NULL, HFILL }}, { &hf_x11_xinput_DeviceStateNotify_classes_reported, { "classes_reported", "x11.xinput.DeviceStateNotify.classes_reported", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceStateNotify_buttons, { "buttons", "x11.xinput.DeviceStateNotify.buttons", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceStateNotify_keys, { "keys", "x11.xinput.DeviceStateNotify.keys", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceStateNotify_valuators, { "valuators", "x11.xinput.DeviceStateNotify.valuators", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceStateNotify_valuators_item, { "valuators", "x11.xinput.DeviceStateNotify.valuators", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceMappingNotify_device_id, { "device_id", "x11.xinput.DeviceMappingNotify.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_DeviceMappingNotify_request, { "request", "x11.xinput.DeviceMappingNotify.request", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_DeviceMappingNotify_request, { "request", "x11.xinput.DeviceMappingNotify.request", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_Mapping), 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceMappingNotify_first_keycode, { "first_keycode", "x11.xinput.DeviceMappingNotify.first_keycode", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceMappingNotify_count, { "count", "x11.xinput.DeviceMappingNotify.count", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceMappingNotify_time, { "time", "x11.xinput.DeviceMappingNotify.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceNotify_device_id, { "device_id", "x11.xinput.ChangeDeviceNotify.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ChangeDeviceNotify_time, { "time", "x11.xinput.ChangeDeviceNotify.time", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_ChangeDeviceNotify_request, { "request", "x11.xinput.ChangeDeviceNotify.request", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ChangeDeviceNotify_request, { "request", "x11.xinput.ChangeDeviceNotify.request", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_ChangeDevice), 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyStateNotify_device_id, { "device_id", "x11.xinput.DeviceKeyStateNotify.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceKeyStateNotify_keys, { "keys", "x11.xinput.DeviceKeyStateNotify.keys", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_DeviceButtonStateNotify_device_id, { "device_id", "x11.xinput.DeviceButtonStateNotify.device_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -4623,6 +4979,8 @@ { &hf_x11_xinput_KeyPress_button_mask_item, { "button_mask", "x11.xinput.KeyPress.button_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_KeyPress_valuator_mask, { "valuator_mask", "x11.xinput.KeyPress.valuator_mask", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_KeyPress_valuator_mask_item, { "valuator_mask", "x11.xinput.KeyPress.valuator_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_KeyPress_axisvalues, { "axisvalues", "x11.xinput.KeyPress.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_KeyPress_axisvalues_item, { "axisvalues", "x11.xinput.KeyPress.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ButtonPress_deviceid, { "deviceid", "x11.xinput.ButtonPress.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, { &hf_x11_xinput_ButtonPress_time, { "time", "x11.xinput.ButtonPress.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_Time), 0, NULL, HFILL }}, { &hf_x11_xinput_ButtonPress_detail, { "detail", "x11.xinput.ButtonPress.detail", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -4644,6 +5002,8 @@ { &hf_x11_xinput_ButtonPress_button_mask_item, { "button_mask", "x11.xinput.ButtonPress.button_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ButtonPress_valuator_mask, { "valuator_mask", "x11.xinput.ButtonPress.valuator_mask", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_ButtonPress_valuator_mask_item, { "valuator_mask", "x11.xinput.ButtonPress.valuator_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ButtonPress_axisvalues, { "axisvalues", "x11.xinput.ButtonPress.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_ButtonPress_axisvalues_item, { "axisvalues", "x11.xinput.ButtonPress.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_Enter_deviceid, { "deviceid", "x11.xinput.Enter.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, { &hf_x11_xinput_Enter_time, { "time", "x11.xinput.Enter.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_Time), 0, NULL, HFILL }}, { &hf_x11_xinput_Enter_sourceid, { "sourceid", "x11.xinput.Enter.sourceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, @@ -4656,8 +5016,8 @@ { &hf_x11_xinput_Enter_root_y, { "root_y", "x11.xinput.Enter.root_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_Enter_event_x, { "event_x", "x11.xinput.Enter.event_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_Enter_event_y, { "event_y", "x11.xinput.Enter.event_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_Enter_same_screen, { "same_screen", "x11.xinput.Enter.same_screen", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_xinput_Enter_focus, { "focus", "x11.xinput.Enter.focus", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_Enter_same_screen, { "same_screen", "x11.xinput.Enter.same_screen", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_Enter_focus, { "focus", "x11.xinput.Enter.focus", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_Enter_buttons_len, { "buttons_len", "x11.xinput.Enter.buttons_len", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_Enter_mods, { "mods", "x11.xinput.Enter.mods", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_Enter_group, { "group", "x11.xinput.Enter.group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -4704,6 +5064,10 @@ { &hf_x11_xinput_RawKeyPress_flags, { "flags", "x11.xinput.RawKeyPress.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_RawKeyPress_valuator_mask, { "valuator_mask", "x11.xinput.RawKeyPress.valuator_mask", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_RawKeyPress_valuator_mask_item, { "valuator_mask", "x11.xinput.RawKeyPress.valuator_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_RawKeyPress_axisvalues, { "axisvalues", "x11.xinput.RawKeyPress.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_RawKeyPress_axisvalues_item, { "axisvalues", "x11.xinput.RawKeyPress.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_RawKeyPress_axisvalues_raw, { "axisvalues_raw", "x11.xinput.RawKeyPress.axisvalues_raw", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_RawKeyPress_axisvalues_raw_item, { "axisvalues_raw", "x11.xinput.RawKeyPress.axisvalues_raw", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_RawButtonPress_deviceid, { "deviceid", "x11.xinput.RawButtonPress.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, { &hf_x11_xinput_RawButtonPress_time, { "time", "x11.xinput.RawButtonPress.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_Time), 0, NULL, HFILL }}, { &hf_x11_xinput_RawButtonPress_detail, { "detail", "x11.xinput.RawButtonPress.detail", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -4713,6 +5077,10 @@ { &hf_x11_xinput_RawButtonPress_flags, { "flags", "x11.xinput.RawButtonPress.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_RawButtonPress_valuator_mask, { "valuator_mask", "x11.xinput.RawButtonPress.valuator_mask", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_RawButtonPress_valuator_mask_item, { "valuator_mask", "x11.xinput.RawButtonPress.valuator_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_RawButtonPress_axisvalues, { "axisvalues", "x11.xinput.RawButtonPress.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_RawButtonPress_axisvalues_item, { "axisvalues", "x11.xinput.RawButtonPress.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_RawButtonPress_axisvalues_raw, { "axisvalues_raw", "x11.xinput.RawButtonPress.axisvalues_raw", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_RawButtonPress_axisvalues_raw_item, { "axisvalues_raw", "x11.xinput.RawButtonPress.axisvalues_raw", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_TouchBegin_deviceid, { "deviceid", "x11.xinput.TouchBegin.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, { &hf_x11_xinput_TouchBegin_time, { "time", "x11.xinput.TouchBegin.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_Time), 0, NULL, HFILL }}, { &hf_x11_xinput_TouchBegin_detail, { "detail", "x11.xinput.TouchBegin.detail", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -4735,6 +5103,8 @@ { &hf_x11_xinput_TouchBegin_button_mask_item, { "button_mask", "x11.xinput.TouchBegin.button_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_TouchBegin_valuator_mask, { "valuator_mask", "x11.xinput.TouchBegin.valuator_mask", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_TouchBegin_valuator_mask_item, { "valuator_mask", "x11.xinput.TouchBegin.valuator_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_TouchBegin_axisvalues, { "axisvalues", "x11.xinput.TouchBegin.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_TouchBegin_axisvalues_item, { "axisvalues", "x11.xinput.TouchBegin.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_TouchOwnership_deviceid, { "deviceid", "x11.xinput.TouchOwnership.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, { &hf_x11_xinput_TouchOwnership_time, { "time", "x11.xinput.TouchOwnership.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_Time), 0, NULL, HFILL }}, { &hf_x11_xinput_TouchOwnership_touchid, { "touchid", "x11.xinput.TouchOwnership.touchid", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -4753,6 +5123,10 @@ { &hf_x11_xinput_RawTouchBegin_flags, { "flags", "x11.xinput.RawTouchBegin.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_RawTouchBegin_valuator_mask, { "valuator_mask", "x11.xinput.RawTouchBegin.valuator_mask", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_RawTouchBegin_valuator_mask_item, { "valuator_mask", "x11.xinput.RawTouchBegin.valuator_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_RawTouchBegin_axisvalues, { "axisvalues", "x11.xinput.RawTouchBegin.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_RawTouchBegin_axisvalues_item, { "axisvalues", "x11.xinput.RawTouchBegin.axisvalues", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_RawTouchBegin_axisvalues_raw, { "axisvalues_raw", "x11.xinput.RawTouchBegin.axisvalues_raw", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_RawTouchBegin_axisvalues_raw_item, { "axisvalues_raw", "x11.xinput.RawTouchBegin.axisvalues_raw", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_BarrierHit_deviceid, { "deviceid", "x11.xinput.BarrierHit.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, { &hf_x11_xinput_BarrierHit_time, { "time", "x11.xinput.BarrierHit.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_Time), 0, NULL, HFILL }}, { &hf_x11_xinput_BarrierHit_eventid, { "eventid", "x11.xinput.BarrierHit.eventid", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, @@ -4760,6 +5134,8 @@ { &hf_x11_xinput_BarrierHit_event, { "event", "x11.xinput.BarrierHit.event", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_BarrierHit_barrier, { "barrier", "x11.xinput.BarrierHit.barrier", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_BarrierHit_dtime, { "dtime", "x11.xinput.BarrierHit.dtime", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xinput_BarrierHit_flags_mask_PointerReleased, { "PointerReleased", "x11.xinput.BarrierHit.flags.PointerReleased", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }}, +{ &hf_x11_xinput_BarrierHit_flags_mask_DeviceIsGrabbed, { "DeviceIsGrabbed", "x11.xinput.BarrierHit.flags.DeviceIsGrabbed", FT_BOOLEAN, 32, NULL, 1U << 1, NULL, HFILL }}, { &hf_x11_xinput_BarrierHit_flags, { "flags", "x11.xinput.BarrierHit.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xinput_BarrierHit_sourceid, { "sourceid", "x11.xinput.BarrierHit.sourceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }}, { &hf_x11_xinput_BarrierHit_root_x, { "root_x", "x11.xinput.BarrierHit.root_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -6616,6 +6992,7 @@ { &hf_x11_xkb_GetNames_reply_GroupNames_groups, { "groups", "x11.xkb.GetNames.reply.GroupNames.groups", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_GetNames_reply_GroupNames_groups_item, { "groups", "x11.xkb.GetNames.reply.GroupNames.groups", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_GetNames_reply_KeyNames_keyNames, { "keyNames", "x11.xkb.GetNames.reply.KeyNames.keyNames", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xkb_GetNames_reply_KeyNames_keyNames_item, { "keyNames", "x11.xkb.GetNames.reply.KeyNames.keyNames", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_GetNames_reply_KeyAliases_keyAliases, { "keyAliases", "x11.xkb.GetNames.reply.KeyAliases.keyAliases", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_GetNames_reply_KeyAliases_keyAliases_item, { "keyAliases", "x11.xkb.GetNames.reply.KeyAliases.keyAliases", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_GetNames_reply_RGNames_radioGroupNames, { "radioGroupNames", "x11.xkb.GetNames.reply.RGNames.radioGroupNames", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -6686,6 +7063,7 @@ { &hf_x11_xkb_SetNames_GroupNames_groups, { "groups", "x11.xkb.SetNames.GroupNames.groups", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_SetNames_GroupNames_groups_item, { "groups", "x11.xkb.SetNames.GroupNames.groups", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_SetNames_KeyNames_keyNames, { "keyNames", "x11.xkb.SetNames.KeyNames.keyNames", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xkb_SetNames_KeyNames_keyNames_item, { "keyNames", "x11.xkb.SetNames.KeyNames.keyNames", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_SetNames_KeyAliases_keyAliases, { "keyAliases", "x11.xkb.SetNames.KeyAliases.keyAliases", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_SetNames_KeyAliases_keyAliases_item, { "keyAliases", "x11.xkb.SetNames.KeyAliases.keyAliases", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_SetNames_RGNames_radioGroupNames, { "radioGroupNames", "x11.xkb.SetNames.RGNames.radioGroupNames", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -7014,6 +7392,7 @@ { &hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, { "groups", "x11.xkb.GetKbdByName.reply.KeyNames.GroupNames.groups", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, { "groups", "x11.xkb.GetKbdByName.reply.KeyNames.GroupNames.groups", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_GetKbdByName_reply_KeyNames_KeyNames_keyNames, { "keyNames", "x11.xkb.GetKbdByName.reply.KeyNames.KeyNames.keyNames", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xkb_GetKbdByName_reply_KeyNames_KeyNames_keyNames_item, { "keyNames", "x11.xkb.GetKbdByName.reply.KeyNames.KeyNames.keyNames", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_GetKbdByName_reply_KeyNames_KeyAliases_keyAliases, { "keyAliases", "x11.xkb.GetKbdByName.reply.KeyNames.KeyAliases.keyAliases", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_GetKbdByName_reply_KeyNames_KeyAliases_keyAliases_item, { "keyAliases", "x11.xkb.GetKbdByName.reply.KeyNames.KeyAliases.keyAliases", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xkb_GetKbdByName_reply_KeyNames_RGNames_radioGroupNames, { "radioGroupNames", "x11.xkb.GetKbdByName.reply.KeyNames.RGNames.radioGroupNames", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -7506,7 +7885,10 @@ { &hf_x11_xprint_PrintStartPage_window, { "window", "x11.xprint.PrintStartPage.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintEndPage_cancel, { "cancel", "x11.xprint.PrintEndPage.cancel", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintSelectInput_context, { "context", "x11.xprint.PrintSelectInput.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xprint_PrintSelectInput_event_mask, { "event_mask", "x11.xprint.PrintSelectInput.event_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintInputSelected_context, { "context", "x11.xprint.PrintInputSelected.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xprint_PrintInputSelected_reply_event_mask, { "event_mask", "x11.xprint.PrintInputSelected.reply.event_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, +{ &hf_x11_xprint_PrintInputSelected_reply_all_events_mask, { "all_events_mask", "x11.xprint.PrintInputSelected.reply.all_events_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetAttributes_context, { "context", "x11.xprint.PrintGetAttributes.context", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetAttributes_pool, { "pool", "x11.xprint.PrintGetAttributes.pool", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_xprint_PrintGetAttributes_reply_stringLen, { "stringLen", "x11.xprint.PrintGetAttributes.reply.stringLen", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }}, |