mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-12 08:21:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'leave-lazy' into 'master'

Browse source 
compositor: add wlr_surface_queue_lazy_leave()

See merge request wlroots/wlroots!5316
This commit is contained in:
Isaac Freund 2026-03-31 03:54:53 +00:00
commit d875fdcda6
3 changed files with 78 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

29
include/wlr/types/wlr_compositor.h
View file

@ -127,6 +127,8 @@ struct wlr_surface_output {
struct {
struct wl_listener bind;
struct wl_listener destroy;
bool lazy_leave;
} WLR_PRIVATE;
};
@ -399,6 +401,33 @@ void wlr_surface_send_enter(struct wlr_surface *surface,
void wlr_surface_send_leave(struct wlr_surface *surface,
struct wlr_output *output);
/**
* Queue a lazy wl_surface.leave event to be sent in a future call to
* wlr_surface_process_lazy_leaves().
*
* If wlr_surface_send_enter() is called before wlr_surface_process_lazy_leaves()
* actually sends a leave event, the lazy leave mark is cleared.
*/
void wlr_surface_queue_lazy_leave(struct wlr_surface *surface, struct wlr_output *output);
/**
* If at least one output would remain entered after all lazy leave events
* are sent, send all lazy leave events. Otherwise do nothing.
*
* This behavior helps the compositor implement the following recommended policy:
*
* 1. When a surface transitions from being visible on >0 outputs to being visible on 0 outputs
* don't send any leave events.
*
* 2. When a surface transitions from being visible on 0 outputs to being visible on >0 outputs
* send leave events for all entered outputs on which the surface is no longer visible as
* well as enter events for any outputs not already entered.
*
* This policy avoids sending redundant enter/leave events when a surface is hidden and then shown
* again without any change to the set of intersected outputs.
*/
void wlr_surface_process_lazy_leaves(struct wlr_surface *surface);
/**
* Complete the queued frame callbacks for this surface.
*

38
types/scene/surface.c
View file

@ -97,41 +97,21 @@ static void handle_scene_buffer_outputs_update(
struct wlr_scene_outputs_update_event *event = data;
struct wlr_scene *scene = scene_node_get_root(&surface->buffer->node);
struct wlr_scene_output *scene_output;
wl_list_for_each(scene_output, &scene->outputs, link) {
wlr_surface_queue_lazy_leave(surface->surface, scene_output->output);
}
for (size_t i = 0; i < event->size; i++) {
wlr_surface_send_enter(surface->surface, event->active[i]->output);
}
wlr_surface_process_lazy_leaves(surface->surface);
// If the surface is no longer visible on any output, keep the last sent
// preferred configuration to avoid unnecessary redraws
if (event->size == 0) {
return;
}
// To avoid sending redundant leave/enter events when a surface is hidden and then shown
// without moving to a different output the following policy is implemented:
//
// 1. When a surface transitions from being visible on >0 outputs to being visible on 0 outputs
// don't send any leave events.
//
// 2. When a surface transitions from being visible on 0 outputs to being visible on >0 outputs
// send leave events for all entered outputs on which the surface is no longer visible as
// well as enter events for any outputs not already entered.
struct wlr_surface_output *entered_output, *tmp;
wl_list_for_each_safe(entered_output, tmp, &surface->surface->current_outputs, link) {
bool active = false;
for (size_t i = 0; i < event->size; i++) {
if (entered_output->output == event->active[i]->output) {
active = true;
break;
}
}
if (!active) {
wlr_surface_send_leave(surface->surface, entered_output->output);
}
}
for (size_t i = 0; i < event->size; i++) {
// This function internally checks if an enter event was already sent for the output
// to avoid sending redundant events.
wlr_surface_send_enter(surface->surface, event->active[i]->output);
}
double scale = get_surface_preferred_buffer_scale(surface->surface);
wlr_fractional_scale_v1_notify_scale(surface->surface, scale);
wlr_surface_set_preferred_buffer_scale(surface->surface, ceil(scale));

40
types/wlr_compositor.c
View file

@ -1084,6 +1084,7 @@ void wlr_surface_send_enter(struct wlr_surface *surface,
wl_list_for_each(surface_output, &surface->current_outputs, link) {
if (surface_output->output == output) {
surface_output->lazy_leave = false;
return;
}
}
@ -1129,6 +1130,45 @@ void wlr_surface_send_leave(struct wlr_surface *surface,
}
}
void wlr_surface_queue_lazy_leave(struct wlr_surface *surface, struct wlr_output *output) {
struct wlr_surface_output *surface_output;
wl_list_for_each(surface_output, &surface->current_outputs, link) {
if (surface_output->output == output) {
surface_output->lazy_leave = true;
}
}
}
void wlr_surface_process_lazy_leaves(struct wlr_surface *surface) {
// Only send leave events if at least one output would remain entered.
bool send_leave_events = false;
struct wlr_surface_output *surface_output;
wl_list_for_each(surface_output, &surface->current_outputs, link) {
if (!surface_output->lazy_leave) {
send_leave_events = true;
}
}
if (!send_leave_events) {
return;
}
struct wl_client *client = wl_resource_get_client(surface->resource);
struct wlr_surface_output *tmp;
wl_list_for_each_safe(surface_output, tmp, &surface->current_outputs, link) {
if (surface_output->lazy_leave) {
struct wl_resource *resource;
wl_resource_for_each(resource, &surface_output->output->resources) {
if (client == wl_resource_get_client(resource)) {
wl_surface_send_leave(surface->resource, resource);
}
}
surface_output_destroy(surface_output);
break;
}
}
}
void wlr_surface_send_frame_done(struct wlr_surface *surface,
const struct timespec *when) {
struct wl_resource *resource, *tmp;