diff options
Diffstat (limited to 'include/sway')
-rw-r--r-- | include/sway/input/seat.h | 6 | ||||
-rw-r--r-- | include/sway/layers.h | 8 | ||||
-rw-r--r-- | include/sway/server.h | 4 |
3 files changed, 9 insertions, 9 deletions
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 @@ | |||
1 | #ifndef _SWAY_INPUT_SEAT_H | 1 | #ifndef _SWAY_INPUT_SEAT_H |
2 | #define _SWAY_INPUT_SEAT_H | 2 | #define _SWAY_INPUT_SEAT_H |
3 | 3 | ||
4 | #include <wlr/types/wlr_layer_shell.h> | 4 | #include <wlr/types/wlr_layer_shell_v1.h> |
5 | #include <wlr/types/wlr_seat.h> | 5 | #include <wlr/types/wlr_seat.h> |
6 | #include <wlr/util/edges.h> | 6 | #include <wlr/util/edges.h> |
7 | #include "sway/input/input-manager.h" | 7 | #include "sway/input/input-manager.h" |
@@ -53,7 +53,7 @@ struct sway_seat { | |||
53 | struct wl_list focus_stack; // list of containers in focus order | 53 | struct wl_list focus_stack; // list of containers in focus order |
54 | 54 | ||
55 | // If the focused layer is set, views cannot receive keyboard focus | 55 | // If the focused layer is set, views cannot receive keyboard focus |
56 | struct wlr_layer_surface *focused_layer; | 56 | struct wlr_layer_surface_v1 *focused_layer; |
57 | 57 | ||
58 | // If exclusive_client is set, no other clients will receive input events | 58 | // If exclusive_client is set, no other clients will receive input events |
59 | struct wl_client *exclusive_client; | 59 | struct wl_client *exclusive_client; |
@@ -119,7 +119,7 @@ void seat_set_focus_surface(struct sway_seat *seat, | |||
119 | struct wlr_surface *surface, bool unfocus); | 119 | struct wlr_surface *surface, bool unfocus); |
120 | 120 | ||
121 | void seat_set_focus_layer(struct sway_seat *seat, | 121 | void seat_set_focus_layer(struct sway_seat *seat, |
122 | struct wlr_layer_surface *layer); | 122 | struct wlr_layer_surface_v1 *layer); |
123 | 123 | ||
124 | void seat_set_exclusive_client(struct sway_seat *seat, | 124 | void seat_set_exclusive_client(struct sway_seat *seat, |
125 | struct wl_client *client); | 125 | 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 @@ | |||
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | #include <wlr/types/wlr_box.h> | 4 | #include <wlr/types/wlr_box.h> |
5 | #include <wlr/types/wlr_surface.h> | 5 | #include <wlr/types/wlr_surface.h> |
6 | #include <wlr/types/wlr_layer_shell.h> | 6 | #include <wlr/types/wlr_layer_shell_v1.h> |
7 | 7 | ||
8 | struct sway_layer_surface { | 8 | struct sway_layer_surface { |
9 | struct wlr_layer_surface *layer_surface; | 9 | struct wlr_layer_surface_v1 *layer_surface; |
10 | struct wl_list link; | 10 | struct wl_list link; |
11 | 11 | ||
12 | struct wl_listener destroy; | 12 | struct wl_listener destroy; |
@@ -22,7 +22,7 @@ struct sway_layer_surface { | |||
22 | struct sway_output; | 22 | struct sway_output; |
23 | void arrange_layers(struct sway_output *output); | 23 | void arrange_layers(struct sway_output *output); |
24 | 24 | ||
25 | struct sway_layer_surface *layer_from_wlr_layer_surface( | 25 | struct sway_layer_surface *layer_from_wlr_layer_surface_v1( |
26 | struct wlr_layer_surface *layer_surface); | 26 | struct wlr_layer_surface_v1 *layer_surface); |
27 | 27 | ||
28 | #endif | 28 | #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 @@ | |||
7 | #include <wlr/render/wlr_renderer.h> | 7 | #include <wlr/render/wlr_renderer.h> |
8 | #include <wlr/types/wlr_compositor.h> | 8 | #include <wlr/types/wlr_compositor.h> |
9 | #include <wlr/types/wlr_data_device.h> | 9 | #include <wlr/types/wlr_data_device.h> |
10 | #include <wlr/types/wlr_layer_shell.h> | 10 | #include <wlr/types/wlr_layer_shell_v1.h> |
11 | #include <wlr/types/wlr_server_decoration.h> | 11 | #include <wlr/types/wlr_server_decoration.h> |
12 | #include <wlr/types/wlr_xdg_shell_v6.h> | 12 | #include <wlr/types/wlr_xdg_shell_v6.h> |
13 | #include <wlr/types/wlr_xdg_shell.h> | 13 | #include <wlr/types/wlr_xdg_shell.h> |
@@ -35,7 +35,7 @@ struct sway_server { | |||
35 | struct wlr_idle *idle; | 35 | struct wlr_idle *idle; |
36 | struct sway_idle_inhibit_manager_v1 *idle_inhibit_manager_v1; | 36 | struct sway_idle_inhibit_manager_v1 *idle_inhibit_manager_v1; |
37 | 37 | ||
38 | struct wlr_layer_shell *layer_shell; | 38 | struct wlr_layer_shell_v1 *layer_shell; |
39 | struct wl_listener layer_shell_surface; | 39 | struct wl_listener layer_shell_surface; |
40 | 40 | ||
41 | struct wlr_xdg_shell_v6 *xdg_shell_v6; | 41 | struct wlr_xdg_shell_v6 *xdg_shell_v6; |