config: make <windowSwitcher> a toplevel element

...rather than a child of <core>
This commit is contained in:
Johan Malm 2023-04-19 14:34:41 +01:00 committed by Johan Malm
parent 5744bba849
commit 36849eb7ef
3 changed files with 12 additions and 5 deletions

View file

@ -77,7 +77,9 @@ The rest of this man page describes configuration options.
be used with labwc the preferred mode of the monitor is used instead. be used with labwc the preferred mode of the monitor is used instead.
Default is no. Default is no.
*<core><windowSwitcher show="" preview="" outlines="" />* ## WINDOW SWITCHER
*<windowSwitcher show="" preview="" outlines="">*
*show* [yes|no] Draw the OnScreenDisplay when switching between *show* [yes|no] Draw the OnScreenDisplay when switching between
windows. Default is yes. windows. Default is yes.

View file

@ -12,7 +12,6 @@
<gap>0</gap> <gap>0</gap>
<adaptiveSync>no</adaptiveSync> <adaptiveSync>no</adaptiveSync>
<reuseOutputMode>no</reuseOutputMode> <reuseOutputMode>no</reuseOutputMode>
<windowSwitcher show="yes" preview="yes" outlines="yes" />
</core> </core>
<!-- <font><theme> can be defined without an attribute to set all places --> <!-- <font><theme> can be defined without an attribute to set all places -->
@ -39,6 +38,8 @@
</font> </font>
</theme> </theme>
<windowSwitcher show="yes" preview="yes" outlines="yes" />
<!-- edge strength is in pixels --> <!-- edge strength is in pixels -->
<resistance> <resistance>
<screenEdgeStrength>20</screenEdgeStrength> <screenEdgeStrength>20</screenEdgeStrength>

View file

@ -437,13 +437,17 @@ entry(xmlNode *node, char *nodename, char *content)
rc.snap_top_maximize = get_bool(content); rc.snap_top_maximize = get_bool(content);
/* <windowSwitcher show="" preview="" outlines="" /> */ /* <windowSwitcher show="" preview="" outlines="" /> */
} else if (!strcasecmp(nodename, "show.windowSwitcher.core")) { } else if (!strcasecmp(nodename, "show.windowSwitcher")) {
rc.cycle_view_osd = get_bool(content); rc.cycle_view_osd = get_bool(content);
} else if (!strcasecmp(nodename, "preview.windowSwitcher.core")) { } else if (!strcasecmp(nodename, "preview.windowSwitcher")) {
rc.cycle_preview_contents = get_bool(content); rc.cycle_preview_contents = get_bool(content);
} else if (!strcasecmp(nodename, "outlines.windowSwitcher.core")) { } else if (!strcasecmp(nodename, "outlines.windowSwitcher")) {
rc.cycle_preview_outlines = get_bool(content); rc.cycle_preview_outlines = get_bool(content);
/* Remove this long term - just a friendly warning for now */
} else if (strstr(nodename, "windowswitcher.core")) {
wlr_log(WLR_ERROR, "<windowSwitcher> should not be child of <core>");
/* The following three are for backward compatibility only */ /* The following three are for backward compatibility only */
} else if (!strcasecmp(nodename, "cycleViewOSD.core")) { } else if (!strcasecmp(nodename, "cycleViewOSD.core")) {
rc.cycle_view_osd = get_bool(content); rc.cycle_view_osd = get_bool(content);