From c4277ab507d17f31dca2a2c24f5b937c750450d8 Mon Sep 17 00:00:00 2001 From: tokyo4j Date: Wed, 3 Dec 2025 00:41:04 +0900 Subject: [PATCH] cycle: update config to I think `` 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 `` and ``. 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. --- docs/labwc-config.5.scd | 6 +++--- include/config/types.h | 4 ++-- src/config/rcxml.c | 10 +++++----- src/cycle/cycle.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd index d772edb3..fa4f7e58 100644 --- a/docs/labwc-config.5.scd +++ b/docs/labwc-config.5.scd @@ -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* diff --git a/include/config/types.h b/include/config/types.h index 7cb9feab..757796a6 100644 --- a/include/config/types.h +++ b/include/config/types.h @@ -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 */ diff --git a/src/config/rcxml.c b/src/config/rcxml.c index ed51e20d..c5d94d4f 100644 --- a/src/config/rcxml.c +++ b/src/config/rcxml.c @@ -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. */ diff --git a/src/cycle/cycle.c b/src/cycle/cycle.c index 292e6436..8eabaf6c 100644 --- a/src/cycle/cycle.c +++ b/src/cycle/cycle.c @@ -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;