mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-28 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drop sway_output.events.disable

Browse source 
In general wl_signal isn't well-suited for Sway: Sway doesn't need
any modularity, and signals make it trickier to track down exactly
what happens down the stack.

Replace Sway's output disable signal with a simple list tracking
for the only user.
This commit is contained in:
Simon Ser 2025-05-06 09:20:46 +02:00
parent 56f2db062d
commit a1ac2a2e93
4 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/sway/layers.h
View file

@ -9,7 +9,6 @@ struct sway_layer_surface {
struct wl_listener map;
struct wl_listener unmap;
struct wl_listener surface_commit;
struct wl_listener output_destroy;
struct wl_listener node_destroy;
struct wl_listener new_popup;
@ -19,6 +18,8 @@ struct sway_layer_surface {
struct sway_popup_desc desc;
struct sway_output *output;
struct wl_list link; // sway_output.layer_surfaces
struct wlr_scene_layer_surface_v1 *scene;
struct wlr_scene_tree *tree;
struct wlr_layer_surface_v1 *layer_surface;
@ -41,4 +42,6 @@ struct wlr_layer_surface_v1 *toplevel_layer_surface_from_surface(
void arrange_layers(struct sway_output *output);
void destroy_layers(struct sway_output *output);
#endif

5
include/sway/output.h
View file

@ -52,6 +52,7 @@ struct sway_output {
bool enabled;
list_t *workspaces;
struct wl_list layer_surfaces; // sway_layer_surface.link
struct sway_output_state current;
@ -61,10 +62,6 @@ struct sway_output {
struct wl_listener frame;
struct wl_listener request_state;
struct {
struct wl_signal disable;
} events;
struct wlr_color_transform *color_transform;
struct timespec last_presentation;

22
sway/desktop/layer_shell.c
View file

@ -216,14 +216,6 @@ static struct sway_layer_surface *find_mapped_layer_by_client(
return NULL;
}
static void handle_output_destroy(struct wl_listener *listener, void *data) {
struct sway_layer_surface *layer =
wl_container_of(listener, layer, output_destroy);
layer->output = NULL;
wlr_layer_surface_v1_destroy(layer->layer_surface);
}
static void handle_node_destroy(struct wl_listener *listener, void *data) {
struct sway_layer_surface *layer =
wl_container_of(listener, layer, node_destroy);
@ -257,10 +249,10 @@ static void handle_node_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&layer->surface_commit.link);
wl_list_remove(&layer->node_destroy.link);
wl_list_remove(&layer->new_popup.link);
wl_list_remove(&layer->output_destroy.link);
layer->layer_surface->data = NULL;
wl_list_remove(&layer->link);
free(layer);
}
@ -475,6 +467,7 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
}
surface->output = output;
wl_list_insert(&output->layer_surfaces, &surface->link);
// now that the surface's output is known, we can advertise its scale
wlr_fractional_scale_v1_notify_scale(surface->layer_surface->surface,
@ -492,9 +485,14 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
surface->new_popup.notify = handle_new_popup;
wl_signal_add(&layer_surface->events.new_popup, &surface->new_popup);
surface->output_destroy.notify = handle_output_destroy;
wl_signal_add(&output->events.disable, &surface->output_destroy);
surface->node_destroy.notify = handle_node_destroy;
wl_signal_add(&scene_surface->tree->node.events.destroy, &surface->node_destroy);
}
void destroy_layers(struct sway_output *output) {
struct sway_layer_surface *layer, *layer_tmp;
wl_list_for_each_safe(layer, layer_tmp, &output->layer_surfaces, link) {
layer->output = NULL;
wlr_layer_surface_v1_destroy(layer->layer_surface);
}
}

5
sway/tree/output.c
View file

@ -136,12 +136,11 @@ struct sway_output *output_create(struct wlr_output *wlr_output) {
output->detected_subpixel = wlr_output->subpixel;
output->scale_filter = SCALE_FILTER_NEAREST;
wl_signal_init(&output->events.disable);
wl_list_insert(&root->all_outputs, &output->link);
output->workspaces = create_list();
output->current.workspaces = create_list();
wl_list_init(&output->layer_surfaces);
return output;
}
@ -284,7 +283,6 @@ void output_disable(struct sway_output *output) {
}
sway_log(SWAY_DEBUG, "Disabling output '%s'", output->wlr_output->name);
wl_signal_emit_mutable(&output->events.disable, output);
// Remove the output now to avoid interacting with it during e.g.,
// transactions, as the output might be physically removed with the scene
@ -292,6 +290,7 @@ void output_disable(struct sway_output *output) {
list_del(root->outputs, index);
output->enabled = false;
destroy_layers(output);
output_evacuate(output);
}