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

Use "cycle" instead of "osd" across the codebase

Browse source 
We were using the word "osd" to describe the window switcher, but it can
be used with on-screen display (OSD) disabled by
`<windowSwitcher><osd show="false">`. Let's use "cycle" instead to avoid
confusion.
This commit is contained in:
tokyo4j 2025-11-29 02:41:54 +09:00 • committed by Hiroaki Yamamoto
parent 65cc2e40ba
commit 4fcb873f6f
21 changed files with 265 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/input/cursor.c
View file

@ -920,7 +920,7 @@ static void
process_release_mousebinding(struct server *server,
struct cursor_context *ctx, uint32_t button)
{
if (server->input_mode == LAB_INPUT_STATE_WINDOW_SWITCHER) {
if (server->input_mode == LAB_INPUT_STATE_CYCLE) {
return;
}
@ -989,7 +989,7 @@ static bool
process_press_mousebinding(struct server *server, struct cursor_context *ctx,
uint32_t button)
{
if (server->input_mode == LAB_INPUT_STATE_WINDOW_SWITCHER) {
if (server->input_mode == LAB_INPUT_STATE_CYCLE) {
return false;
}
@ -1157,9 +1157,9 @@ cursor_process_button_release(struct seat *seat, uint32_t button,
}
return notify;
}
if (server->input_mode == LAB_INPUT_STATE_WINDOW_SWITCHER) {
if (ctx.type == LAB_NODE_OSD_ITEM) {
osd_on_cursor_release(server, ctx.node);
if (server->input_mode == LAB_INPUT_STATE_CYCLE) {
if (ctx.type == LAB_NODE_CYCLE_OSD_ITEM) {
cycle_on_cursor_release(server, ctx.node);
}
return notify;
}

19
src/input/keyboard.c
View file

@ -141,17 +141,16 @@ handle_modifiers(struct wl_listener *listener, void *data)
overlay_update(seat);
}
bool window_switcher_active = server->input_mode
== LAB_INPUT_STATE_WINDOW_SWITCHER;
bool cycling = server->input_mode == LAB_INPUT_STATE_CYCLE;
if ((window_switcher_active || seat->workspace_osd_shown_by_modifier)
if ((cycling || seat->workspace_osd_shown_by_modifier)
&& !keyboard_get_all_modifiers(seat)) {
if (window_switcher_active) {
if (cycling) {
if (key_state_nr_bound_keys()) {
should_cancel_cycling_on_next_key_release = true;
} else {
should_cancel_cycling_on_next_key_release = false;
osd_finish(server, /*switch_focus*/ true);
cycle_finish(server, /*switch_focus*/ true);
}
}
if (seat->workspace_osd_shown_by_modifier) {
@ -388,7 +387,7 @@ handle_key_release(struct server *server, uint32_t evdev_keycode)
*/
if (should_cancel_cycling_on_next_key_release) {
should_cancel_cycling_on_next_key_release = false;
osd_finish(server, /*switch_focus*/ true);
cycle_finish(server, /*switch_focus*/ true);
}
/*
@ -461,19 +460,19 @@ handle_cycle_view_key(struct server *server, struct keyinfo *keyinfo)
for (int i = 0; i < keyinfo->translated.nr_syms; i++) {
if (keyinfo->translated.syms[i] == XKB_KEY_Escape) {
/* Esc deactivates window switcher */
osd_finish(server, /*switch_focus*/ false);
cycle_finish(server, /*switch_focus*/ false);
return true;
}
if (keyinfo->translated.syms[i] == XKB_KEY_Up
|| keyinfo->translated.syms[i] == XKB_KEY_Left) {
/* Up/Left cycles the window backward */
osd_cycle(server, LAB_CYCLE_DIR_BACKWARD);
cycle_step(server, LAB_CYCLE_DIR_BACKWARD);
return true;
}
if (keyinfo->translated.syms[i] == XKB_KEY_Down
|| keyinfo->translated.syms[i] == XKB_KEY_Right) {
/* Down/Right cycles the window forward */
osd_cycle(server, LAB_CYCLE_DIR_FORWARD);
cycle_step(server, LAB_CYCLE_DIR_FORWARD);
return true;
}
}
@ -523,7 +522,7 @@ handle_compositor_keybindings(struct keyboard *keyboard,
key_state_store_pressed_key_as_bound(event->keycode);
handle_menu_keys(server, &keyinfo.translated);
return LAB_KEY_HANDLED_TRUE;
} else if (server->input_mode == LAB_INPUT_STATE_WINDOW_SWITCHER) {
} else if (server->input_mode == LAB_INPUT_STATE_CYCLE) {
if (handle_cycle_view_key(server, &keyinfo)) {
key_state_store_pressed_key_as_bound(event->keycode);
return LAB_KEY_HANDLED_TRUE;