leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

On X11, fix crash when can't disable IME

Browse source 
Fixes #2402.
This commit is contained in:
Kirill Chibisov 2022-07-30 17:15:57 +03:00 • committed by GitHub
parent bf537009d9
commit 95246d81c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/platform_impl/linux/x11/ime/mod.rs
View file

@ -120,7 +120,33 @@ impl Ime {
// Create empty entry in map, so that when IME is rebuilt, this window has a context.
None
} else {
let event = if with_preedit {
let context = unsafe {
ImeContext::new(
&self.inner.xconn,
self.inner.im,
window,
None,
with_preedit,
self.inner.event_sender.clone(),
)
.or_else(|_| {
debug!(
"failed to create an IME context {} preedit support",
if with_preedit { "with" } else { "without" }
);
ImeContext::new(
&self.inner.xconn,
self.inner.im,
window,
None,
!with_preedit,
self.inner.event_sender.clone(),
)
})
}?;
// Check the state on the context, since it could fail to enable or disable preedit.
let event = if context.is_allowed {
ImeEvent::Enabled
} else {
// There's no IME without preedit.
@ -132,16 +158,7 @@ impl Ime {
.send((window, event))
.expect("Failed to send enabled event");
Some(unsafe {
ImeContext::new(
&self.inner.xconn,
self.inner.im,
window,
None,
with_preedit,
self.inner.event_sender.clone(),
)
}?)
Some(context)
};
self.inner.contexts.insert(window, context);
Ok(!self.is_destroyed())