Skip to content

x11: don't panic in request_user_attention when WM-hints send fails #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
warp-agent-staging wants to merge 1 commit into
base: benchmark-run-97-trial-6858-attempt-1/01a0dac0-e5b0-7d21-913f-d853343a4ca8/winit-base-pin-a4e0ecb5
Choose a base branch
from
+6 −3
Draft

x11: don't panic in request_user_attention when WM-hints send fails #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/changelog/unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ changelog entry.
when not called from inside the event loop. Now queues a microtask instead.
- On Windows, prevent incorrect shifting when dragging window onto a monitor
with different DPI.
- On X11, don't panic in `Window::request_user_attention` when the connection
is dead; log the send failure and carry on.

### Removed

Expand Down
7 changes: 4 additions & 3 deletions src/platform_impl/linux/x11/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1814,9 +1814,10 @@ impl UnownedWindow {
.unwrap_or_default();

wm_hints.urgent = request_type.is_some();
wm_hints
.set(self.xconn.xcb_connection(), self.xwindow as xproto::Window)
.expect_then_ignore_error("Failed to set WM hints");
match wm_hints.set(self.xconn.xcb_connection(), self.xwindow as xproto::Window) {
Ok(cookie) => cookie.ignore_error(),
Err(e) => warn!("failed to send WM hints when requesting user attention: {e}"),
}
}

#[inline]
Expand Down
Loading