leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Implement IME-related methods of SctkWinitWindow for apps using single-instance feature

Browse source 
- At least, following apps are using `single-instance` feature:
  - cosmic-launcher
  - cosmic-app-library
- Once libcosmic text widgets supported the IME, these apps start hitting following methods of SctkWinitWindow which is `todo!()` and will crash at startup:
  - `set_ime_cursor_area()`
  - `set_ime_allowed()`
  - `set_ime_purpose()`
- So, this PR implements these method utilizing following wayland protocols.
  - zwp_text_input_v3
  - zwp_text_input_manager_v3
This commit is contained in:
KENZ 2026-01-24 07:26:34 +09:00 • committed by Ashley Wulber
parent e4da5002ae
commit d0ef1f9e85
7 changed files with 217 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

37
winit/src/platform_specific/wayland/event_loop/mod.rs
View file

@ -7,7 +7,7 @@ use crate::platform_specific::SurfaceIdWrapper;
use crate::{
Control,
futures::futures::channel::mpsc,
handlers::overlap::OverlapNotifyV1,
handlers::{overlap::OverlapNotifyV1, text_input::TextInputManager},
platform_specific::wayland::{
handlers::{
wp_fractional_scaling::FractionalScalingManager,
@ -52,8 +52,8 @@ use std::{
use log::error;
use wayland_backend::client::Backend;
use wayland_client::globals::GlobalError;
use wayland_protocols::wp::keyboard_shortcuts_inhibit::zv1::client::zwp_keyboard_shortcuts_inhibit_manager_v1;
use winit::{dpi::LogicalSize, event_loop::OwnedDisplayHandle};
use wayland_protocols::wp::{keyboard_shortcuts_inhibit::zv1::client::zwp_keyboard_shortcuts_inhibit_manager_v1, text_input::zv3::client::zwp_text_input_v3::{ContentHint, ContentPurpose}};
use winit::{dpi::LogicalSize, event_loop::OwnedDisplayHandle, window::ImePurpose};
use self::state::SctkState;
@ -197,6 +197,33 @@ impl SctkEventLoop {
crate::platform_specific::Action::Dropped(id) => {
_ = state.destroyed.remove(&id.inner());
}
crate::platform_specific::Action::SetImeAllowed(allowed) => {
if let Some(text_input) = state.text_input.as_ref() {
if allowed {
text_input.enable();
} else {
text_input.disable();
}
text_input.commit();
}
}
crate::platform_specific::Action::SetImeCursorArea(x, y, width, height) => {
if let Some(text_input) = state.text_input.as_ref() {
text_input.set_cursor_rectangle(x, y, width, height);
text_input.commit();
}
}
crate::platform_specific::Action::SetImePurpose(purpose) => {
if let Some(text_input) = state.text_input.as_ref() {
let (hint, purpose) = match purpose {
ImePurpose::Password => (ContentHint::SensitiveData, ContentPurpose::Password),
ImePurpose::Terminal => (ContentHint::None, ContentPurpose::Terminal),
_ => (ContentHint::None, ContentPurpose::Normal),
};
text_input.set_content_type(hint, purpose);
text_input.commit();
}
}
crate::platform_specific::Action::SubsurfaceResize(id, size) => {
// reposition the surface
if let Some(pos) = state
@ -332,6 +359,7 @@ impl SctkEventLoop {
1..=1,
(),
).ok(),
text_input_manager: TextInputManager::try_new(&registry_state, &qh),
registry_state,
queue_handle: qh,
@ -366,6 +394,9 @@ impl SctkEventLoop {
overlap_notifications: HashMap::new(),
subsurface_state: None,
pending_corner_radius: HashMap::new(),
text_input: None,
preedit: None,
pending_commit: None,
},
_features: Default::default(),
};