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

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

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) {
/* 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
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);
/* FIXME: this sets focus to the old surface even with switch_focus=true */
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_anchor = NULL;
server->osd_state.cycle_view = NULL;
@ -221,6 +227,13 @@ osd_finish(struct server *server)
/* Hiding OSD may need a cursor change */
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
@ -286,7 +299,7 @@ update_osd(struct server *server)
}
if (!wl_array_len(&views) || !server->osd_state.cycle_view) {
osd_finish(server);
osd_finish(server, /*switch_focus*/ false);
goto out;
}