mirror of
https://github.com/labwc/labwc.git
synced 2026-02-10 04:27:47 -05:00
cycle: support <action name="NextWindow" workspace="current|all">
This commit deprecates <windowSwitcher allWorkspaces="yes|no"> and adds per-action argument <action name="NextWindow" workspace="current|all">.
This commit is contained in:
parent
caa9b90e80
commit
a5c6ff499c
10 changed files with 78 additions and 35 deletions
|
|
@ -1269,10 +1269,16 @@ entry(xmlNode *node, char *nodename, char *content)
|
|||
} else if (!strcasecmp(nodename, "outlines.windowSwitcher")) {
|
||||
set_bool(content, &rc.window_switcher.outlines);
|
||||
} else if (!strcasecmp(nodename, "allWorkspaces.windowSwitcher")) {
|
||||
if (parse_bool(content, -1) == true) {
|
||||
rc.window_switcher.criteria &=
|
||||
~LAB_VIEW_CRITERIA_CURRENT_WORKSPACE;
|
||||
int ret = parse_bool(content, -1);
|
||||
if (ret < 0) {
|
||||
wlr_log(WLR_ERROR, "Invalid value for <windowSwitcher"
|
||||
" allWorkspaces=\"\">: '%s'", content);
|
||||
} else {
|
||||
rc.window_switcher.workspace_filter = ret ?
|
||||
CYCLE_WORKSPACE_ALL : CYCLE_WORKSPACE_CURRENT;
|
||||
}
|
||||
wlr_log(WLR_ERROR, "<windowSwitcher allWorkspaces=\"\" /> is deprecated."
|
||||
" Use <action name=\"NextWindow\" workspace=\"\"> instead.");
|
||||
} else if (!strcasecmp(nodename, "unshade.windowSwitcher")) {
|
||||
set_bool(content, &rc.window_switcher.unshade);
|
||||
|
||||
|
|
@ -1493,9 +1499,7 @@ rcxml_init(void)
|
|||
rc.window_switcher.preview = true;
|
||||
rc.window_switcher.outlines = true;
|
||||
rc.window_switcher.unshade = true;
|
||||
rc.window_switcher.criteria = LAB_VIEW_CRITERIA_CURRENT_WORKSPACE
|
||||
| LAB_VIEW_CRITERIA_ROOT_TOPLEVEL
|
||||
| LAB_VIEW_CRITERIA_NO_SKIP_WINDOW_SWITCHER;
|
||||
rc.window_switcher.workspace_filter = CYCLE_WORKSPACE_CURRENT;
|
||||
rc.window_switcher.order = WINDOW_SWITCHER_ORDER_FOCUS;
|
||||
|
||||
rc.resize_indicator = LAB_RESIZE_INDICATOR_NEVER;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue