Skip to content

fix: switch outputs at workspace boundaries instead of wrapping #2023

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
mdurepos wants to merge 2 commits into
base: master
Choose a base branch
from
+62 −33
Open

fix: switch outputs at workspace boundaries instead of wrapping #2023

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b3ed56
fix: switch outputs at workspace boundaries instead of wrapping
mdurepos Jan 25, 2026
cad9e1b
Merge branch 'master' into fix/workspace-output-switching
mdurepos Jan 26, 2026
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
95 changes: 62 additions & 33 deletions src/input/actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,15 +209,35 @@ impl State {
if next.is_err() {
if propagate {
if let Some(inferred) = pattern.inferred_direction() {
self.handle_shortcut_action(
Action::SwitchOutput(inferred),
seat,
serial,
time,
pattern,
direction,
true,
)
// Check if there's an output to switch to in this direction
let has_output = self
.common
.shell
.read()
.next_output(&seat.active_output(), inferred)
.is_some();
if has_output {
self.handle_shortcut_action(
Action::SwitchOutput(inferred),
seat,
serial,
time,
pattern,
direction,
true,
)
} else {
// No output in that direction, wrap to first workspace
self.handle_shortcut_action(
Action::Workspace(1),
seat,
serial,
time,
pattern,
direction,
false,
)
}
};
} else {
self.handle_shortcut_action(
Expand Down Expand Up @@ -255,15 +275,35 @@ impl State {
if previous.is_err() {
if propagate {
if let Some(inferred) = pattern.inferred_direction() {
self.handle_shortcut_action(
Action::SwitchOutput(inferred),
seat,
serial,
time,
pattern,
direction,
true,
)
// Check if there's an output to switch to in this direction
let has_output = self
.common
.shell
.read()
.next_output(&seat.active_output(), inferred)
.is_some();
if has_output {
self.handle_shortcut_action(
Action::SwitchOutput(inferred),
seat,
serial,
time,
pattern,
direction,
true,
)
} else {
// No output in that direction, wrap to last workspace
self.handle_shortcut_action(
Action::LastWorkspace,
seat,
serial,
time,
pattern,
direction,
false,
)
}
};
} else {
self.handle_shortcut_action(
Expand Down Expand Up @@ -1109,12 +1149,10 @@ fn to_next_workspace(
) -> Result<Point<i32, Global>, InvalidWorkspaceIndex> {
let current_output = seat.active_output();
let active = shell.workspaces.active_num(&current_output).1;
let mut workspace = active.checked_add(1).ok_or(InvalidWorkspaceIndex)?;
let workspace = active.checked_add(1).ok_or(InvalidWorkspaceIndex)?;

// Don't wrap around - return error at boundary so we can switch outputs instead
if workspace >= shell.workspaces.len(&current_output) {
workspace = 0;
}
if workspace == active {
return Err(InvalidWorkspaceIndex);
}

Expand All @@ -1138,17 +1176,8 @@ fn to_previous_workspace(
) -> Result<Point<i32, Global>, InvalidWorkspaceIndex> {
let current_output = seat.active_output();
let active = shell.workspaces.active_num(&current_output).1;
let workspace = active.checked_sub(1).unwrap_or(
shell
.workspaces
.len(&current_output)
.checked_sub(1)
.ok_or(InvalidWorkspaceIndex)?,
);

if workspace == active {
return Err(InvalidWorkspaceIndex);
}
// Don't wrap around - return error at boundary so we can switch outputs instead
let workspace = active.checked_sub(1).ok_or(InvalidWorkspaceIndex)?;

shell.activate(
&current_output,
Expand Down