config: change <cycleView*> to <windowSwitcher*>

Use `<windowSwitcher show="yes" preview="no" outlines="yes" />`
instead of

- `<cycleViewOSD>yes</cycleViewOSD>`
- `<cycleViewOutlines>yes</cycleViewOutlines>`
- `<cycleViewPreview>no</cycleViewPreview>`
This commit is contained in:
Johan Malm 2023-03-11 22:15:32 +00:00 committed by Consolatis
parent 50a6c78db0
commit e392eecce6
3 changed files with 25 additions and 12 deletions

View file

@ -77,17 +77,15 @@ 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><cycleViewOSD>* [yes|no] *<core><windowSwitcher show="" preview="" outlines="" />*
Draw the OSD when cycling between windows. *show* [yes|no] Draw the OnScreenDisplay when switching between
Default is yes. windows. Default is yes.
*<core><cycleViewPreview>* [yes|no] *preview* [yes|no] Preview the contents of the selected window when
Preview the contents of the selected window when cycling between windows. switching between windows. Default is no.
Default is no.
*<core><cycleViewOutlines>* [yes|no] *outlines* [yes|no] Draw an outline around the selected window when
Draw an outline around the selected window when cycling between windows. switching between windows. Default is yes.
Default is yes.
## RESISTANCE ## RESISTANCE

View file

@ -12,9 +12,7 @@
<gap>0</gap> <gap>0</gap>
<adaptiveSync>no</adaptiveSync> <adaptiveSync>no</adaptiveSync>
<reuseOutputMode>no</reuseOutputMode> <reuseOutputMode>no</reuseOutputMode>
<cycleViewOSD>yes</cycleViewOSD> <windowSwitcher show="yes" preview="no" outlines="yes" />
<cycleViewPreview>no</cycleViewPreview>
<cycleViewOutlines>yes</cycleViewOutlines>
</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 -->

View file

@ -442,12 +442,29 @@ entry(xmlNode *node, char *nodename, char *content)
rc.snap_edge_range = atoi(content); rc.snap_edge_range = atoi(content);
} else if (!strcasecmp(nodename, "topMaximize.snapping")) { } else if (!strcasecmp(nodename, "topMaximize.snapping")) {
rc.snap_top_maximize = get_bool(content); rc.snap_top_maximize = get_bool(content);
/* <windowSwitcher show="" preview="" outlines="" /> */
} else if (!strcasecmp(nodename, "show.windowSwitcher.core")) {
rc.cycle_view_osd = get_bool(content);
} else if (!strcasecmp(nodename, "preview.windowSwitcher.core")) {
rc.cycle_preview_contents = get_bool(content);
} else if (!strcasecmp(nodename, "outlines.windowSwitcher.core")) {
rc.cycle_preview_outlines = get_bool(content);
/* 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);
wlr_log(WLR_ERROR, "<cycleViewOSD> is deprecated."
" Use <windowSwitcher show=\"\" />");
} else if (!strcasecmp(nodename, "cycleViewPreview.core")) { } else if (!strcasecmp(nodename, "cycleViewPreview.core")) {
rc.cycle_preview_contents = get_bool(content); rc.cycle_preview_contents = get_bool(content);
wlr_log(WLR_ERROR, "<cycleViewPreview> is deprecated."
" Use <windowSwitcher preview=\"\" />");
} else if (!strcasecmp(nodename, "cycleViewOutlines.core")) { } else if (!strcasecmp(nodename, "cycleViewOutlines.core")) {
rc.cycle_preview_outlines = get_bool(content); rc.cycle_preview_outlines = get_bool(content);
wlr_log(WLR_ERROR, "<cycleViewOutlines> is deprecated."
" Use <windowSwitcher outlines=\"\" />");
} else if (!strcasecmp(nodename, "name.names.desktops")) { } else if (!strcasecmp(nodename, "name.names.desktops")) {
struct workspace *workspace = znew(*workspace); struct workspace *workspace = znew(*workspace);
workspace->name = xstrdup(content); workspace->name = xstrdup(content);