mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libweston: Prefer primary backend when assigning outputs to views

Browse Source 
If coverage and power status are the same, we should prefer a primary
backend over a secondary one.

Fixes #818

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2023-10-03 10:37:03 -05:00 committed by Marius Vlad
parent 305e954f76
commit 176a413ef0
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libweston/libweston.h
View File

@ -459,6 +459,8 @@ struct weston_output {
uint32_t id;
char *name;
struct weston_backend *backend;
/** Matches the lifetime from the user perspective */
struct wl_signal user_destroy_signal;

20
libweston/compositor.c
View File

@ -1350,12 +1350,19 @@ weston_surface_assign_output(struct weston_surface *es)
* Switch to an output with either larger intersection area or
* to an output that is active from an inactive output.
*/
if (area >= max ||
if (area > max ||
(new_output &&
new_output->power_state == WESTON_OUTPUT_POWER_FORCED_OFF &&
view->output->power_state != WESTON_OUTPUT_POWER_FORCED_OFF)) {
new_output = view->output;
max = area;
continue;
}
/* All else being equal, prefer the primary backend */
if (area == max && new_output &&
view->output->backend == es->compositor->primary_backend) {
new_output = view->output;
}
}
pixman_region32_fini(&region);
@ -1413,9 +1420,16 @@ weston_view_assign_output(struct weston_view *ev)
/* If our current best pick is turned off, anything with
* coverage is better, otherwise only switch to increase area. */
if ((new_output && new_output->power_state == WESTON_OUTPUT_POWER_FORCED_OFF) ||
area >= new_output_area) {
area > new_output_area) {
new_output = output;
new_output_area = area;
continue;
}
/* All else being equal, prefer the primary backend */
if (new_output && new_output_area == area &&
output->backend == ec->primary_backend) {
new_output = output;
}
}
pixman_region32_fini(&region);
@ -8000,6 +8014,8 @@ weston_compositor_create_output(struct weston_compositor *compositor,
return NULL;
}
output->backend = head->backend;
return output;
}