diff --git a/.gitmodules b/.gitmodules index 9edb2764371..1c0116081c5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,7 @@ [submodule "wayland-protocols-plasma/plasma-wayland-protocols"] path = wayland-protocols-plasma/plasma-wayland-protocols url = https://github.com/KDE/plasma-wayland-protocols.git +[submodule "wayland-protocols/wayland-protocols"] + path = wayland-protocols/protocols + url = git@gitlab.freedesktop.org:rano/wayland-protocols.git + branch = input-method-next diff --git a/wayland-protocols/protocols b/wayland-protocols/protocols index 6bcf87d9c17..46e621151f7 160000 --- a/wayland-protocols/protocols +++ b/wayland-protocols/protocols @@ -1 +1 @@ -Subproject commit 6bcf87d9c17a36bb56943efeb4cbb851bd3734b8 +Subproject commit 46e621151f701e0ee4572f7ba6a99b10ba60624f diff --git a/wayland-protocols/src/wp.rs b/wayland-protocols/src/wp.rs index 07635204ec9..7be16a41fc2 100644 --- a/wayland-protocols/src/wp.rs +++ b/wayland-protocols/src/wp.rs @@ -126,17 +126,25 @@ pub mod idle_inhibit { } } -#[cfg(feature = "unstable")] pub mod input_method { //! Input method protocol /// Unstable version 1 + #[cfg(feature = "unstable")] pub mod zv1 { wayland_protocol!( "./protocols/unstable/input-method/input-method-unstable-v1.xml", [] ); } + /// Staging version 3 + #[cfg(feature = "staging")] + pub mod v3 { + wayland_protocol!( + "./protocols/staging/input-method/input-method-v3.xml", + [crate::wp::text_input::v3, crate::xdg::shell] + ); + } } #[cfg(feature = "unstable")] @@ -441,11 +449,11 @@ pub mod tablet { } } -#[cfg(feature = "unstable")] pub mod text_input { //! Text input protocol /// Unstable version 1 + #[cfg(feature = "unstable")] pub mod zv1 { wayland_protocol!( "./protocols/unstable/text-input/text-input-unstable-v1.xml", @@ -454,12 +462,22 @@ pub mod text_input { } /// Unstable version 3 + #[cfg(feature = "unstable")] pub mod zv3 { wayland_protocol!( "./protocols/unstable/text-input/text-input-unstable-v3.xml", [] ); } + + /// Staging version 3.2 + #[cfg(feature = "staging")] + pub mod v3 { + wayland_protocol!( + "./protocols/staging/text-input/text-input-v3.xml", + [] + ); + } } pub mod viewporter {