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

On X11, fix error propagation in EventLoop::new

Browse source 
Fixes #3350.
This commit is contained in:
Kirill Chibisov 2024-01-05 08:33:23 +04:00 • committed by GitHub
parent dd127463c5
commit 021fd23c34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -11,6 +11,7 @@ Unreleased` header.
# Unreleased # Unreleased
- On X11, fix `NotSupported` error not propagated when creating event loop.
- On Wayland, fix resize not issued when scale changes - On Wayland, fix resize not issued when scale changes
- On X11 and Wayland, fix arrow up on keypad reported as `ArrowLeft`. - On X11 and Wayland, fix arrow up on keypad reported as `ArrowLeft`.
- On Windows, macOS, X11, Wayland and Web, implement setting images as cursors. See the `custom_cursors.rs` example. - On Windows, macOS, X11, Wayland and Web, implement setting images as cursors. See the `custom_cursors.rs` example.

6
src/platform_impl/linux/mod.rs
View file

@ -756,7 +756,7 @@ impl<T: 'static> EventLoop<T> {
#[cfg(wayland_platform)] #[cfg(wayland_platform)]
Backend::Wayland => EventLoop::new_wayland_any_thread().map_err(Into::into), Backend::Wayland => EventLoop::new_wayland_any_thread().map_err(Into::into),
#[cfg(x11_platform)] #[cfg(x11_platform)]
Backend::X => Ok(EventLoop::new_x11_any_thread().unwrap()), Backend::X => EventLoop::new_x11_any_thread().map_err(Into::into),
} }
} }
@ -766,10 +766,10 @@ impl<T: 'static> EventLoop<T> {
} }
#[cfg(x11_platform)] #[cfg(x11_platform)]
fn new_x11_any_thread() -> Result<EventLoop<T>, XNotSupported> { fn new_x11_any_thread() -> Result<EventLoop<T>, EventLoopError> {
let xconn = match X11_BACKEND.lock().unwrap().as_ref() { let xconn = match X11_BACKEND.lock().unwrap().as_ref() {
Ok(xconn) => xconn.clone(), Ok(xconn) => xconn.clone(),
Err(err) => return Err(err.clone()), Err(_) => return Err(EventLoopError::NotSupported(NotSupportedError::new())),
}; };
Ok(EventLoop::X(x11::EventLoop::new(xconn))) Ok(EventLoop::X(x11::EventLoop::new(xconn)))