Skip to content

Commit 3e51f06

Browse files
authored
Merge pull request #44 from mahkoh/bot/update-protocols
Update protocols
2 parents 87a1a1d + 8ebad44 commit 3e51f06

File tree

3 files changed

+44
-19
lines changed

3 files changed

+44
-19
lines changed

protocols/river-protocols/river-layer-shell-v1.xml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@
9393
This event will be followed by a manage_start event after all other new
9494
state has been sent by the server.
9595
</description>
96-
<arg name="x" type="int"/>
97-
<arg name="y" type="int"/>
98-
<arg name="width" type="int"/>
99-
<arg name="height" type="int"/>
96+
<arg name="x" type="int" summary="global x coordinate"/>
97+
<arg name="y" type="int" summary="global y coordinate"/>
98+
<arg name="width" type="int" summary="area width"/>
99+
<arg name="height" type="int" summary="area height"/>
100100
</event>
101101
<request name="set_default">
102102
<description summary="Set default output for layer surfaces">
@@ -128,7 +128,7 @@
128128
</description>
129129
</request>
130130
<event name="focus_exclusive">
131-
<description summary="">
131+
<description summary="layer shell surface has exclusive focus">
132132
A layer shell surface will be given exclusive keyboard focus at the end
133133
of the manage sequence in which this event is sent. The window manager
134134
may want to update window decorations or similar to indicate that no
@@ -142,7 +142,7 @@
142142
</description>
143143
</event>
144144
<event name="focus_non_exclusive">
145-
<description summary="">
145+
<description summary="layer shell surface wants non-exclusive focus">
146146
A layer shell surface will be given non-exclusive keyboard focus at the
147147
end of the manage sequence in which this event is sent. The window
148148
manager may want to update window decorations or similar to indicate
@@ -153,12 +153,16 @@
153153
focus during the same manage sequence in which this event is sent, the
154154
layer surface will not be focused.
155155

156+
If the layer surface with non-exclusive focus is closed or the window
157+
manager chooses to move focus away from the layer surface, a focus_none
158+
event will be sent in the next manage sequence.
159+
156160
This event will be followed by a manage_start event after all other new
157161
state has been sent by the server.
158162
</description>
159163
</event>
160164
<event name="focus_none">
161-
<description summary="">
165+
<description summary="no layer shell surface has focus">
162166
No layer shell surface will have keyboard focus at the end of the manage
163167
sequence in which this event is sent. The window manager may want to
164168
return focus to whichever window last had focus, for example.

wl-proxy/src/protocols/river_layer_shell_v1/river_layer_shell_output_v1.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ impl RiverLayerShellOutputV1 {
132132
///
133133
/// # Arguments
134134
///
135-
/// - `x`:
136-
/// - `y`:
137-
/// - `width`:
138-
/// - `height`:
135+
/// - `x`: global x coordinate
136+
/// - `y`: global y coordinate
137+
/// - `width`: area width
138+
/// - `height`: area height
139139
#[inline]
140140
pub fn try_send_non_exclusive_area(
141141
&self,
@@ -204,10 +204,10 @@ impl RiverLayerShellOutputV1 {
204204
///
205205
/// # Arguments
206206
///
207-
/// - `x`:
208-
/// - `y`:
209-
/// - `width`:
210-
/// - `height`:
207+
/// - `x`: global x coordinate
208+
/// - `y`: global y coordinate
209+
/// - `width`: area width
210+
/// - `height`: area height
211211
#[inline]
212212
pub fn send_non_exclusive_area(
213213
&self,
@@ -345,10 +345,10 @@ pub trait RiverLayerShellOutputV1Handler: Any {
345345
///
346346
/// # Arguments
347347
///
348-
/// - `x`:
349-
/// - `y`:
350-
/// - `width`:
351-
/// - `height`:
348+
/// - `x`: global x coordinate
349+
/// - `y`: global y coordinate
350+
/// - `width`: area width
351+
/// - `height`: area height
352352
#[inline]
353353
fn handle_non_exclusive_area(
354354
&mut self,

wl-proxy/src/protocols/river_layer_shell_v1/river_layer_shell_seat_v1.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ impl RiverLayerShellSeatV1 {
118118
/// Since when the focus_exclusive message is available.
119119
pub const MSG__FOCUS_EXCLUSIVE__SINCE: u32 = 1;
120120

121+
/// layer shell surface has exclusive focus
121122
///
122123
/// A layer shell surface will be given exclusive keyboard focus at the end
123124
/// of the manage sequence in which this event is sent. The window manager
@@ -164,6 +165,7 @@ impl RiverLayerShellSeatV1 {
164165
Ok(())
165166
}
166167

168+
/// layer shell surface has exclusive focus
167169
///
168170
/// A layer shell surface will be given exclusive keyboard focus at the end
169171
/// of the manage sequence in which this event is sent. The window manager
@@ -189,6 +191,7 @@ impl RiverLayerShellSeatV1 {
189191
/// Since when the focus_non_exclusive message is available.
190192
pub const MSG__FOCUS_NON_EXCLUSIVE__SINCE: u32 = 1;
191193

194+
/// layer shell surface wants non-exclusive focus
192195
///
193196
/// A layer shell surface will be given non-exclusive keyboard focus at the
194197
/// end of the manage sequence in which this event is sent. The window
@@ -200,6 +203,10 @@ impl RiverLayerShellSeatV1 {
200203
/// focus during the same manage sequence in which this event is sent, the
201204
/// layer surface will not be focused.
202205
///
206+
/// If the layer surface with non-exclusive focus is closed or the window
207+
/// manager chooses to move focus away from the layer surface, a focus_none
208+
/// event will be sent in the next manage sequence.
209+
///
203210
/// This event will be followed by a manage_start event after all other new
204211
/// state has been sent by the server.
205212
#[inline]
@@ -237,6 +244,7 @@ impl RiverLayerShellSeatV1 {
237244
Ok(())
238245
}
239246

247+
/// layer shell surface wants non-exclusive focus
240248
///
241249
/// A layer shell surface will be given non-exclusive keyboard focus at the
242250
/// end of the manage sequence in which this event is sent. The window
@@ -248,6 +256,10 @@ impl RiverLayerShellSeatV1 {
248256
/// focus during the same manage sequence in which this event is sent, the
249257
/// layer surface will not be focused.
250258
///
259+
/// If the layer surface with non-exclusive focus is closed or the window
260+
/// manager chooses to move focus away from the layer surface, a focus_none
261+
/// event will be sent in the next manage sequence.
262+
///
251263
/// This event will be followed by a manage_start event after all other new
252264
/// state has been sent by the server.
253265
#[inline]
@@ -264,6 +276,7 @@ impl RiverLayerShellSeatV1 {
264276
/// Since when the focus_none message is available.
265277
pub const MSG__FOCUS_NONE__SINCE: u32 = 1;
266278

279+
/// no layer shell surface has focus
267280
///
268281
/// No layer shell surface will have keyboard focus at the end of the manage
269282
/// sequence in which this event is sent. The window manager may want to
@@ -306,6 +319,7 @@ impl RiverLayerShellSeatV1 {
306319
Ok(())
307320
}
308321

322+
/// no layer shell surface has focus
309323
///
310324
/// No layer shell surface will have keyboard focus at the end of the manage
311325
/// sequence in which this event is sent. The window manager may want to
@@ -357,6 +371,7 @@ pub trait RiverLayerShellSeatV1Handler: Any {
357371
}
358372
}
359373

374+
/// layer shell surface has exclusive focus
360375
///
361376
/// A layer shell surface will be given exclusive keyboard focus at the end
362377
/// of the manage sequence in which this event is sent. The window manager
@@ -383,6 +398,7 @@ pub trait RiverLayerShellSeatV1Handler: Any {
383398
}
384399
}
385400

401+
/// layer shell surface wants non-exclusive focus
386402
///
387403
/// A layer shell surface will be given non-exclusive keyboard focus at the
388404
/// end of the manage sequence in which this event is sent. The window
@@ -394,6 +410,10 @@ pub trait RiverLayerShellSeatV1Handler: Any {
394410
/// focus during the same manage sequence in which this event is sent, the
395411
/// layer surface will not be focused.
396412
///
413+
/// If the layer surface with non-exclusive focus is closed or the window
414+
/// manager chooses to move focus away from the layer surface, a focus_none
415+
/// event will be sent in the next manage sequence.
416+
///
397417
/// This event will be followed by a manage_start event after all other new
398418
/// state has been sent by the server.
399419
#[inline]
@@ -411,6 +431,7 @@ pub trait RiverLayerShellSeatV1Handler: Any {
411431
}
412432
}
413433

434+
/// no layer shell surface has focus
414435
///
415436
/// No layer shell surface will have keyboard focus at the end of the manage
416437
/// sequence in which this event is sent. The window manager may want to

0 commit comments

Comments
 (0)