layer-shell: add _v1 suffix

5 files changed, 22 insertions, 22 deletions

diff --git a/rootston/cursor.c b/rootston/cursor.c
index 9a9f9af6..2b8d9a3e 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -275,8 +275,8 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
 				roots_seat_set_focus(seat, view);
 			}
 			if (surface && wlr_surface_is_layer_surface(surface)) {
-				struct wlr_layer_surface *layer =
-					wlr_layer_surface_from_wlr_surface(surface);
+				struct wlr_layer_surface_v1 *layer =
+					wlr_layer_surface_v1_from_wlr_surface(surface);
 				if (layer->current.keyboard_interactive) {
 					roots_seat_set_focus_layer(seat, layer);
 				}
diff --git a/rootston/desktop.c b/rootston/desktop.c
index efb7581a..39d25d1b 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -13,7 +13,7 @@
 #include <wlr/types/wlr_idle_inhibit_v1.h>
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_input_inhibitor.h>
-#include <wlr/types/wlr_layer_shell.h>
+#include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/types/wlr_server_decoration.h>
@@ -667,7 +667,7 @@ static struct wlr_surface *layer_surface_at(struct roots_output *output,
 		double _sx = ox - roots_surface->geo.x;
 		double _sy = oy - roots_surface->geo.y;
 
-		struct wlr_surface *sub = wlr_layer_surface_surface_at(
+		struct wlr_surface *sub = wlr_layer_surface_v1_surface_at(
 			roots_surface->layer_surface, _sx, _sy, sx, sy);
 
 		if (sub) {
@@ -817,7 +817,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
 		&desktop->wl_shell_surface);
 	desktop->wl_shell_surface.notify = handle_wl_shell_surface;
 
-	desktop->layer_shell = wlr_layer_shell_create(server->wl_display);
+	desktop->layer_shell = wlr_layer_shell_v1_create(server->wl_display);
 	wl_signal_add(&desktop->layer_shell->events.new_surface,
 		&desktop->layer_shell_surface);
 	desktop->layer_shell_surface.notify = handle_layer_shell_surface;
diff --git a/rootston/layer_shell.c b/rootston/layer_shell.c
index 39054079..4daa20d1 100644
--- a/rootston/layer_shell.c
+++ b/rootston/layer_shell.c
@@ -10,7 +10,7 @@
 #include <wayland-server.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
-#include <wlr/types/wlr_layer_shell.h>
+#include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/util/log.h>
 #include "rootston/desktop.h"
 #include "rootston/layers.h"
@@ -111,8 +111,8 @@ static void arrange_layer(struct wlr_output *output,
 	wlr_output_effective_resolution(output,
 			&full_area.width, &full_area.height);
 	wl_list_for_each_reverse(roots_surface, list, link) {
-		struct wlr_layer_surface *layer = roots_surface->layer_surface;
-		struct wlr_layer_surface_state *state = &layer->current;
+		struct wlr_layer_surface_v1 *layer = roots_surface->layer_surface;
+		struct wlr_layer_surface_v1_state *state = &layer->current;
 		if (exclusive != (state->exclusive_zone > 0)) {
 			continue;
 		}
@@ -171,7 +171,7 @@ static void arrange_layer(struct wlr_output *output,
 		}
 		if (box.width < 0 || box.height < 0) {
 			// TODO: Bubble up a protocol error?
-			wlr_layer_surface_close(layer);
+			wlr_layer_surface_v1_close(layer);
 			continue;
 		}
 
@@ -181,7 +181,7 @@ static void arrange_layer(struct wlr_output *output,
 		apply_exclusive(usable_area, state->anchor, state->exclusive_zone,
 				state->margin.top, state->margin.right,
 				state->margin.bottom, state->margin.left);
-		wlr_layer_surface_configure(layer, box.width, box.height);
+		wlr_layer_surface_v1_configure(layer, box.width, box.height);
 
 		// Having a cursor newly end up over the moved layer will not
 		// automatically send a motion event to the surface. The event needs to
@@ -270,13 +270,13 @@ static void handle_output_destroy(struct wl_listener *listener, void *data) {
 		wl_container_of(listener, layer, output_destroy);
 	layer->layer_surface->output = NULL;
 	wl_list_remove(&layer->output_destroy.link);
-	wlr_layer_surface_close(layer->layer_surface);
+	wlr_layer_surface_v1_close(layer->layer_surface);
 }
 
 static void handle_surface_commit(struct wl_listener *listener, void *data) {
 	struct roots_layer_surface *layer =
 		wl_container_of(listener, layer, surface_commit);
-	struct wlr_layer_surface *layer_surface = layer->layer_surface;
+	struct wlr_layer_surface_v1 *layer_surface = layer->layer_surface;
 	struct wlr_output *wlr_output = layer_surface->output;
 	if (wlr_output != NULL) {
 		struct roots_output *output = wlr_output->data;
@@ -308,7 +308,7 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
 	}
 }
 
-static void unmap(struct wlr_layer_surface *layer_surface) {
+static void unmap(struct wlr_layer_surface_v1 *layer_surface) {
 	struct roots_layer_surface *layer = layer_surface->data;
 	struct wlr_output *wlr_output = layer_surface->output;
 	if (wlr_output != NULL) {
@@ -337,7 +337,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 }
 
 static void handle_map(struct wl_listener *listener, void *data) {
-	struct wlr_layer_surface *layer_surface = data;
+	struct wlr_layer_surface_v1 *layer_surface = data;
 	struct roots_layer_surface *layer = layer_surface->data;
 	struct wlr_output *wlr_output = layer_surface->output;
 	struct roots_output *output = wlr_output->data;
@@ -430,7 +430,7 @@ static void handle_new_popup(struct wl_listener *listener, void *data) {
 }
 
 void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
-	struct wlr_layer_surface *layer_surface = data;
+	struct wlr_layer_surface_v1 *layer_surface = data;
 	struct roots_desktop *desktop =
 		wl_container_of(listener, desktop, layer_shell_surface);
 	wlr_log(WLR_DEBUG, "new layer surface: namespace %s layer %d anchor %d "
@@ -460,7 +460,7 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
 		if (output) {
 			layer_surface->output = output;
 		} else {
-			wlr_layer_surface_close(layer_surface);
+			wlr_layer_surface_v1_close(layer_surface);
 			return;
 		}
 	}
@@ -497,7 +497,7 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
 
 	// Temporarily set the layer's current state to client_pending
 	// So that we can easily arrange it
-	struct wlr_layer_surface_state old_state = layer_surface->current;
+	struct wlr_layer_surface_v1_state old_state = layer_surface->current;
 	layer_surface->current = layer_surface->client_pending;
 
 	arrange_layers(output);
diff --git a/rootston/output.c b/rootston/output.c
index 8677f491..4207f0d0 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -363,14 +363,14 @@ static void render_layer(struct roots_output *output,
 		struct wl_list *layer) {
 	struct roots_layer_surface *roots_surface;
 	wl_list_for_each(roots_surface, layer, link) {
-		struct wlr_layer_surface *layer = roots_surface->layer_surface;
+		struct wlr_layer_surface_v1 *layer = roots_surface->layer_surface;
 
 		surface_for_each_surface(layer->surface,
 			roots_surface->geo.x + output_layout_box->x,
 			roots_surface->geo.y + output_layout_box->y,
 			0, &data->layout, render_surface, data);
 
-		wlr_layer_surface_for_each_surface(layer, render_surface, data);
+		wlr_layer_surface_v1_for_each_surface(layer, render_surface, data);
 	}
 }
 
@@ -380,7 +380,7 @@ static void layers_send_done(
 	for (size_t i = 0; i < len; ++i) {
 		struct roots_layer_surface *roots_surface;
 		wl_list_for_each(roots_surface, &output->layers[i], link) {
-			struct wlr_layer_surface *layer = roots_surface->layer_surface;
+			struct wlr_layer_surface_v1 *layer = roots_surface->layer_surface;
 			wlr_surface_send_frame_done(layer->surface, when);
 			struct wlr_xdg_popup *popup;
 			wl_list_for_each(popup, &roots_surface->layer_surface->popups, link) {
diff --git a/rootston/seat.c b/rootston/seat.c
index 1ae098bc..507254d4 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -8,7 +8,7 @@
 #include <wlr/backend/libinput.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_idle.h>
-#include <wlr/types/wlr_layer_shell.h>
+#include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_tablet_v2.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/util/log.h>
@@ -1194,7 +1194,7 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
  * You also cannot alt-tab between layer surfaces and shell surfaces.
  */
 void roots_seat_set_focus_layer(struct roots_seat *seat,
-		struct wlr_layer_surface *layer) {
+		struct wlr_layer_surface_v1 *layer) {
 	if (!layer) {
 		seat->focused_layer = NULL;
 		return;