From 50a0602b7a8759f774163d2cc9ee0b3fb8bed841 Mon Sep 17 00:00:00 2001 From: Samet Aylak Date: Sun, 2 Nov 2025 12:14:19 -0500 Subject: [PATCH] Change `allOutputs` default to "yes" Changes the default behavior to show windows from all outputs instead of only the cursor's output. - Updated default value in documentation from "no" to "yes" - Inverted parsing logic: allOutputs="no" now enables output filtering - Removed LAB_VIEW_CRITERIA_CURSOR_OUTPUT from default criteria flags Users who prefer the previous behavior (output filtering) can now set allOutputs="no" in their configuration. --- docs/labwc-config.5.scd | 5 ++--- docs/rc.xml.all | 6 +++--- src/config/rcxml.c | 7 +++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd index fd87e5cd..793a5854 100644 --- a/docs/labwc-config.5.scd +++ b/docs/labwc-config.5.scd @@ -339,7 +339,7 @@ this is for compatibility with Openbox. ## WINDOW SWITCHER ``` - + @@ -367,8 +367,7 @@ this is for compatibility with Openbox. are shown). *allOutputs* [yes|no] Show windows regardless of what output - they are on. Default no (that is only windows on the cursor output - are shown). + they are on. Default yes. *unshade* [yes|no] Temporarily unshade windows when switching between them and permanently unshade on the final selection. Default is yes. diff --git a/docs/rc.xml.all b/docs/rc.xml.all index d55ad754..136b6cd4 100644 --- a/docs/rc.xml.all +++ b/docs/rc.xml.all @@ -78,7 +78,7 @@ + outlines="yes" allWorkspaces="no" allOutputs="yes" unshade="yes"> @@ -98,7 +98,7 @@ Some contents are fixed-length and others are variable-length. See "man 5 labwc-config" for details. - + @@ -118,7 +118,7 @@ then workspace name, then identifier/app-id, then the window title. It uses 100% of OSD window width. - + diff --git a/src/config/rcxml.c b/src/config/rcxml.c index 46519362..ff73e04f 100644 --- a/src/config/rcxml.c +++ b/src/config/rcxml.c @@ -1218,9 +1218,9 @@ entry(xmlNode *node, char *nodename, char *content) ~LAB_VIEW_CRITERIA_CURRENT_WORKSPACE; } } else if (!strcasecmp(nodename, "allOutputs.windowSwitcher")) { - if (parse_bool(content, -1) == true) { - rc.window_switcher.criteria &= - ~LAB_VIEW_CRITERIA_CURSOR_OUTPUT; + if (parse_bool(content, -1) == false) { + rc.window_switcher.criteria |= + LAB_VIEW_CRITERIA_CURSOR_OUTPUT; } } else if (!strcasecmp(nodename, "unshade.windowSwitcher")) { set_bool(content, &rc.window_switcher.unshade); @@ -1438,7 +1438,6 @@ rcxml_init(void) rc.window_switcher.outlines = true; rc.window_switcher.unshade = true; rc.window_switcher.criteria = LAB_VIEW_CRITERIA_CURRENT_WORKSPACE - | LAB_VIEW_CRITERIA_CURSOR_OUTPUT | LAB_VIEW_CRITERIA_ROOT_TOPLEVEL | LAB_VIEW_CRITERIA_NO_SKIP_WINDOW_SWITCHER;