Skip to content

Commit 2a6aea1

Browse files
committed
WIP update wayland.xml
This is now upstream; but waiting for release.
1 parent 10b6ff0 commit 2a6aea1

File tree

2 files changed

+102
-8
lines changed

2 files changed

+102
-8
lines changed

wayland-client/wayland.xml

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,6 +1832,9 @@
18321832
x and y, combined with the new surface size define in which
18331833
directions the surface's size changes.
18341834

1835+
The exact semantics of wl_surface.offset are role-specific. Refer to
1836+
the documentation of specific roles for more information.
1837+
18351838
Surface location offset is double-buffered state, see
18361839
wl_surface.commit.
18371840

@@ -1880,7 +1883,7 @@
18801883
</event>
18811884
</interface>
18821885

1883-
<interface name="wl_seat" version="9">
1886+
<interface name="wl_seat" version="10">
18841887
<description summary="group of input devices">
18851888
A seat is a group of keyboards, pointer and touch devices. This
18861889
object is published as a global during start up, or when such a
@@ -2013,7 +2016,7 @@
20132016

20142017
</interface>
20152018

2016-
<interface name="wl_pointer" version="9">
2019+
<interface name="wl_pointer" version="10">
20172020
<description summary="pointer input device">
20182021
The wl_pointer interface represents one or more input devices,
20192022
such as mice, which control the pointer location and pointer_focus
@@ -2426,7 +2429,7 @@
24262429
</event>
24272430
</interface>
24282431

2429-
<interface name="wl_keyboard" version="9">
2432+
<interface name="wl_keyboard" version="10">
24302433
<description summary="keyboard input device">
24312434
The wl_keyboard interface represents one or more keyboards
24322435
associated with a seat.
@@ -2479,6 +2482,9 @@
24792482
the surface argument and the keys currently logically down to the keys
24802483
in the keys argument. The compositor must not send this event if the
24812484
wl_keyboard already had an active surface immediately before this event.
2485+
2486+
Clients should not use the list of pressed keys to emulate key-press
2487+
events. The order of keys in the list is unspecified.
24822488
</description>
24832489
<arg name="serial" type="uint" summary="serial number of the enter event"/>
24842490
<arg name="surface" type="object" interface="wl_surface" summary="surface gaining keyboard focus"/>
@@ -2505,9 +2511,18 @@
25052511
<enum name="key_state">
25062512
<description summary="physical key state">
25072513
Describes the physical state of a key that produced the key event.
2514+
2515+
Since version 10, the key can be in a "repeated" pseudo-state which
2516+
means the same as "pressed", but is used to signal repetition in the
2517+
key event.
2518+
2519+
The key may only enter the repeated state after entering the pressed
2520+
state and before entering the released state. This event may be
2521+
generated multiple times while the key is down.
25082522
</description>
25092523
<entry name="released" value="0" summary="key is not pressed"/>
25102524
<entry name="pressed" value="1" summary="key is pressed"/>
2525+
<entry name="repeated" value="2" summary="key was repeated" since="10"/>
25112526
</enum>
25122527

25132528
<event name="key">
@@ -2530,6 +2545,11 @@
25302545
compositor must not send this event if state is pressed (resp. released)
25312546
and the key was already logically down (resp. was not logically down)
25322547
immediately before this event.
2548+
2549+
Since version 10, compositors may send key events with the "repeated"
2550+
key state when a wl_keyboard.repeat_info event with a rate argument of
2551+
0 has been received. This allows the compositor to take over the
2552+
responsibility of key repetition.
25332553
</description>
25342554
<arg name="serial" type="uint" summary="serial number of the key event"/>
25352555
<arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
@@ -2590,7 +2610,7 @@
25902610
</event>
25912611
</interface>
25922612

2593-
<interface name="wl_touch" version="9">
2613+
<interface name="wl_touch" version="10">
25942614
<description summary="touchscreen input device">
25952615
The wl_touch interface represents a touchscreen
25962616
associated with a seat.
@@ -3245,4 +3265,31 @@
32453265
</request>
32463266
</interface>
32473267

3268+
<interface name="wl_fixes" version="1">
3269+
<description summary="wayland protocol fixes">
3270+
This global fixes problems with other core-protocol interfaces that
3271+
cannot be fixed in these interfaces themselves.
3272+
</description>
3273+
3274+
<request name="destroy" type="destructor">
3275+
<description summary="destroys this object"/>
3276+
</request>
3277+
3278+
<request name="destroy_registry">
3279+
<description summary="destroy a wl_registry">
3280+
This request destroys a wl_registry object.
3281+
3282+
The client should no longer use the wl_registry after making this
3283+
request.
3284+
3285+
The compositor will emit a wl_display.delete_id event with the object ID
3286+
of the registry and will no longer emit any events on the registry. The
3287+
client should re-use the object ID once it receives the
3288+
wl_display.delete_id event.
3289+
</description>
3290+
<arg name="registry" type="object" interface="wl_registry"
3291+
summary="the registry to destroy"/>
3292+
</request>
3293+
</interface>
3294+
32483295
</protocol>

wayland-server/wayland.xml

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,6 +1832,9 @@
18321832
x and y, combined with the new surface size define in which
18331833
directions the surface's size changes.
18341834

1835+
The exact semantics of wl_surface.offset are role-specific. Refer to
1836+
the documentation of specific roles for more information.
1837+
18351838
Surface location offset is double-buffered state, see
18361839
wl_surface.commit.
18371840

@@ -1880,7 +1883,7 @@
18801883
</event>
18811884
</interface>
18821885

1883-
<interface name="wl_seat" version="9">
1886+
<interface name="wl_seat" version="10">
18841887
<description summary="group of input devices">
18851888
A seat is a group of keyboards, pointer and touch devices. This
18861889
object is published as a global during start up, or when such a
@@ -2013,7 +2016,7 @@
20132016

20142017
</interface>
20152018

2016-
<interface name="wl_pointer" version="9">
2019+
<interface name="wl_pointer" version="10">
20172020
<description summary="pointer input device">
20182021
The wl_pointer interface represents one or more input devices,
20192022
such as mice, which control the pointer location and pointer_focus
@@ -2426,7 +2429,7 @@
24262429
</event>
24272430
</interface>
24282431

2429-
<interface name="wl_keyboard" version="9">
2432+
<interface name="wl_keyboard" version="10">
24302433
<description summary="keyboard input device">
24312434
The wl_keyboard interface represents one or more keyboards
24322435
associated with a seat.
@@ -2479,6 +2482,9 @@
24792482
the surface argument and the keys currently logically down to the keys
24802483
in the keys argument. The compositor must not send this event if the
24812484
wl_keyboard already had an active surface immediately before this event.
2485+
2486+
Clients should not use the list of pressed keys to emulate key-press
2487+
events. The order of keys in the list is unspecified.
24822488
</description>
24832489
<arg name="serial" type="uint" summary="serial number of the enter event"/>
24842490
<arg name="surface" type="object" interface="wl_surface" summary="surface gaining keyboard focus"/>
@@ -2505,9 +2511,18 @@
25052511
<enum name="key_state">
25062512
<description summary="physical key state">
25072513
Describes the physical state of a key that produced the key event.
2514+
2515+
Since version 10, the key can be in a "repeated" pseudo-state which
2516+
means the same as "pressed", but is used to signal repetition in the
2517+
key event.
2518+
2519+
The key may only enter the repeated state after entering the pressed
2520+
state and before entering the released state. This event may be
2521+
generated multiple times while the key is down.
25082522
</description>
25092523
<entry name="released" value="0" summary="key is not pressed"/>
25102524
<entry name="pressed" value="1" summary="key is pressed"/>
2525+
<entry name="repeated" value="2" summary="key was repeated" since="10"/>
25112526
</enum>
25122527

25132528
<event name="key">
@@ -2530,6 +2545,11 @@
25302545
compositor must not send this event if state is pressed (resp. released)
25312546
and the key was already logically down (resp. was not logically down)
25322547
immediately before this event.
2548+
2549+
Since version 10, compositors may send key events with the "repeated"
2550+
key state when a wl_keyboard.repeat_info event with a rate argument of
2551+
0 has been received. This allows the compositor to take over the
2552+
responsibility of key repetition.
25332553
</description>
25342554
<arg name="serial" type="uint" summary="serial number of the key event"/>
25352555
<arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
@@ -2590,7 +2610,7 @@
25902610
</event>
25912611
</interface>
25922612

2593-
<interface name="wl_touch" version="9">
2613+
<interface name="wl_touch" version="10">
25942614
<description summary="touchscreen input device">
25952615
The wl_touch interface represents a touchscreen
25962616
associated with a seat.
@@ -3245,4 +3265,31 @@
32453265
</request>
32463266
</interface>
32473267

3268+
<interface name="wl_fixes" version="1">
3269+
<description summary="wayland protocol fixes">
3270+
This global fixes problems with other core-protocol interfaces that
3271+
cannot be fixed in these interfaces themselves.
3272+
</description>
3273+
3274+
<request name="destroy" type="destructor">
3275+
<description summary="destroys this object"/>
3276+
</request>
3277+
3278+
<request name="destroy_registry">
3279+
<description summary="destroy a wl_registry">
3280+
This request destroys a wl_registry object.
3281+
3282+
The client should no longer use the wl_registry after making this
3283+
request.
3284+
3285+
The compositor will emit a wl_display.delete_id event with the object ID
3286+
of the registry and will no longer emit any events on the registry. The
3287+
client should re-use the object ID once it receives the
3288+
wl_display.delete_id event.
3289+
</description>
3290+
<arg name="registry" type="object" interface="wl_registry"
3291+
summary="the registry to destroy"/>
3292+
</request>
3293+
</interface>
3294+
32483295
</protocol>

0 commit comments

Comments
 (0)