alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-11 13:31:29 +11:00
Code Issues Packages Projects Releases Wiki Activity

On X11, don't panic when getting EINTR

Browse source 
Fixes #1972.
This commit is contained in:
mahkoh 2021-11-20 01:24:45 +01:00 committed by GitHub
parent f2de8475fc
commit e9d5b2007a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -23,6 +23,7 @@
- On macOS, fix native file dialogs hanging the event loop. - On macOS, fix native file dialogs hanging the event loop.
- On Wayland, implement a workaround for wrong configure size when using `xdg_decoration` in `kwin_wayland` - On Wayland, implement a workaround for wrong configure size when using `xdg_decoration` in `kwin_wayland`
- On macOS, fix an issue that prevented the menu bar from showing in borderless fullscreen mode. - On macOS, fix an issue that prevented the menu bar from showing in borderless fullscreen mode.
- On X11, EINTR while polling for events no longer causes a panic. Instead it will be treated as a spurious wakeup.
# 0.25.0 (2021-05-15) # 0.25.0 (2021-05-15)

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

@ -360,7 +360,11 @@ impl<T: 'static> EventLoop<T> {
// If the XConnection already contains buffered events, we don't // If the XConnection already contains buffered events, we don't
// need to wait for data on the socket. // need to wait for data on the socket.
if !self.event_processor.poll() { if !self.event_processor.poll() {
self.poll.poll(&mut events, timeout).unwrap(); if let Err(e) = self.poll.poll(&mut events, timeout) {
if e.raw_os_error() != Some(libc::EINTR) {
panic!("epoll returned an error: {:?}", e);
}
}
events.clear(); events.clear();
} }