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

simplify output priority check

Browse source
This commit is contained in:
Milad Alizadeh 2026-02-20 21:49:14 +00:00 • committed by Kenny Levinsen
parent 99e17d5efb
commit f66b69762d
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sway/tree/workspace.c
View file

@ -202,11 +202,10 @@ static bool workspace_valid_on_output(const char *output_name,
} }
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 *ws_output =
return true; output_by_name_or_id(wsc->outputs->items[i]);
} if (ws_output) {
if (output_by_name_or_id(wsc->outputs->items[i])) { return ws_output == output;
return false; // a higher-priority output is available
} }
} }
@ -323,14 +322,15 @@ char *workspace_next_name(const char *output_name) {
} }
bool found = false; bool found = false;
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 *ws_output =
output_by_name_or_id(wsc->outputs->items[j]);
if (ws_output) {
if (ws_output == output) {
found = true; found = true;
free(target); free(target);
target = strdup(wsc->workspace); target = strdup(wsc->workspace);
break;
} }
if (output_by_name_or_id(wsc->outputs->items[j])) { break;
break; // a higher-priority output is available
} }
} }
if (found) { if (found) {