mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-09 10:07:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cycle: update config to <osd output="all|cursor|focused">

Browse source 
I think `<windowSwitcher><osd output="keyboard">` is a bit unclear and
hard to interpret as "show OSD in the output with keyboard focus". Also,
we use "cursor" instead of "pointer" in other configurations like
`<placement policy="cursor">` and `<action name="ShowMenu" atCursor="">`.

So let's replace `output="all|pointer|keyboard"` with
`output="all|cursor|focused"`. In documentation, I reordered them to
`output="all|focused|cursor"` as "focused" feels like a bit more
sophisticated and general policy.
This commit is contained in:
tokyo4j 2025-12-03 00:41:04 +09:00 • committed by Consolatis
parent 71d29cbebb
commit c4277ab507
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/labwc-config.5.scd
View file

@ -371,10 +371,10 @@ this is for compatibility with Openbox.
"classic" displays window information like icons and titles in a vertical list.
"thumbnail" shows window thumbnail, icon and title in grids.
*output* [all|pointer|keyboard] Configures which monitor(s) show the OSD.
*output* [all|focused|cursor] Configures which monitor(s) show the OSD.
"all" displays the OSD on all monitors.
"pointer" displays the OSD on the monitor containing the mouse pointer.
"keyboard" displays the OSD on the monitor with keyboard focus.
"focused" displays the OSD on the monitor with keyboard focus.
"cursor" displays the OSD on the monitor containing the mouse pointer.
Default is "all".
*thumbnailLabelFormat* Format to be used for the thumbnail label according to *custom*

4
include/config/types.h
View file

@ -114,8 +114,8 @@ enum cycle_osd_style {
enum cycle_osd_output_criteria {
CYCLE_OSD_OUTPUT_ALL,
CYCLE_OSD_OUTPUT_POINTER,
CYCLE_OSD_OUTPUT_KEYBOARD,
CYCLE_OSD_OUTPUT_CURSOR,
CYCLE_OSD_OUTPUT_FOCUSED,
};
#endif /* LABWC_CONFIG_TYPES_H */

10
src/config/rcxml.c
View file

@ -1222,13 +1222,13 @@ entry(xmlNode *node, char *nodename, char *content)
} else if (!strcasecmp(nodename, "output.osd.windowSwitcher")) {
if (!strcasecmp(content, "all")) {
rc.window_switcher.output_criteria = CYCLE_OSD_OUTPUT_ALL;
} else if (!strcasecmp(content, "pointer")) {
rc.window_switcher.output_criteria = CYCLE_OSD_OUTPUT_POINTER;
} else if (!strcasecmp(content, "keyboard")) {
rc.window_switcher.output_criteria = CYCLE_OSD_OUTPUT_KEYBOARD;
} else if (!strcasecmp(content, "cursor")) {
rc.window_switcher.output_criteria = CYCLE_OSD_OUTPUT_CURSOR;
} else if (!strcasecmp(content, "focused")) {
rc.window_switcher.output_criteria = CYCLE_OSD_OUTPUT_FOCUSED;
} else {
wlr_log(WLR_ERROR, "Invalid windowSwitcher output %s: "
"should be one of all|pointer|keyboard", content);
"should be one of all|focused|cursor", content);
}
/* The following two are for backward compatibility only. */

4
src/cycle/cycle.c
View file

@ -299,10 +299,10 @@ init_cycle(struct server *server)
}
break;
}
case CYCLE_OSD_OUTPUT_POINTER:
case CYCLE_OSD_OUTPUT_CURSOR:
create_osd_on_output(output_nearest_to_cursor(server));
break;
case CYCLE_OSD_OUTPUT_KEYBOARD: {
case CYCLE_OSD_OUTPUT_FOCUSED: {
struct output *output;
if (server->active_view) {
output = server->active_view->output;