mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-09 08:21:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge d43038b141 into e3c2412565

Browse source
This commit is contained in:
Milad Alizadeh 2026-01-29 15:41:33 -05:00 • committed by GitHub
commit aafe9f8542
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
sway/tree/workspace.c
View file

@ -201,9 +201,14 @@ static bool workspace_valid_on_output(const char *output_name,
return true; return true;
} }
// Match i3's behavior: a workspace is only valid on an output if that
// output is the first available choice in the workspace's output list.
for (int i = 0; i < wsc->outputs->length; i++) { for (int i = 0; i < wsc->outputs->length; i++) {
if (output_match_name_or_id(output, wsc->outputs->items[i])) { struct sway_output *first_available =
return true; output_by_name_or_id(wsc->outputs->items[i]);
if (first_available) {
// Found the first available output - valid only if it matches
return first_available == output;
} }
} }
@ -319,11 +324,21 @@ char *workspace_next_name(const char *output_name) {
continue; continue;
} }
bool found = false; bool found = false;
// Find the first available output for this workspace, matching i3's
// depth-first behavior: only select this workspace if the current
// output is the first available choice in its output list.
for (int j = 0; j < wsc->outputs->length; ++j) { for (int j = 0; j < wsc->outputs->length; ++j) {
if (output_match_name_or_id(output, wsc->outputs->items[j])) { struct sway_output *first_available =
found = true; output_by_name_or_id(wsc->outputs->items[j]);
free(target); if (first_available) {
target = strdup(wsc->workspace); // Found the first available output for this workspace
if (first_available == output) {
// Current output is the first choice - select this workspace
found = true;
free(target);
target = strdup(wsc->workspace);
}
// Always break: we only care about the first available output
break; break;
} }
} }