leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayland/activation: Fix requests without active outputs

Browse source
This commit is contained in:
Victoria Brekenfeld 2026-06-11 17:09:58 +02:00 • committed by Victoria Brekenfeld
parent 296b6bee23
commit 106b50293b
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/wayland/handlers/xdg_activation.rs
View file

@ -21,6 +21,10 @@ pub enum ActivationContext {
Workspace(WorkspaceHandle), Workspace(WorkspaceHandle),
} }
// It may happen that we get activation-requests, while all outputs are disabled.
// In these cases we won't be able to determine workspaces for windows and thus
// need to handle the corresponding code paths defensively.
impl XdgActivationHandler for State { impl XdgActivationHandler for State {
fn activation_state(&mut self) -> &mut XdgActivationState { fn activation_state(&mut self) -> &mut XdgActivationState {
&mut self.common.xdg_activation_state &mut self.common.xdg_activation_state
@ -52,7 +56,12 @@ impl XdgActivationHandler for State {
}); });
let output = seat.active_output(); let output = seat.active_output();
let mut shell = self.common.shell.write(); let mut shell = self.common.shell.write();
let workspace = shell.active_space_mut(&output).unwrap(); let Some(workspace) = shell.active_space_mut(&output) else {
debug!(?token, "created urgent token for privileged client");
data.user_data
.insert_if_missing(move || ActivationContext::UrgentOnly);
return true;
};
let handle = workspace.handle; let handle = workspace.handle;
data.user_data data.user_data
.insert_if_missing(move || ActivationContext::Workspace(handle)); .insert_if_missing(move || ActivationContext::Workspace(handle));
@ -86,7 +95,11 @@ impl XdgActivationHandler for State {
if valid { if valid {
let output = seat.active_output(); let output = seat.active_output();
let mut shell = self.common.shell.write(); let mut shell = self.common.shell.write();
let workspace = shell.active_space_mut(&output).unwrap(); let Some(workspace) = shell.active_space_mut(&output) else {
data.user_data
.insert_if_missing(|| ActivationContext::UrgentOnly);
return true;
};
let handle = workspace.handle; let handle = workspace.handle;
data.user_data data.user_data
.insert_if_missing(move || ActivationContext::Workspace(handle)); .insert_if_missing(move || ActivationContext::Workspace(handle));
@ -128,7 +141,6 @@ impl XdgActivationHandler for State {
let Some((target_workspace, _)) = shell.workspace_for_surface(&surface) let Some((target_workspace, _)) = shell.workspace_for_surface(&surface)
else { else {
// surface not found, maybe log warning?
return; return;
}; };