Skip to content

fix(engine): mitigate focus corruption from boundary raise races #355

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

Open
qeude wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(engine): mitigate focus corruption from boundary raise races #355

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
18 changes: 12 additions & 6 deletions src/layout_engine/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ impl LayoutEngine {
{
let response = EventResponse {
focus_window: Some(fallback_focus),
raise_windows: visible_windows,
raise_windows: vec![],
boundary_hit: None,
};
self.apply_focus_response(space, ws_id, layout, &response);
Expand Down Expand Up @@ -1279,19 +1279,25 @@ impl LayoutEngine {
self.remove_window_internal(wid, true);
}
LayoutEvent::WindowFocused(space, wid) => {
self.focused_window = Some(wid);
if self.floating.is_floating(wid) {
self.focused_window = Some(wid);
self.floating.set_last_focus(Some(wid));
} else {
let Some((ws_id, layout)) = self.workspace_and_layout(space) else {
} else if let Some((ws_id, layout)) = self.workspace_and_layout(space) {
if !self.workspace_tree(ws_id).contains_window(layout, wid) {
warn!(
"No active workspace/layout for focused window {:?} on space {:?}",
"WindowFocused ignored: wid={:?} not in active layout for space {:?}",
wid, space
);
return EventResponse::default();
};
}
self.focused_window = Some(wid);
let _ = self.workspace_tree_mut(ws_id).select_window(layout, wid);
self.virtual_workspace_manager.set_last_focused_window(space, ws_id, Some(wid));
} else {
warn!(
"No active workspace/layout for focused window {:?} on space {:?}",
wid, space
);
}
}
LayoutEvent::WindowResized {
Expand Down