Skip to content

input-method-next #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −3
Draft

input-method-next #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [email protected]:rano/wayland-protocols.git
branch = input-method-next
2 changes: 1 addition & 1 deletion wayland-protocols/protocols
Open in desktop
Submodule protocols updated from 6bcf87 to 46e621
22 changes: 20 additions & 2 deletions wayland-protocols/src/wp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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",
Expand All @@ -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 {
Expand Down
Loading