Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rust-windowing/winit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6a726877491abd01182354d2f4a433e0241c9b6e
Choose a base ref
..
head repository: rust-windowing/winit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 871242dc780fc4471e0d8827b373d42003a4069a
Choose a head ref
Showing with 2 additions and 1 deletion.
  1. +1 −1 src/platform_impl/linux/x11/event_processor.rs
  2. +1 −0 src/platform_impl/linux/x11/ime.rs
2 changes: 1 addition & 1 deletion src/platform_impl/linux/x11/event_processor.rs
Original file line number Diff line number Diff line change
@@ -1283,7 +1283,7 @@ impl<T: 'static> EventProcessor<T> {

// Handle IME requests.
if let Some(ime) = wt.ime.as_ref() {
if let Some(ime_request) = wt.ime_receiver.try_recv().ok() {
if let Ok(ime_request) = wt.ime_receiver.try_recv() {
match ime_request {
ImeRequest::Position(window_id, x, y) => {
ime.set_spot(&wt.xconn, window_id, x, y)
1 change: 1 addition & 0 deletions src/platform_impl/linux/x11/ime.rs
Original file line number Diff line number Diff line change
@@ -163,6 +163,7 @@ impl IcData {

impl ImeData {
/// Create a new `ImeData`.
#[allow(clippy::never_loop)]
pub(super) fn new(xconn: &Arc<XConnection>, screen: usize) -> Result<Self, ClientError> {
// IM servers to try, in order:
// - None, which defaults to the environment variable `XMODIFIERS` in xim's impl.