alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Address emersions comments on output re-enabling

Browse source
This commit is contained in:
Brian Ashworth 2018-06-06 17:12:02 -04:00
parent a1b5b93d29
commit a0bbe67076
3 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/desktop/layer_shell.c
View file

@ -252,7 +252,7 @@ static void unmap(struct sway_layer_surface *sway_layer) {
return; return;
} }
struct sway_output *output = wlr_output->data; struct sway_output *output = wlr_output->data;
if (output == NULL) { if (output == NULL || output->swayc == NULL) {
return; return;
} }
output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y, output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y,
@ -279,7 +279,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&sway_layer->surface_commit.link); wl_list_remove(&sway_layer->surface_commit.link);
if (sway_layer->layer_surface->output != NULL) { if (sway_layer->layer_surface->output != NULL) {
struct sway_output *output = sway_layer->layer_surface->output->data; struct sway_output *output = sway_layer->layer_surface->output->data;
if (output != NULL) { if (output != NULL && output->swayc != NULL) {
arrange_layers(output); arrange_layers(output);
} }
wl_list_remove(&sway_layer->output_destroy.link); wl_list_remove(&sway_layer->output_destroy.link);

10
sway/desktop/output.c
View file

@ -1221,6 +1221,8 @@ void handle_new_output(struct wl_listener *listener, void *data) {
output->server = server; output->server = server;
list_add(root_container.sway_root->outputs, output); list_add(root_container.sway_root->outputs, output);
output->damage = wlr_output_damage_create(wlr_output);
if (!wl_list_empty(&wlr_output->modes)) { if (!wl_list_empty(&wlr_output->modes)) {
struct wlr_output_mode *mode = struct wlr_output_mode *mode =
wl_container_of(wlr_output->modes.prev, mode, link); wl_container_of(wlr_output->modes.prev, mode, link);
@ -1233,14 +1235,6 @@ void handle_new_output(struct wl_listener *listener, void *data) {
void output_enable(struct sway_output *output) { void output_enable(struct sway_output *output) {
struct wlr_output *wlr_output = output->wlr_output; struct wlr_output *wlr_output = output->wlr_output;
if (!wlr_output->data) {
wlr_output->data = output;
}
if (!output->damage) {
output->damage = wlr_output_damage_create(wlr_output);
}
output->swayc = output_create(output); output->swayc = output_create(output);
if (!output->swayc) { if (!output->swayc) {
// Output is disabled // Output is disabled

2
sway/tree/container.c
View file

@ -262,8 +262,6 @@ static struct sway_container *container_output_destroy(
wl_list_remove(&output->sway_output->damage_destroy.link); wl_list_remove(&output->sway_output->damage_destroy.link);
wl_list_remove(&output->sway_output->damage_frame.link); wl_list_remove(&output->sway_output->damage_frame.link);
// clear the wlr_output reference to this container
output->sway_output->wlr_output->data = NULL;
output->sway_output->swayc = NULL; output->sway_output->swayc = NULL;
wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name); wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);