blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

output-management: add current_configuration_dirty 

Previously, if the current configuration contains an output X which is
destroyed, its head is automatically removed. If the compositor submits
the new configuration after X was removed, the current output
configuration is incorrectly detected to be the same as the previous
one, and no done event is sent. To prevent this, we can just keep track
of whether the current configuration is dirty, i.e whether we have sent
a done event for it.
This commit is contained in:
Ilia Bozhinov 2020-02-18 12:30:05 +01:00 committed by Simon Ser
parent 7e990a6bdf
commit f416efa918
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wlr/types/wlr_output_management_v1.h
View File

@ -20,6 +20,7 @@ struct wlr_output_manager_v1 {
struct wl_list heads; // wlr_output_head_v1::link struct wl_list heads; // wlr_output_head_v1::link
uint32_t serial; uint32_t serial;
bool current_configuration_dirty;
struct { struct {
/** /**

4
types/wlr_output_management_v1.c
View File

@ -57,6 +57,7 @@ static void head_handle_output_destroy(struct wl_listener *listener,
void *data) { void *data) {
struct wlr_output_head_v1 *head = struct wlr_output_head_v1 *head =
wl_container_of(listener, head, output_destroy); wl_container_of(listener, head, output_destroy);
head->manager->current_configuration_dirty = true;
head_destroy(head); head_destroy(head);
} }
@ -817,7 +818,7 @@ static bool manager_update_head(struct wlr_output_manager_v1 *manager,
void wlr_output_manager_v1_set_configuration( void wlr_output_manager_v1_set_configuration(
struct wlr_output_manager_v1 *manager, struct wlr_output_manager_v1 *manager,
struct wlr_output_configuration_v1 *config) { struct wlr_output_configuration_v1 *config) {
bool changed = false; bool changed = manager->current_configuration_dirty;
// Either update or destroy existing heads // Either update or destroy existing heads
struct wlr_output_head_v1 *existing_head, *head_tmp; struct wlr_output_head_v1 *existing_head, *head_tmp;
@ -868,4 +869,5 @@ void wlr_output_manager_v1_set_configuration(
zwlr_output_manager_v1_send_done(manager_resource, zwlr_output_manager_v1_send_done(manager_resource,
manager->serial); manager->serial);
} }
manager->current_configuration_dirty = false;
} }