Skip to content
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

Jump to bottom

Wayland: Implement text_input_v3 and xkb compose #11712

Merged
merged 9 commits into from
May 16, 2024
Merged

Wayland: Implement text_input_v3 and xkb compose #11712

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
76e13be
Wayland: Implement text_input_v3
XDeme1 May 11, 2024
672f2f7
Small update
XDeme1 May 11, 2024
5191ba2
Added support for xkb compose
XDeme1 May 12, 2024
e91f27b
Remove select text highlight
XDeme1 May 12, 2024
6587781
Reset compose state when keyboard focus is lost
XDeme1 May 12, 2024
8dd27d3
Small update
XDeme1 May 13, 2024
32f133d
Reset compose state on pointer click
XDeme1 May 13, 2024
9f70ff0
Remove Keyup Events
XDeme1 May 14, 2024
878f4d6
Unify handle_ime
XDeme1 May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions crates/gpui/src/platform/linux/wayland/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,9 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientStatePtr {
state.enter_token.take();

if let Some(window) = keyboard_focused_window {
if let Some(ref mut compose) = state.compose_state {
compose.reset();
}
state.pre_edit_text.take();
drop(state);
window.handle_ime_delete();
Expand Down Expand Up @@ -1197,6 +1200,13 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
}
match button_state {
wl_pointer::ButtonState::Pressed => {
if let Some(pre_edit) = state.pre_edit_text.take() {
XDeme1 marked this conversation as resolved.
Show resolved Hide resolved
if let Some(window) = state.keyboard_focused_window.clone() {
drop(state);
window.handle_ime_commit(pre_edit);
state = client.borrow_mut();
}
}
let click_elapsed = state.click.last_click.elapsed();

if click_elapsed < DOUBLE_CLICK_INTERVAL
Expand Down