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() instead of scene graph traversal

Browse source 
...for desktop_focus_output() and desktop_topmost_focusable_view().
This commit is contained in:
tokyo4j 2025-12-01 14:50:14 +09:00 • committed by Johan Malm
parent edf3624dac
commit 83b619c285
1 changed files with 13 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/desktop.c
View file

@ -138,16 +138,9 @@ static struct view *
desktop_topmost_focusable_view(struct server *server) desktop_topmost_focusable_view(struct server *server)
{ {
struct view *view; struct view *view;
struct wl_list *node_list; for_each_view_reverse(view, &server->views,
struct wlr_scene_node *node; LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
node_list = &server->workspaces.current->tree->children; if (!view->minimized) {
wl_list_for_each_reverse(node, node_list, link) {
if (!node->data) {
/* We found some non-view, most likely the region overlay */
continue;
}
view = node_view_from_node(node);
if (view_is_focusable(view) && !view->minimized) {
return view; return view;
} }
} }
@ -172,41 +165,31 @@ desktop_focus_topmost_view(struct server *server)
void void
desktop_focus_output(struct output *output) desktop_focus_output(struct output *output)
{ {
if (!output_is_usable(output) || output->server->input_mode struct server *server = output->server;
if (!output_is_usable(output) || server->input_mode
!= LAB_INPUT_STATE_PASSTHROUGH) { != LAB_INPUT_STATE_PASSTHROUGH) {
return; return;
} }
struct view *view; struct view *view;
struct wlr_scene_node *node; for_each_view(view, &server->views, LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
struct wlr_output_layout *layout = output->server->output_layout; if (view->outputs & output->id_bit) {
struct wl_list *list_head =
&output->server->workspaces.current->tree->children;
wl_list_for_each_reverse(node, list_head, link) {
if (!node->data) {
continue;
}
view = node_view_from_node(node);
if (!view_is_focusable(view)) {
continue;
}
if (wlr_output_layout_intersects(layout,
output->wlr_output, &view->current)) {
desktop_focus_view(view, /*raise*/ false); desktop_focus_view(view, /*raise*/ false);
wlr_cursor_warp(view->server->seat.cursor, NULL, wlr_cursor_warp(server->seat.cursor, NULL,
view->current.x + view->current.width / 2, view->current.x + view->current.width / 2,
view->current.y + view->current.height / 2); view->current.y + view->current.height / 2);
cursor_update_focus(view->server); cursor_update_focus(server);
return; return;
} }
} }
/* No view found on desired output */ /* No view found on desired output */
struct wlr_box layout_box; struct wlr_box layout_box;
wlr_output_layout_get_box(output->server->output_layout, wlr_output_layout_get_box(server->output_layout,
output->wlr_output, &layout_box); output->wlr_output, &layout_box);
wlr_cursor_warp(output->server->seat.cursor, NULL, wlr_cursor_warp(server->seat.cursor, NULL,
layout_box.x + output->usable_area.x + output->usable_area.width / 2, layout_box.x + output->usable_area.x + output->usable_area.width / 2,
layout_box.y + output->usable_area.y + output->usable_area.height / 2); layout_box.y + output->usable_area.y + output->usable_area.height / 2);
cursor_update_focus(output->server); cursor_update_focus(server);
} }
void void