From 98d5fd483d68c5ac943a751bd517d83cd0579e48 Mon Sep 17 00:00:00 2001 From: Johan Malm Date: Wed, 2 Mar 2022 20:29:29 +0000 Subject: [PATCH] layers: s/arrange_layers/layers_arrange/ Because we like to start public function names with the name of the file. Move prototype from labwc.h to layers.h --- include/labwc.h | 2 -- include/layers.h | 3 +++ src/layers.c | 8 ++++---- src/output.c | 2 +- src/server.c | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/labwc.h b/include/labwc.h index 8eb48858..7691c9d0 100644 --- a/include/labwc.h +++ b/include/labwc.h @@ -470,8 +470,6 @@ void cursor_finish(struct seat *seat); void keyboard_init(struct seat *seat); void keyboard_finish(struct seat *seat); -void arrange_layers(struct output *output); - void seat_init(struct server *server); void seat_finish(struct server *server); void seat_reconfigure(struct server *server); diff --git a/include/layers.h b/include/layers.h index 5db03c1f..033b89fd 100644 --- a/include/layers.h +++ b/include/layers.h @@ -5,6 +5,7 @@ #include struct server; +struct output; #define LAB_NR_LAYERS (4) @@ -35,4 +36,6 @@ struct lab_layer_popup { void layers_init(struct server *server); +void layers_arrange(struct output *output); + #endif /* __LABWC_LAYERS_H */ diff --git a/src/layers.c b/src/layers.c index e17a006e..2cdba567 100644 --- a/src/layers.c +++ b/src/layers.c @@ -19,7 +19,7 @@ #include "node-descriptor.h" void -arrange_layers(struct output *output) +layers_arrange(struct output *output) { struct wlr_box full_area = { 0 }; wlr_output_effective_resolution(output->wlr_output, @@ -110,7 +110,7 @@ surface_commit_notify(struct wl_listener *listener, void *data) layer->mapped = layer_surface->mapped; struct output *output = output_from_wlr_output(layer->server, wlr_output); - arrange_layers(output); + layers_arrange(output); } } @@ -141,7 +141,7 @@ destroy_notify(struct wl_listener *listener, void *data) wl_list_remove(&layer->output_destroy.link); struct output *output = output_from_wlr_output(layer->server, layer->scene_layer_surface->layer_surface->output); - arrange_layers(output); + layers_arrange(output); } free(layer); } @@ -338,7 +338,7 @@ new_layer_surface_notify(struct wl_listener *listener, void *data) */ struct wlr_layer_surface_v1_state old_state = layer_surface->current; layer_surface->current = layer_surface->pending; - arrange_layers(output); + layers_arrange(output); layer_surface->current = old_state; } diff --git a/src/output.c b/src/output.c index e7758d7f..215a2611 100644 --- a/src/output.c +++ b/src/output.c @@ -322,7 +322,7 @@ handle_output_layout_change(struct wl_listener *listener, void *data) wl_list_for_each(output, &server->outputs, link) { if (output) { - arrange_layers(output); + layers_arrange(output); } } output_update_for_layout_change(server); diff --git a/src/server.c b/src/server.c index fccde143..a5fd3550 100644 --- a/src/server.c +++ b/src/server.c @@ -120,7 +120,7 @@ seat_disinhibit_input(struct seat *seat) */ struct output *output; wl_list_for_each(output, &seat->server->outputs, link) { - arrange_layers(output); + layers_arrange(output); } } -- 2.52.0