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

desktop: use for_each_view() in desktop_topmost_focusable_view()

Browse source 
Fixes a regression in 83b619c2 that the bottom-most view is focused
when when an exclusive layer surface (e.g. fuzzel) is unfocused.

Also, added some comments to clarify the order.
This commit is contained in:
tokyo4j 2026-01-31 23:55:41 +09:00 • committed by Consolatis
parent 67e3b36e58
commit 55a256f2fa
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/labwc.h
View file

@ -188,6 +188,7 @@ struct server {
struct wlr_xdg_toplevel_icon_manager_v1 *xdg_toplevel_icon_manager; struct wlr_xdg_toplevel_icon_manager_v1 *xdg_toplevel_icon_manager;
struct wl_listener xdg_toplevel_icon_set_icon; struct wl_listener xdg_toplevel_icon_set_icon;
/* front to back order */
struct wl_list views; struct wl_list views;
uint64_t next_view_creation_id; uint64_t next_view_creation_id;
struct wl_list unmanaged_surfaces; struct wl_list unmanaged_surfaces;

4
include/view.h
View file

@ -345,7 +345,7 @@ void view_query_free(struct view_query *view);
bool view_matches_query(struct view *view, struct view_query *query); bool view_matches_query(struct view *view, struct view_query *query);
/** /**
* for_each_view() - iterate over all views which match criteria * for_each_view() - iterate over all views which match criteria (front to back)
* @view: Iterator. * @view: Iterator.
* @head: Head of list to iterate over. * @head: Head of list to iterate over.
* @criteria: Criteria to match against. * @criteria: Criteria to match against.
@ -361,7 +361,7 @@ bool view_matches_query(struct view *view, struct view_query *query);
view = view_next(head, view, criteria)) view = view_next(head, view, criteria))
/** /**
* for_each_view_reverse() - iterate over all views which match criteria * for_each_view_reverse() - iterate over all views which match criteria (back to front)
* @view: Iterator. * @view: Iterator.
* @head: Head of list to iterate over. * @head: Head of list to iterate over.
* @criteria: Criteria to match against. * @criteria: Criteria to match against.

2
src/desktop.c
View file

@ -138,7 +138,7 @@ static struct view *
desktop_topmost_focusable_view(struct server *server) desktop_topmost_focusable_view(struct server *server)
{ {
struct view *view; struct view *view;
for_each_view_reverse(view, &server->views, for_each_view(view, &server->views,
LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) { LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
if (!view->minimized) { if (!view->minimized) {
return view; return view;