Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayland: Fix regression in dead keys caused by #12495 (#17465)

Browse source 
Related to
https://github.com/zed-industries/zed/pull/12495#issuecomment-2332414008

Release Notes:

- N/A
This commit is contained in:
Fernando Tagawa 2024-09-05 22:13:00 -03:00 • committed by GitHub
parent b623958b7a
commit 30f70ff110
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/gpui/src/platform/linux/wayland/client.rs
View file

@ -194,6 +194,7 @@ pub(crate) struct WaylandClientState {
primary_selection: Option<zwp_primary_selection_device_v1::ZwpPrimarySelectionDeviceV1>, primary_selection: Option<zwp_primary_selection_device_v1::ZwpPrimarySelectionDeviceV1>,
text_input: Option<zwp_text_input_v3::ZwpTextInputV3>, text_input: Option<zwp_text_input_v3::ZwpTextInputV3>,
pre_edit_text: Option<String>, pre_edit_text: Option<String>,
ime_pre_edit: Option<String>,
composing: bool, composing: bool,
// Surface to Window mapping // Surface to Window mapping
windows: HashMap<ObjectId, WaylandWindowStatePtr>, windows: HashMap<ObjectId, WaylandWindowStatePtr>,
@ -315,7 +316,7 @@ impl WaylandClientStatePtr {
pub fn update_ime_position(&self, bounds: Bounds<Pixels>) { pub fn update_ime_position(&self, bounds: Bounds<Pixels>) {
let client = self.get_client(); let client = self.get_client();
let mut state = client.borrow_mut(); let mut state = client.borrow_mut();
if state.composing || state.text_input.is_none() { if state.composing || state.text_input.is_none() || state.pre_edit_text.is_some() {
return; return;
} }
@ -518,6 +519,7 @@ impl WaylandClient {
primary_selection, primary_selection,
text_input: None, text_input: None,
pre_edit_text: None, pre_edit_text: None,
ime_pre_edit: None,
composing: false, composing: false,
outputs: HashMap::default(), outputs: HashMap::default(),
in_progress_outputs, in_progress_outputs,
@ -1223,13 +1225,13 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientStatePtr {
} }
xkb::Status::Cancelled => { xkb::Status::Cancelled => {
let pre_edit = state.pre_edit_text.take(); let pre_edit = state.pre_edit_text.take();
let new_pre_edit = Keystroke::underlying_dead_key(keysym);
state.pre_edit_text = new_pre_edit.clone();
drop(state); drop(state);
if let Some(pre_edit) = pre_edit { if let Some(pre_edit) = pre_edit {
focused_window.handle_ime(ImeInput::InsertText(pre_edit)); focused_window.handle_ime(ImeInput::InsertText(pre_edit));
} }
if let Some(current_key) = if let Some(current_key) = new_pre_edit {
Keystroke::underlying_dead_key(keysym)
{
focused_window focused_window
.handle_ime(ImeInput::SetMarkedText(current_key)); .handle_ime(ImeInput::SetMarkedText(current_key));
} }
@ -1347,7 +1349,7 @@ impl Dispatch<zwp_text_input_v3::ZwpTextInputV3, ()> for WaylandClientStatePtr {
} }
zwp_text_input_v3::Event::PreeditString { text, .. } => { zwp_text_input_v3::Event::PreeditString { text, .. } => {
state.composing = true; state.composing = true;
state.pre_edit_text = text; state.ime_pre_edit = text;
} }
zwp_text_input_v3::Event::Done { serial } => { zwp_text_input_v3::Event::Done { serial } => {
let last_serial = state.serial_tracker.get(SerialKind::InputMethod); let last_serial = state.serial_tracker.get(SerialKind::InputMethod);
@ -1356,7 +1358,7 @@ impl Dispatch<zwp_text_input_v3::ZwpTextInputV3, ()> for WaylandClientStatePtr {
return; return;
}; };
if let Some(text) = state.pre_edit_text.take() { if let Some(text) = state.ime_pre_edit.take() {
drop(state); drop(state);
window.handle_ime(ImeInput::SetMarkedText(text)); window.handle_ime(ImeInput::SetMarkedText(text));
if let Some(area) = window.get_ime_area() { if let Some(area) = window.get_ime_area() {

4
crates/gpui/src/platform/linux/wayland/window.rs
View file

@ -1012,9 +1012,7 @@ impl PlatformWindow for WaylandWindow {
fn update_ime_position(&self, bounds: Bounds<Pixels>) { fn update_ime_position(&self, bounds: Bounds<Pixels>) {
let state = self.borrow(); let state = self.borrow();
let client = state.client.clone(); state.client.update_ime_position(bounds);
drop(state);
client.update_ime_position(bounds);
} }
fn gpu_specs(&self) -> Option<GPUSpecs> { fn gpu_specs(&self) -> Option<GPUSpecs> {