From 7699c5444c32289a22ce2c57d1daadabed87e7ac Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Fri, 14 Sep 2018 19:21:44 +0200
Subject: Update for swaywm/wlroots#1243

---
 include/sway/input/seat.h | 6 +++---
 include/sway/layers.h     | 8 ++++----
 include/sway/server.h     | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index e006faba..7b756ef3 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -1,7 +1,7 @@
 #ifndef _SWAY_INPUT_SEAT_H
 #define _SWAY_INPUT_SEAT_H
 
-#include <wlr/types/wlr_layer_shell.h>
+#include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/util/edges.h>
 #include "sway/input/input-manager.h"
@@ -53,7 +53,7 @@ struct sway_seat {
 	struct wl_list focus_stack; // list of containers in focus order
 
 	// If the focused layer is set, views cannot receive keyboard focus
-	struct wlr_layer_surface *focused_layer;
+	struct wlr_layer_surface_v1 *focused_layer;
 
 	// If exclusive_client is set, no other clients will receive input events
 	struct wl_client *exclusive_client;
@@ -119,7 +119,7 @@ void seat_set_focus_surface(struct sway_seat *seat,
 		struct wlr_surface *surface, bool unfocus);
 
 void seat_set_focus_layer(struct sway_seat *seat,
-		struct wlr_layer_surface *layer);
+		struct wlr_layer_surface_v1 *layer);
 
 void seat_set_exclusive_client(struct sway_seat *seat,
 		struct wl_client *client);
diff --git a/include/sway/layers.h b/include/sway/layers.h
index 96155eae..51878fc9 100644
--- a/include/sway/layers.h
+++ b/include/sway/layers.h
@@ -3,10 +3,10 @@
 #include <stdbool.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>
 
 struct sway_layer_surface {
-	struct wlr_layer_surface *layer_surface;
+	struct wlr_layer_surface_v1 *layer_surface;
 	struct wl_list link;
 
 	struct wl_listener destroy;
@@ -22,7 +22,7 @@ struct sway_layer_surface {
 struct sway_output;
 void arrange_layers(struct sway_output *output);
 
-struct sway_layer_surface *layer_from_wlr_layer_surface(
-	struct wlr_layer_surface *layer_surface);
+struct sway_layer_surface *layer_from_wlr_layer_surface_v1(
+	struct wlr_layer_surface_v1 *layer_surface);
 
 #endif
diff --git a/include/sway/server.h b/include/sway/server.h
index 07e0949a..5dabb61f 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -7,7 +7,7 @@
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_layer_shell.h>
+#include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_server_decoration.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_xdg_shell.h>
@@ -35,7 +35,7 @@ struct sway_server {
 	struct wlr_idle *idle;
 	struct sway_idle_inhibit_manager_v1 *idle_inhibit_manager_v1;
 
-	struct wlr_layer_shell *layer_shell;
+	struct wlr_layer_shell_v1 *layer_shell;
 	struct wl_listener layer_shell_surface;
 
 	struct wlr_xdg_shell_v6 *xdg_shell_v6;
-- 
cgit v1.2.3-54-g00ecf