Skip to content

Commit 72774dd

Browse files
committed
input-method-next
1 parent c65ff18 commit 72774dd

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@
77
[submodule "wayland-protocols-plasma/plasma-wayland-protocols"]
88
path = wayland-protocols-plasma/plasma-wayland-protocols
99
url = https://github.com/KDE/plasma-wayland-protocols.git
10+
[submodule "wayland-protocols/wayland-protocols"]
11+
path = wayland-protocols/protocols
12+
url = [email protected]:rano/wayland-protocols.git
13+
branch = input-method-next

wayland-protocols/protocols

Submodule protocols updated from 6bcf87d to 46e6211

wayland-protocols/src/wp.rs

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,17 +126,25 @@ pub mod idle_inhibit {
126126
}
127127
}
128128

129-
#[cfg(feature = "unstable")]
130129
pub mod input_method {
131130
//! Input method protocol
132131
133132
/// Unstable version 1
133+
#[cfg(feature = "unstable")]
134134
pub mod zv1 {
135135
wayland_protocol!(
136136
"./protocols/unstable/input-method/input-method-unstable-v1.xml",
137137
[]
138138
);
139139
}
140+
/// Staging version 3
141+
#[cfg(feature = "staging")]
142+
pub mod v3 {
143+
wayland_protocol!(
144+
"./protocols/staging/input-method/input-method-v3.xml",
145+
[crate::wp::text_input::v3, crate::xdg::shell]
146+
);
147+
}
140148
}
141149

142150
#[cfg(feature = "unstable")]
@@ -441,11 +449,11 @@ pub mod tablet {
441449
}
442450
}
443451

444-
#[cfg(feature = "unstable")]
445452
pub mod text_input {
446453
//! Text input protocol
447454
448455
/// Unstable version 1
456+
#[cfg(feature = "unstable")]
449457
pub mod zv1 {
450458
wayland_protocol!(
451459
"./protocols/unstable/text-input/text-input-unstable-v1.xml",
@@ -454,12 +462,22 @@ pub mod text_input {
454462
}
455463

456464
/// Unstable version 3
465+
#[cfg(feature = "unstable")]
457466
pub mod zv3 {
458467
wayland_protocol!(
459468
"./protocols/unstable/text-input/text-input-unstable-v3.xml",
460469
[]
461470
);
462471
}
472+
473+
/// Staging version 3.2
474+
#[cfg(feature = "staging")]
475+
pub mod v3 {
476+
wayland_protocol!(
477+
"./protocols/staging/text-input/text-input-v3.xml",
478+
[]
479+
);
480+
}
463481
}
464482

465483
pub mod viewporter {

0 commit comments

Comments
 (0)