diff options
Diffstat (limited to 'libxcb/xcb-proto/src/xinput.xml')
| -rw-r--r-- | libxcb/xcb-proto/src/xinput.xml | 527 |
1 files changed, 384 insertions, 143 deletions
diff --git a/libxcb/xcb-proto/src/xinput.xml b/libxcb/xcb-proto/src/xinput.xml index 7f7b0a66d..c729f20fb 100644 --- a/libxcb/xcb-proto/src/xinput.xml +++ b/libxcb/xcb-proto/src/xinput.xml @@ -46,56 +46,10 @@ This will, e.g., be necessary for automatically generated byte-order conversion which will, e.g., be necessary for server-side xcb. This affects the following: -* GetFeedbackControl reply field "feedbacks" ( structs FeedbackState, ... ) -* ChangeFeedbackControl request field "feedback" ( structs FeedbackCtl, ... ) -* QueryDeviceState reply field "classes" ( structs InputState, ... ) -* GetDeviceControl reply field "control" ( structs DeviceState, ... ) -* ChangeDeviceControl request field "control" ( structs ChangeDeviceControl, ... ) -* XIChangeHierarchy request field "changes" ( structs HierarchyChange, ... ) -* struct XIDeviceInfo field "classes" ( structs DeviceClass, ... ) * SendExtensionEvent member "events" ***** -xml and generator have to support <popcount> of all members of a list - -This is needed for the following XI2-events ( and eventcopies thereof ) - KeyPress - ButtonPress - RawKeyPress - RawKeyPress - RawButtonPress - TouchBegin - RawTouchBegin - - -***** - -<sumof> should support fields of listmembers. - -This is needed for request "ListInputDevices" - -***** - -xml and generator should support -switch-case similar to switch-bitcase. - -(and maybe: variable sized unions with a mechanism to define -which union-field is selected.) - -One of these features is needed for the InputInfo type -which is used by request "ListInputDevices" for the list "input_infos". - -***** - -Parametrized structs - -This is needed for being able to use the value of the field -"num_axes" of the GetDeviceMotionEvents-reply -in struct DeviceTimeCoord. - -***** - --> @@ -217,6 +171,29 @@ in struct DeviceTimeCoord. <struct name="InputInfo"> <field type="CARD8" name="class_id" enum="InputClass" /> <field type="CARD8" name="len" /> + <switch name="info"> + <fieldref>class_id</fieldref> + <case name="key"> + <enumref ref="InputClass">Key</enumref> + <field type="KeyCode" name="min_keycode" /> + <field type="KeyCode" name="max_keycode" /> + <field type="CARD16" name="num_keys" /> + <pad bytes="2" /> + </case> + <case name="button"> + <enumref ref="InputClass">Button</enumref> + <field type="CARD16" name="num_buttons" /> + </case> + <case name="valuator"> + <enumref ref="InputClass">Valuator</enumref> + <field type="CARD8" name="axes_len" /> + <field type="CARD8" name="mode" enum="ValuatorMode" /> + <field type="CARD32" name="motion_size" /> + <list type="AxisInfo" name="axes"> + <fieldref>axes_len</fieldref> + </list> + </case> + </switch> </struct> <struct name="DeviceName"> @@ -234,9 +211,15 @@ in struct DeviceTimeCoord. <list type="DeviceInfo" name="devices"> <fieldref>devices_len</fieldref> </list> - <!-- Uninterpreted: list (infos) of InputInfo structures, - length is <sumof> all devices.num_class_info --> - <!-- Uninterpreted: list (name) of DeviceName structures --> + <list type="InputInfo" name="infos"> + <sumof ref="devices"> + <fieldref>num_class_info</fieldref> + </sumof> + </list> + <list type="STR" name="names"> + <fieldref>devices_len</fieldref> + </list> + <pad align="4" /> </reply> </request> @@ -346,8 +329,9 @@ in struct DeviceTimeCoord. <struct name="DeviceTimeCoord"> <field type="TIMESTAMP" name="time" /> - <!-- Uninterpreted: list (axisvalues) of INT32, - length is num_axes from GetDeviceMotionEvents --> + <list type="INT32" name="axisvalues"> + <paramref type="CARD8">num_axes</paramref> + </list> </struct> <request name="GetDeviceMotionEvents" opcode="10"> @@ -361,7 +345,9 @@ in struct DeviceTimeCoord. <field type="CARD8" name="num_axes" /> <field type="CARD8" name="device_mode" enum="ValuatorMode" /> <pad bytes="18" /> - <!-- Uninterpreted: list (events) of DeviceTimeCoord structures --> + <list type="DeviceTimeCoord" name="events"> + <fieldref>num_events</fieldref> + </list> </reply> </request> @@ -609,12 +595,56 @@ in struct DeviceTimeCoord. <field type="CARD8" name="class_id" enum="FeedbackClass" /> <field type="CARD8" name="feedback_id" /> <field type="CARD16" name="len" /> - <list type="CARD8" name="uninterpreted_data"> - <op op="-"> - <fieldref>len</fieldref> - <value>4</value> - </op> - </list> + <switch name="data"> + <fieldref>class_id</fieldref> + <case name="keyboard"> + <enumref ref="FeedbackClass">Keyboard</enumref> + <field type="CARD16" name="pitch" /> + <field type="CARD16" name="duration" /> + <field type="CARD32" name="led_mask" /> + <field type="CARD32" name="led_values" /> + <field type="BOOL" name="global_auto_repeat" /> + <field type="CARD8" name="click" /> + <field type="CARD8" name="percent" /> + <pad bytes="1" /> + <list type="CARD8" name="auto_repeats"> + <value>32</value> + </list> + </case> + <case name="pointer"> + <enumref ref="FeedbackClass">Pointer</enumref> + <pad bytes="2" /> + <field type="CARD16" name="accel_num" /> + <field type="CARD16" name="accel_denom" /> + <field type="CARD16" name="threshold" /> + </case> + <case name="string"> + <enumref ref="FeedbackClass">String</enumref> + <field type="CARD16" name="max_symbols" /> + <field type="CARD16" name="num_keysyms" /> + <list type="KEYSYM" name="keysyms"> + <fieldref>num_keysyms</fieldref> + </list> + </case> + <case name="integer"> + <enumref ref="FeedbackClass">Integer</enumref> + <field type="CARD32" name="resolution" /> + <field type="INT32" name="min_value" /> + <field type="INT32" name="max_value" /> + </case> + <case name="led"> + <enumref ref="FeedbackClass">Led</enumref> + <field type="CARD32" name="led_mask" /> + <field type="CARD32" name="led_values" /> + </case> + <case name="bell"> + <enumref ref="FeedbackClass">Bell</enumref> + <field type="CARD8" name="percent" /> + <pad bytes="3" /> + <field type="CARD16" name="pitch" /> + <field type="CARD16" name="duration" /> + </case> + </switch> </struct> <request name="GetFeedbackControl" opcode="22"> @@ -696,12 +726,51 @@ in struct DeviceTimeCoord. <field type="CARD8" name="class_id" enum="FeedbackClass" /> <field type="CARD8" name="feedback_id" /> <field type="CARD16" name="len" /> - <list type="CARD8" name="uninterpreted_data"> - <op op="-"> - <fieldref>len</fieldref> - <value>4</value> - </op> - </list> + <switch name="data"> + <fieldref>class_id</fieldref> + <case name="keyboard"> + <enumref ref="FeedbackClass">Keyboard</enumref> + <field type="KeyCode" name="key" /> + <field type="CARD8" name="auto_repeat_mode" /> + <field type="INT8" name="key_click_percent" /> + <field type="INT8" name="bell_percent" /> + <field type="INT16" name="bell_pitch" /> + <field type="INT16" name="bell_duration" /> + <field type="CARD32" name="led_mask" /> + <field type="CARD32" name="led_values" /> + </case> + <case name="pointer"> + <enumref ref="FeedbackClass">Pointer</enumref> + <pad bytes="2" /> + <field type="INT16" name="num" /> + <field type="INT16" name="denom" /> + <field type="INT16" name="threshold" /> + </case> + <case name="string"> + <enumref ref="FeedbackClass">String</enumref> + <pad bytes="2" /> + <field type="CARD16" name="num_keysyms" /> + <list type="KEYSYM" name="keysyms"> + <fieldref>num_keysyms</fieldref> + </list> + </case> + <case name="integer"> + <enumref ref="FeedbackClass">Integer</enumref> + <field type="INT32" name="int_to_display" /> + </case> + <case name="led"> + <enumref ref="FeedbackClass">Led</enumref> + <field type="CARD32" name="led_mask" /> + <field type="CARD32" name="led_values" /> + </case> + <case name="bell"> + <enumref ref="FeedbackClass">Bell</enumref> + <field type="INT8" name="percent" /> + <pad bytes="3" /> + <field type="INT16" name="pitch" /> + <field type="INT16" name="duration" /> + </case> + </switch> </struct> <enum name="ChangeFeedbackControlMask"> @@ -1025,12 +1094,53 @@ in struct DeviceTimeCoord. <struct name="DeviceState"> <field type="CARD16" name="control_id" enum="DeviceControl" /> <field type="CARD16" name="len" /> - <list type="CARD8" name="uninterpreted_data"> - <op op="-"> - <fieldref>len</fieldref> - <value>4</value> - </op> - </list> + <switch name="data"> + <fieldref>control_id</fieldref> + <case name="resolution"> + <enumref ref="DeviceControl">resolution</enumref> + <field type="CARD32" name="num_valuators" /> + <list type="CARD32" name="resolution_values"> + <fieldref>num_valuators</fieldref> + </list> + <list type="CARD32" name="resolution_min"> + <fieldref>num_valuators</fieldref> + </list> + <list type="CARD32" name="resolution_max"> + <fieldref>num_valuators</fieldref> + </list> + </case> + <case name="abs_calib"> + <enumref ref="DeviceControl">abs_calib</enumref> + <field type="INT32" name="min_x" /> + <field type="INT32" name="max_x" /> + <field type="INT32" name="min_y" /> + <field type="INT32" name="max_y" /> + <field type="CARD32" name="flip_x" /> + <field type="CARD32" name="flip_y" /> + <field type="CARD32" name="rotation" /> + <field type="CARD32" name="button_threshold" /> + </case> + <case name="core"> + <enumref ref="DeviceControl">core</enumref> + <field type="CARD8" name="status" /> + <field type="CARD8" name="iscore" /> + <pad bytes="2" /> + </case> + <case name="enable"> + <enumref ref="DeviceControl">enable</enumref> + <field type="CARD8" name="enable" /> + <pad bytes="3" /> + </case> + <case name="abs_area"> + <enumref ref="DeviceControl">abs_area</enumref> + <field type="CARD32" name="offset_x" /> + <field type="CARD32" name="offset_y" /> + <field type="CARD32" name="width" /> + <field type="CARD32" name="height" /> + <field type="CARD32" name="screen" /> + <field type="CARD32" name="following" /> + </case> + </switch> </struct> <request name="GetDeviceControl" opcode="34"> @@ -1099,12 +1209,48 @@ in struct DeviceTimeCoord. <struct name="DeviceCtl"> <field type="CARD16" name="control_id" enum="DeviceControl" /> <field type="CARD16" name="len" /> - <list type="CARD8" name="uninterpreted_data"> - <op op="-"> - <fieldref>len</fieldref> - <value>4</value> - </op> - </list> + <switch name="data"> + <fieldref>control_id</fieldref> + <case name="resolution"> + <enumref ref="DeviceControl">resolution</enumref> + <field type="CARD8" name="first_valuator" /> + <field type="CARD8" name="num_valuators" /> + <pad bytes="2" /> + <list type="CARD32" name="resolution_values"> + <fieldref>num_valuators</fieldref> + </list> + </case> + <case name="abs_calib"> + <enumref ref="DeviceControl">abs_calib</enumref> + <field type="INT32" name="min_x" /> + <field type="INT32" name="max_x" /> + <field type="INT32" name="min_y" /> + <field type="INT32" name="max_y" /> + <field type="CARD32" name="flip_x" /> + <field type="CARD32" name="flip_y" /> + <field type="CARD32" name="rotation" /> + <field type="CARD32" name="button_threshold" /> + </case> + <case name="core"> + <enumref ref="DeviceControl">core</enumref> + <field type="CARD8" name="status" /> + <pad bytes="3" /> + </case> + <case name="enable"> + <enumref ref="DeviceControl">enable</enumref> + <field type="CARD8" name="enable" /> + <pad bytes="3" /> + </case> + <case name="abs_area"> + <enumref ref="DeviceControl">abs_area</enumref> + <field type="CARD32" name="offset_x" /> + <field type="CARD32" name="offset_y" /> + <field type="INT32" name="width" /> + <field type="INT32" name="height" /> + <field type="INT32" name="screen" /> + <field type="CARD32" name="following" /> + </case> + </switch> </struct> <request name="ChangeDeviceControl" opcode="35"> @@ -1205,30 +1351,26 @@ in struct DeviceTimeCoord. <pad bytes="10" /> <switch name="items"> <fieldref>format</fieldref> - <!-- <bitcase> is not correct, this would need <cases>s. - It works in that case, because PropertyFormat items can be - distinguished exactly as their values don't have equal bits. - --> - <bitcase> + <case> <enumref ref="PropertyFormat">8Bits</enumref> <list type="CARD8" name="data8"> <fieldref>num_items</fieldref> </list> <pad align="4" /> - </bitcase> - <bitcase> + </case> + <case> <enumref ref="PropertyFormat">16Bits</enumref> <list type="CARD16" name="data16"> <fieldref>num_items</fieldref> </list> <pad align="4" /> - </bitcase> - <bitcase> + </case> + <case> <enumref ref="PropertyFormat">32Bits</enumref> <list type="CARD32" name="data32"> <fieldref>num_items</fieldref> </list> - </bitcase> + </case> </switch> </reply> </request> @@ -1356,15 +1498,37 @@ in struct DeviceTimeCoord. <struct name="HierarchyChange"> <field type="CARD16" name="type" enum="HierarchyChangeType" /> <field type="CARD16" name="len" /> - <list type="CARD8" name="uninterpreted_data"> - <op op="-"> - <op op="*"> - <fieldref>len</fieldref> - <value>4</value> - </op> - <value>4</value> - </op> - </list> + <switch name="data"> + <fieldref>type</fieldref> + <case name="add_master"> + <enumref ref="HierarchyChangeType">AddMaster</enumref> + <field type="CARD16" name="name_len" /> + <field type="BOOL" name="send_core" /> + <field type="BOOL" name="enable" /> + <list type="char" name="name"> + <fieldref>name_len</fieldref> + </list> + <pad align="4" /> + </case> + <case name="remove_master"> + <enumref ref="HierarchyChangeType">RemoveMaster</enumref> + <field type="DeviceId" name="deviceid" altenum="Device" /> + <field type="CARD8" name="return_mode" enum="ChangeMode" /> + <pad bytes="1" /> + <field type="DeviceId" name="return_pointer" altenum="Device" /> + <field type="DeviceId" name="return_keyboard" altenum="Device" /> + </case> + <case name="attach_slave"> + <enumref ref="HierarchyChangeType">AttachSlave</enumref> + <field type="DeviceId" name="deviceid" altenum="Device" /> + <field type="DeviceId" name="master" altenum="Device" /> + </case> + <case name="detach_slave"> + <enumref ref="HierarchyChangeType">DetachSlave</enumref> + <field type="DeviceId" name="deviceid" altenum="Device" /> + <pad bytes="2" /> + </case> + </switch> </struct> <request name="XIChangeHierarchy" opcode="43"> @@ -1560,16 +1724,56 @@ in struct DeviceTimeCoord. <field type="CARD16" name="type" enum="DeviceClassType" /> <field type="CARD16" name="len" /> <field type="DeviceId" name="sourceid" /> - <pad bytes="2" /> - <list type="CARD8" name="uninterpreted_data"> - <op op="-"> - <op op="*"> - <fieldref>len</fieldref> - <value>4</value> - </op> - <value>8</value> - </op> - </list> + <switch name="data"> + <fieldref>type</fieldref> + <case name="key"> + <enumref ref="DeviceClassType">Key</enumref> + <field type="CARD16" name="num_keys" /> + <list type="CARD32" name="keys"> + <fieldref>num_keys</fieldref> + </list> + </case> + <case name="button"> + <enumref ref="DeviceClassType">Button</enumref> + <field type="CARD16" name="num_buttons" /> + <list type="CARD32" name="state"> + <op op="/"> + <op op="+"> + <fieldref>num_buttons</fieldref> + <value>31</value> + </op> + <value>32</value> + </op> + </list> + <list type="ATOM" name="labels"> + <fieldref>num_buttons</fieldref> + </list> + </case> + <case name="valuator"> + <enumref ref="DeviceClassType">Valuator</enumref> + <field type="CARD16" name="number" /> + <field type="ATOM" name="label" /> + <field type="FP3232" name="min" /> + <field type="FP3232" name="max" /> + <field type="FP3232" name="value" /> + <field type="CARD32" name="resolution" /> + <field type="CARD8" name="mode" enum="ValuatorMode" /> + <pad bytes="3" /> + </case> + <case name="scroll"> + <enumref ref="DeviceClassType">Scroll</enumref> + <field type="CARD16" name="number" /> + <field type="CARD16" name="scroll_type" enum="ScrollType" /> + <pad bytes="2" /> + <field type="CARD32" name="flags" mask="ScrollFlags" /> + <field type="FP3232" name="increment" /> + </case> + <case name="touch"> + <enumref ref="DeviceClassType">Touch</enumref> + <field type="CARD8" name="mode" enum="TouchMode" /> + <field type="CARD8" name="num_touches" /> + </case> + </switch> </struct> <struct name="XIDeviceInfo"> @@ -1776,28 +1980,24 @@ in struct DeviceTimeCoord. <field type="CARD32" name="num_items" /> <switch name="items"> <fieldref>format</fieldref> - <!-- <bitcase> is not correct, this would need <cases>s. - It works in that case, because PropertyFormat items can be - distinguished exactly as their values don't have equal bits. - --> - <bitcase> + <case> <enumref ref="PropertyFormat">8Bits</enumref> <list type="CARD8" name="data8"> <fieldref>num_items</fieldref> </list> - </bitcase> - <bitcase> + </case> + <case> <enumref ref="PropertyFormat">16Bits</enumref> <list type="CARD16" name="data16"> <fieldref>num_items</fieldref> </list> - </bitcase> - <bitcase> + </case> + <case> <enumref ref="PropertyFormat">32Bits</enumref> <list type="CARD32" name="data32"> <fieldref>num_items</fieldref> </list> - </bitcase> + </case> </switch> </request> @@ -1828,30 +2028,26 @@ in struct DeviceTimeCoord. <pad bytes="11" /> <switch name="items"> <fieldref>format</fieldref> - <!-- <bitcase> is not correct, this would need <cases>s. - It works in that case, because PropertyFormat items can be - distinguished exactly as their values don't have equal bits. - --> - <bitcase> + <case> <enumref ref="PropertyFormat">8Bits</enumref> <list type="CARD8" name="data8"> <fieldref>num_items</fieldref> </list> <pad align="4" /> - </bitcase> - <bitcase> + </case> + <case> <enumref ref="PropertyFormat">16Bits</enumref> <list type="CARD16" name="data16"> <fieldref>num_items</fieldref> </list> <pad align="4" /> - </bitcase> - <bitcase> + </case> + <case> <enumref ref="PropertyFormat">32Bits</enumref> <list type="CARD32" name="data32"> <fieldref>num_items</fieldref> </list> - </bitcase> + </case> </switch> </reply> </request> @@ -2092,8 +2288,13 @@ in struct DeviceTimeCoord. <list type="CARD32" name="valuator_mask"> <fieldref>valuators_len</fieldref> </list> - <!-- Uninterpreted: list (axisvalues) of FP3232, - length is <popcount> on valuator_mask list --> + <list type="FP3232" name="axisvalues"> + <sumof ref="valuator_mask"> + <popcount> + <listelement-ref/> + </popcount> + </sumof> + </list> </event> <eventcopy name="KeyRelease" number="3" ref="KeyPress" /> @@ -2128,8 +2329,13 @@ in struct DeviceTimeCoord. <list type="CARD32" name="valuator_mask"> <fieldref>valuators_len</fieldref> </list> - <!-- Uninterpreted: list (axisvalues) of FP3232, - length is <popcount> on valuator_mask list --> + <list type="FP3232" name="axisvalues"> + <sumof ref="valuator_mask"> + <popcount> + <listelement-ref/> + </popcount> + </sumof> + </list> </event> <eventcopy name="ButtonRelease" number="5" ref="ButtonPress" /> @@ -2248,10 +2454,20 @@ in struct DeviceTimeCoord. <list type="CARD32" name="valuator_mask"> <fieldref>valuators_len</fieldref> </list> - <!-- Uninterpreted: list (axisvalues) of FP3232, - length is <popcount> on valuator_mask list --> - <!-- Uninterpreted: list (axisvalues_raw) of FP3232, - length is <popcount> on valuator_mask list --> + <list type="FP3232" name="axisvalues"> + <sumof ref="valuator_mask"> + <popcount> + <listelement-ref/> + </popcount> + </sumof> + </list> + <list type="FP3232" name="axisvalues_raw"> + <sumof ref="valuator_mask"> + <popcount> + <listelement-ref/> + </popcount> + </sumof> + </list> </event> <eventcopy name="RawKeyRelease" number="14" ref="RawKeyPress" /> @@ -2269,10 +2485,20 @@ in struct DeviceTimeCoord. <list type="CARD32" name="valuator_mask"> <fieldref>valuators_len</fieldref> </list> - <!-- Uninterpreted: list (axisvalues) of FP3232, - length is <popcount> on valuator_mask list --> - <!-- Uninterpreted: list (axisvalues_raw) of FP3232, - length is <popcount> on valuator_mask list --> + <list type="FP3232" name="axisvalues"> + <sumof ref="valuator_mask"> + <popcount> + <listelement-ref/> + </popcount> + </sumof> + </list> + <list type="FP3232" name="axisvalues_raw"> + <sumof ref="valuator_mask"> + <popcount> + <listelement-ref/> + </popcount> + </sumof> + </list> </event> <eventcopy name="RawButtonRelease" number="16" ref="RawButtonPress" /> @@ -2311,8 +2537,13 @@ in struct DeviceTimeCoord. <list type="CARD32" name="valuator_mask"> <fieldref>valuators_len</fieldref> </list> - <!-- Uninterpreted: list (axisvalues) of FP3232, - length is <popcount> on valuator_mask list --> + <list type="FP3232" name="axisvalues"> + <sumof ref="valuator_mask"> + <popcount> + <listelement-ref/> + </popcount> + </sumof> + </list> </event> <eventcopy name="TouchUpdate" number="19" ref="TouchBegin" /> @@ -2351,10 +2582,20 @@ in struct DeviceTimeCoord. <list type="CARD32" name="valuator_mask"> <fieldref>valuators_len</fieldref> </list> - <!-- Uninterpreted: list (axisvalues) of FP3232, - length is <popcount> on valuator_mask list --> - <!-- Uninterpreted: list (axisvalues_raw) of FP3232, - length is <popcount> on valuator_mask list --> + <list type="FP3232" name="axisvalues"> + <sumof ref="valuator_mask"> + <popcount> + <listelement-ref/> + </popcount> + </sumof> + </list> + <list type="FP3232" name="axisvalues_raw"> + <sumof ref="valuator_mask"> + <popcount> + <listelement-ref/> + </popcount> + </sumof> + </list> </event> <eventcopy name="RawTouchUpdate" number="23" ref="RawTouchBegin" /> |