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

diff --git a/include/labwc.h b/include/labwc.h
index 8eb488587aa3106237c0c712a8f6734126544093..7691c9d0a4a0b41cdf2bd82b0a60c811b6ac8d9b 100644 (file)
--- 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 5db03c1f0595fa00d9d3f2b0e060e7042a2c429e..033b89fdc05aff4fff9eca7a8da2515e8d0856d1 100644 (file)
--- a/include/layers.h
+++ b/include/layers.h
@@ -5,6 +5,7 @@
 #include <wlr/types/wlr_layer_shell_v1.h>
 
 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 e17a006e9ba69b93e290820799dd60ff22ecfe96..2cdba567119a6874ade680bc56918c7b24e488f7 100644 (file)
--- 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 e7758d7ff4f6a193393190b7323fba7f52440d94..215a261162d8abc9eeedf05753abc5c0168d09d4 100644 (file)
--- 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 fccde1430a97790673a18492dbbb3ced8b870ba4..a5fd3550fc8eea251baf51a61e835b807ddacb9a 100644 (file)
--- 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);
        }
 }