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

desktop: switch workspaces and optionally raise in desktop_focus_view()

Browse source 
Make desktop_focus_view() always switch to the workspace containing the
view being focused. It doesn't make much sense for an invisible view to
have the keyboard focus.

Also add an optional "raise" parameter to desktop_focus_view(). This
allows the common pattern of desktop_focus_view() + view_move_to_front()
to be reduced to a single function call.
This commit is contained in:
John Lindgren 2023-09-27 18:37:28 -04:00 • committed by Consolatis
parent e77330bc3f
commit e5aef03319
11 changed files with 44 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/desktop.c
View file

@ -35,7 +35,7 @@ desktop_arrange_all_views(struct server *server)
}
void
desktop_focus_view(struct view *view)
desktop_focus_view(struct view *view, bool raise)
{
assert(view);
/*
@ -56,7 +56,7 @@ desktop_focus_view(struct view *view)
if (view->minimized) {
/*
* Unminimizing will map the view which triggers a call to this
* function again.
* function again (with raise=true).
*/
view_minimize(view, false);
return;
@ -66,7 +66,19 @@ desktop_focus_view(struct view *view)
return;
}
/*
* Switch workspace if necessary to make the view visible
* (unnecessary for "always on top" views).
*/
if (!view_is_always_on_top(view)) {
workspaces_switch_to(view->workspace, /*update_focus*/ false);
}
view_focus(view);
if (raise) {
view_move_to_front(view);
}
}
static struct wl_list *
@ -225,8 +237,7 @@ desktop_focus_topmost_mapped_view(struct server *server)
{
struct view *view = desktop_topmost_mapped_view(server);
if (view) {
desktop_focus_view(view);
view_move_to_front(view);
desktop_focus_view(view, /*raise*/ true);
} else {
/*
* Defocus previous focused surface/view if no longer
@ -262,7 +273,7 @@ desktop_focus_output(struct output *output)
}
if (wlr_output_layout_intersects(layout,
output->wlr_output, &view->current)) {
desktop_focus_view(view);
desktop_focus_view(view, /*raise*/ false);
wlr_cursor_warp(output->server->seat.cursor, NULL,
view->current.x + view->current.width / 2,
view->current.y + view->current.height / 2);