mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-06 13:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

osd: move end_cycling() into osd_finish()

Browse source 
...so that we can use `osd_finish()` to support clicking an osd item to
focus its associated window.
This commit is contained in:
tokyo4j 2025-10-30 03:06:15 +09:00 • committed by Johan Malm
parent 7223056ffc
commit 2c0552004a
3 changed files with 31 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/osd.h
View file

@ -53,7 +53,7 @@ void osd_begin(struct server *server, enum lab_cycle_dir direction);
void osd_cycle(struct server *server, enum lab_cycle_dir direction); void osd_cycle(struct server *server, enum lab_cycle_dir direction);
/* Closes the OSD */ /* Closes the OSD */
void osd_finish(struct server *server); void osd_finish(struct server *server, bool switch_focus);
/* Notify OSD about a destroying view */ /* Notify OSD about a destroying view */
void osd_on_view_destroy(struct view *view); void osd_on_view_destroy(struct view *view);

32
src/input/keyboard.c
View file

@ -83,25 +83,6 @@ keyboard_get_all_modifiers(struct seat *seat)
return modifiers; return modifiers;
} }
static void
end_cycling(struct server *server)
{
should_cancel_cycling_on_next_key_release = false;
if (server->input_mode != LAB_INPUT_STATE_WINDOW_SWITCHER) {
return;
}
struct view *cycle_view = server->osd_state.cycle_view;
/* FIXME: osd_finish() transiently sets focus to the old surface */
osd_finish(server);
/* Note that server->osd_state.cycle_view is cleared at this point */
if (rc.window_switcher.unshade) {
view_set_shade(cycle_view, false);
}
desktop_focus_view(cycle_view, /*raise*/ true);
}
static struct wlr_seat_client * static struct wlr_seat_client *
seat_client_from_keyboard_resource(struct wl_resource *resource) seat_client_from_keyboard_resource(struct wl_resource *resource)
{ {
@ -163,20 +144,20 @@ handle_modifiers(struct wl_listener *listener, void *data)
bool window_switcher_active = server->input_mode bool window_switcher_active = server->input_mode
== LAB_INPUT_STATE_WINDOW_SWITCHER; == LAB_INPUT_STATE_WINDOW_SWITCHER;
if (window_switcher_active || seat->workspace_osd_shown_by_modifier) { if ((window_switcher_active || seat->workspace_osd_shown_by_modifier)
if (!keyboard_get_all_modifiers(seat)) { && !keyboard_get_all_modifiers(seat)) {
if (window_switcher_active) { if (window_switcher_active) {
if (key_state_nr_bound_keys()) { if (key_state_nr_bound_keys()) {
should_cancel_cycling_on_next_key_release = true; should_cancel_cycling_on_next_key_release = true;
} else { } else {
end_cycling(server); should_cancel_cycling_on_next_key_release = false;
osd_finish(server, /*switch_focus*/ true);
} }
} }
if (seat->workspace_osd_shown_by_modifier) { if (seat->workspace_osd_shown_by_modifier) {
workspaces_osd_hide(seat); workspaces_osd_hide(seat);
} }
} }
}
if (!input_method_keyboard_grab_forward_modifiers(keyboard)) { if (!input_method_keyboard_grab_forward_modifiers(keyboard)) {
/* Send modifiers to focused client */ /* Send modifiers to focused client */
@ -406,7 +387,8 @@ handle_key_release(struct server *server, uint32_t evdev_keycode)
* event it gets stuck on repeat. * event it gets stuck on repeat.
*/ */
if (should_cancel_cycling_on_next_key_release) { if (should_cancel_cycling_on_next_key_release) {
end_cycling(server); should_cancel_cycling_on_next_key_release = false;
osd_finish(server, /*switch_focus*/ true);
} }
/* /*
@ -479,7 +461,7 @@ handle_cycle_view_key(struct server *server, struct keyinfo *keyinfo)
for (int i = 0; i < keyinfo->translated.nr_syms; i++) { for (int i = 0; i < keyinfo->translated.nr_syms; i++) {
if (keyinfo->translated.syms[i] == XKB_KEY_Escape) { if (keyinfo->translated.syms[i] == XKB_KEY_Escape) {
/* Esc deactivates window switcher */ /* Esc deactivates window switcher */
osd_finish(server); osd_finish(server, /*switch_focus*/ false);
return true; return true;
} }
if (keyinfo->translated.syms[i] == XKB_KEY_Up if (keyinfo->translated.syms[i] == XKB_KEY_Up

19
src/osd/osd.c
View file

@ -119,7 +119,7 @@ osd_on_view_destroy(struct view *view)
*/ */
if (osd_state->cycle_view == view || !osd_state->cycle_view) { if (osd_state->cycle_view == view || !osd_state->cycle_view) {
/* osd_finish() additionally resets cycle_view to NULL */ /* osd_finish() additionally resets cycle_view to NULL */
osd_finish(view->server); osd_finish(view->server, /*switch_focus*/ false);
} }
} }
@ -201,11 +201,17 @@ osd_cycle(struct server *server, enum lab_cycle_dir direction)
} }
void void
osd_finish(struct server *server) osd_finish(struct server *server, bool switch_focus)
{ {
if (server->input_mode != LAB_INPUT_STATE_WINDOW_SWITCHER) {
return;
}
restore_preview_node(server); restore_preview_node(server);
/* FIXME: this sets focus to the old surface even with switch_focus=true */
seat_focus_override_end(&server->seat); seat_focus_override_end(&server->seat);
struct view *cycle_view = server->osd_state.cycle_view;
server->osd_state.preview_node = NULL; server->osd_state.preview_node = NULL;
server->osd_state.preview_anchor = NULL; server->osd_state.preview_anchor = NULL;
server->osd_state.cycle_view = NULL; server->osd_state.cycle_view = NULL;
@ -221,6 +227,13 @@ osd_finish(struct server *server)
/* Hiding OSD may need a cursor change */ /* Hiding OSD may need a cursor change */
cursor_update_focus(server); cursor_update_focus(server);
if (switch_focus && cycle_view) {
if (rc.window_switcher.unshade) {
view_set_shade(cycle_view, false);
}
desktop_focus_view(cycle_view, /*raise*/ true);
}
} }
static void static void
@ -286,7 +299,7 @@ update_osd(struct server *server)
} }
if (!wl_array_len(&views) || !server->osd_state.cycle_view) { if (!wl_array_len(&views) || !server->osd_state.cycle_view) {
osd_finish(server); osd_finish(server, /*switch_focus*/ false);
goto out; goto out;
} }