Skip to content

Commit 6e75c28

Browse files
committed
Merge pull request godotengine#107693 from deralmas/wayland-protocols-1.45
wayland-protocols: Update to 1.45
2 parents 468ad87 + ae74c0c commit 6e75c28

File tree

20 files changed

+236
-81
lines changed

20 files changed

+236
-81
lines changed

thirdparty/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,7 @@ Files extracted from upstream source:
11571157
# wayland-protocols
11581158

11591159
- Upstream: https://gitlab.freedesktop.org/wayland/wayland-protocols
1160-
- Version: 1.33 (54346071a5f211f2c482889f2c8ee3b5ecda63ab, 2024)
1160+
- Version: 1.45 (54346071a5f211f2c482889f2c8ee3b5ecda63ab, 2025)
11611161
- License: MIT
11621162

11631163
Files extracted from upstream source:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Tablet protocol
22

33
Maintainers:
4-
Peter Hutterer <[email protected]>
4+
Peter Hutterer <[email protected]> (@whot)

thirdparty/wayland-protocols/stable/tablet/tablet-v2.xml

Lines changed: 150 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<protocol name="tablet_unstable_v2">
2+
<protocol name="tablet_v2">
33

44
<copyright>
55
Copyright 2014 © Stephen "Lyude" Chandler Paul
6-
Copyright 2015-2016 © Red Hat, Inc.
6+
Copyright 2015-2024 © Red Hat, Inc.
77

88
Permission is hereby granted, free of charge, to any person
99
obtaining a copy of this software and associated documentation files
@@ -104,18 +104,9 @@
104104
compositor-specific policy when a tool can be removed. Common approaches
105105
will likely include some form of removing a tool when all tablets the
106106
tool was used on are removed.
107-
108-
Warning! The protocol described in this file is experimental and
109-
backward incompatible changes may be made. Backward compatible changes
110-
may be added together with the corresponding interface version bump.
111-
Backward incompatible changes are done by bumping the version number in
112-
the protocol and interface names and resetting the interface version.
113-
Once the protocol is to be declared stable, the 'z' prefix and the
114-
version number in the protocol and interface names are removed and the
115-
interface version number is reset.
116107
</description>
117108

118-
<interface name="zwp_tablet_manager_v2" version="1">
109+
<interface name="zwp_tablet_manager_v2" version="2">
119110
<description summary="controller object for graphic tablet devices">
120111
An object that provides access to the graphics tablets available on this
121112
system. All tablets are associated with a seat, to get access to the
@@ -139,7 +130,7 @@
139130
</request>
140131
</interface>
141132

142-
<interface name="zwp_tablet_seat_v2" version="1">
133+
<interface name="zwp_tablet_seat_v2" version="2">
143134
<description summary="controller object for graphic tablet devices of a seat">
144135
An object that provides access to the graphics tablets available on this
145136
seat. After binding to this interface, the compositor sends a set of
@@ -190,7 +181,7 @@
190181
</event>
191182
</interface>
192183

193-
<interface name="zwp_tablet_tool_v2" version="1">
184+
<interface name="zwp_tablet_tool_v2" version="2">
194185
<description summary="a physical tablet tool">
195186
An object that represents a physical tool that has been, or is
196187
currently in use with a tablet in this seat. Each wp_tablet_tool
@@ -576,7 +567,7 @@
576567
</enum>
577568
</interface>
578569

579-
<interface name="zwp_tablet_v2" version="1">
570+
<interface name="zwp_tablet_v2" version="2">
580571
<description summary="graphics tablet device">
581572
The wp_tablet interface represents one graphics tablet device. The
582573
tablet interface itself does not generate events; all events are
@@ -596,19 +587,33 @@
596587

597588
<event name="name">
598589
<description summary="tablet device name">
590+
A descriptive name for the tablet device.
591+
592+
If the device has no descriptive name, this event is not sent.
593+
599594
This event is sent in the initial burst of events before the
600-
wp_tablet.done event.
595+
wp_tablet.done event.
601596
</description>
602597
<arg name="name" type="string" summary="the device name"/>
603598
</event>
604599

605600
<event name="id">
606-
<description summary="tablet device USB vendor/product id">
601+
<description summary="tablet device vendor/product id">
602+
The vendor and product IDs for the tablet device.
603+
604+
The interpretation of the id depends on the wp_tablet.bustype.
605+
Prior to version v2 of this protocol, the id was implied to be a USB
606+
vendor and product ID. If no wp_tablet.bustype is sent, the ID
607+
is to be interpreted as USB vendor and product ID.
608+
609+
If the device has no vendor/product ID, this event is not sent.
610+
This can happen for virtual devices or non-USB devices, for instance.
611+
607612
This event is sent in the initial burst of events before the
608613
wp_tablet.done event.
609614
</description>
610-
<arg name="vid" type="uint" summary="USB vendor id"/>
611-
<arg name="pid" type="uint" summary="USB product id"/>
615+
<arg name="vid" type="uint" summary="vendor id"/>
616+
<arg name="pid" type="uint" summary="product id"/>
612617
</event>
613618

614619
<event name="path">
@@ -649,9 +654,36 @@
649654
the object.
650655
</description>
651656
</event>
657+
658+
<!-- Version 2 additions -->
659+
660+
<enum name="bustype" since="2">
661+
<description summary="bus type ">
662+
Describes the bus types this tablet is connected to.
663+
</description>
664+
<entry name="usb" value="3" summary="USB"/>
665+
<entry name="bluetooth" value="5" summary="Bluetooth"/>
666+
<entry name="virtual" value="6" summary="Virtual"/>
667+
<entry name="serial" value="17" summary="Serial"/>
668+
<entry name="i2c" value="24" summary="I2C"/>
669+
</enum>
670+
671+
<event name="bustype" since="2">
672+
<description summary="tablet device bus type">
673+
The bustype argument is one of the BUS_ defines in the Linux kernel's
674+
linux/input.h
675+
676+
If the device has no known bustype or the bustype cannot be
677+
queried, this event is not sent.
678+
679+
This event is sent in the initial burst of events before the
680+
wp_tablet.done event.
681+
</description>
682+
<arg name="bustype" type="uint" enum="bustype" summary="bus type"/>
683+
</event>
652684
</interface>
653685

654-
<interface name="zwp_tablet_pad_ring_v2" version="1">
686+
<interface name="zwp_tablet_pad_ring_v2" version="2">
655687
<description summary="pad ring">
656688
A circular interaction area, such as the touch ring on the Wacom Intuos
657689
Pro series tablets.
@@ -765,7 +797,7 @@
765797
</event>
766798
</interface>
767799

768-
<interface name="zwp_tablet_pad_strip_v2" version="1">
800+
<interface name="zwp_tablet_pad_strip_v2" version="2">
769801
<description summary="pad strip">
770802
A linear interaction area, such as the strips found in Wacom Cintiq
771803
models.
@@ -881,7 +913,7 @@
881913
</event>
882914
</interface>
883915

884-
<interface name="zwp_tablet_pad_group_v2" version="1">
916+
<interface name="zwp_tablet_pad_group_v2" version="2">
885917
<description summary="a set of buttons, rings and strips">
886918
A pad group describes a distinct (sub)set of buttons, rings and strips
887919
present in the tablet. The criteria of this grouping is usually positional,
@@ -984,14 +1016,14 @@
9841016
<description summary="mode switch event">
9851017
Notification that the mode was switched.
9861018

987-
A mode applies to all buttons, rings and strips in a group
1019+
A mode applies to all buttons, rings, strips and dials in a group
9881020
simultaneously, but a client is not required to assign different actions
9891021
for each mode. For example, a client may have mode-specific button
9901022
mappings but map the ring to vertical scrolling in all modes. Mode
9911023
indices start at 0.
9921024

9931025
Switching modes is compositor-dependent. The compositor may provide
994-
visual cues to the client about the mode, e.g. by toggling LEDs on
1026+
visual cues to the user about the mode, e.g. by toggling LEDs on
9951027
the tablet device. Mode-switching may be software-controlled or
9961028
controlled by one or more physical buttons. For example, on a Wacom
9971029
Intuos Pro, the button inside the ring may be assigned to switch
@@ -1005,20 +1037,33 @@
10051037
previous mode, the client should immediately issue a
10061038
wp_tablet_pad.set_feedback request for each changed button.
10071039

1008-
If a ring or strip action in the new mode differs from the action
1040+
If a ring, strip or dial action in the new mode differs from the action
10091041
in the previous mode, the client should immediately issue a
1010-
wp_tablet_ring.set_feedback or wp_tablet_strip.set_feedback request
1011-
for each changed ring or strip.
1042+
wp_tablet_ring.set_feedback, wp_tablet_strip.set_feedback or
1043+
wp_tablet_dial.set_feedback request for each changed ring, strip or dial.
10121044
</description>
10131045
<arg name="time" type="uint" summary="the time of the event with millisecond granularity"/>
10141046
<arg name="serial" type="uint"/>
10151047
<arg name="mode" type="uint" summary="the new mode of the pad"/>
10161048
</event>
1049+
1050+
<!-- Version 2 additions -->
1051+
1052+
<event name="dial" since="2">
1053+
<description summary="dial announced">
1054+
Sent on wp_tablet_pad initialization to announce available dials.
1055+
One event is sent for each dial available on this pad group.
1056+
1057+
This event is sent in the initial burst of events before the
1058+
wp_tablet_pad_group.done event.
1059+
</description>
1060+
<arg name="dial" type="new_id" interface="zwp_tablet_pad_dial_v2"/>
1061+
</event>
10171062
</interface>
10181063

1019-
<interface name="zwp_tablet_pad_v2" version="1">
1020-
<description summary="a set of buttons, rings and strips">
1021-
A pad device is a set of buttons, rings and strips
1064+
<interface name="zwp_tablet_pad_v2" version="2">
1065+
<description summary="a set of buttons, rings, strips and dials">
1066+
A pad device is a set of buttons, rings, strips and dials
10221067
usually physically present on the tablet device itself. Some
10231068
exceptions exist where the pad device is physically detached, e.g. the
10241069
Wacom ExpressKey Remote.
@@ -1032,7 +1077,7 @@
10321077
This initial event sequence is terminated by a wp_tablet_pad.done
10331078
event.
10341079

1035-
All pad features (buttons, rings and strips) are logically divided into
1080+
All pad features (buttons, rings, strips and dials) are logically divided into
10361081
groups and all pads have at least one group. The available groups are
10371082
notified through the wp_tablet_pad.group event; the compositor will
10381083
emit one event per group before emitting wp_tablet_pad.done.
@@ -1175,4 +1220,78 @@
11751220
</description>
11761221
</event>
11771222
</interface>
1223+
1224+
<interface name="zwp_tablet_pad_dial_v2" version="2">
1225+
<description summary="pad dial">
1226+
A rotary control, e.g. a dial or a wheel.
1227+
1228+
Events on a dial are logically grouped by the wl_tablet_pad_dial.frame
1229+
event.
1230+
</description>
1231+
1232+
<request name="set_feedback">
1233+
<description summary="set compositor feedback">
1234+
Requests the compositor to use the provided feedback string
1235+
associated with this dial. This request should be issued immediately
1236+
after a wp_tablet_pad_group.mode_switch event from the corresponding
1237+
group is received, or whenever the dial is mapped to a different
1238+
action. See wp_tablet_pad_group.mode_switch for more details.
1239+
1240+
Clients are encouraged to provide context-aware descriptions for
1241+
the actions associated with the dial, and compositors may use this
1242+
information to offer visual feedback about the button layout
1243+
(eg. on-screen displays).
1244+
1245+
The provided string 'description' is a UTF-8 encoded string to be
1246+
associated with this ring, and is considered user-visible; general
1247+
internationalization rules apply.
1248+
1249+
The serial argument will be that of the last
1250+
wp_tablet_pad_group.mode_switch event received for the group of this
1251+
dial. Requests providing other serials than the most recent one will be
1252+
ignored.
1253+
</description>
1254+
<arg name="description" type="string" summary="dial description"/>
1255+
<arg name="serial" type="uint" summary="serial of the mode switch event"/>
1256+
</request>
1257+
1258+
<request name="destroy" type="destructor">
1259+
<description summary="destroy the dial object">
1260+
This destroys the client's resource for this dial object.
1261+
</description>
1262+
</request>
1263+
1264+
<event name="delta">
1265+
<description summary="delta movement">
1266+
Sent whenever the position on a dial changes.
1267+
1268+
This event carries the wheel delta as multiples or fractions
1269+
of 120 with each multiple of 120 representing one logical wheel detent.
1270+
For example, an axis_value120 of 30 is one quarter of
1271+
a logical wheel step in the positive direction, a value120 of
1272+
-240 are two logical wheel steps in the negative direction within the
1273+
same hardware event. See the wl_pointer.axis_value120 for more details.
1274+
1275+
The value120 must not be zero.
1276+
</description>
1277+
<arg name="value120" type="int" summary="rotation distance as fraction of 120"/>
1278+
</event>
1279+
1280+
<event name="frame">
1281+
<description summary="end of a dial event sequence">
1282+
Indicates the end of a set of events that represent one logical
1283+
hardware dial event. A client is expected to accumulate the data
1284+
in all events within the frame before proceeding.
1285+
1286+
All wp_tablet_pad_dial events before a wp_tablet_pad_dial.frame event belong
1287+
logically together.
1288+
1289+
A wp_tablet_pad_dial.frame event is sent for every logical event
1290+
group, even if the group only contains a single wp_tablet_pad_dial
1291+
event. Specifically, a client may get a sequence: delta, frame,
1292+
delta, frame, etc.
1293+
</description>
1294+
<arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
1295+
</event>
1296+
</interface>
11781297
</protocol>

thirdparty/wayland-protocols/stable/viewporter/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ Viewporter: cropping and scaling extension for surface contents
33
Previously known as wl_scaler.
44

55
Maintainers:
6-
Pekka Paalanen <[email protected]>
6+
Pekka Paalanen <[email protected]> (@pq)
77

thirdparty/wayland-protocols/stable/viewporter/viewporter.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@
7171
src_y, src_width, src_height), and the destination size (dst_width,
7272
dst_height). The contents of the source rectangle are scaled to the
7373
destination size, and content outside the source rectangle is ignored.
74-
This state is double-buffered, and is applied on the next
75-
wl_surface.commit.
74+
This state is double-buffered, see wl_surface.commit.
7675

7776
The two parts of crop and scale state are independent: the source
7877
rectangle, and the destination size. Initially both are unset, that
@@ -149,8 +148,7 @@
149148
or negative, or x or y are negative, raise the bad_value protocol
150149
error.
151150

152-
The crop and scale state is double-buffered state, and will be
153-
applied on the next wl_surface.commit.
151+
The crop and scale state is double-buffered, see wl_surface.commit.
154152
</description>
155153
<arg name="x" type="fixed" summary="source rectangle x"/>
156154
<arg name="y" type="fixed" summary="source rectangle y"/>
@@ -169,8 +167,7 @@
169167
contains zero or negative values raises the bad_value protocol
170168
error.
171169

172-
The crop and scale state is double-buffered state, and will be
173-
applied on the next wl_surface.commit.
170+
The crop and scale state is double-buffered, see wl_surface.commit.
174171
</description>
175172
<arg name="width" type="int" summary="surface width"/>
176173
<arg name="height" type="int" summary="surface height"/>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
xdg shell protocol
22

33
Maintainers:
4-
Jonas Ådahl <[email protected]>
5-
Mike Blumenkrantz <[email protected]>
4+
Jonas Ådahl <[email protected]> (@jadahl)
5+
Mike Blumenkrantz <[email protected]> (@zmike)

0 commit comments

Comments
 (0)