diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-09-14 20:47:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 20:47:42 -0400 |
| commit | 0210905eef94216c42a070b638c6f3e6d81512e2 (patch) | |
| tree | 7968f4bdac9734df92c1be0c8e8f5da84b03e766 /include/rootston | |
| parent | a088000983521923922ebc7ebfe51a272da6a041 (diff) | |
| parent | fc960e5d060c78015e0037616ac568cbd7d64b07 (diff) | |
Merge pull request #1243 from emersion/layer-shell-suffix
layer-shell: add _v1 suffix
Diffstat (limited to 'include/rootston')
| -rw-r--r-- | include/rootston/desktop.h | 4 | ||||
| -rw-r--r-- | include/rootston/layers.h | 4 | ||||
| -rw-r--r-- | include/rootston/seat.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index 3496fb43..89d8af4a 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -9,7 +9,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_list.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output.h> @@ -52,7 +52,7 @@ struct roots_desktop { struct wlr_idle *idle; struct wlr_idle_inhibit_manager_v1 *idle_inhibit; struct wlr_input_inhibit_manager *input_inhibit; - struct wlr_layer_shell *layer_shell; + struct wlr_layer_shell_v1 *layer_shell; struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard; struct wlr_screencopy_manager_v1 *screencopy; struct wlr_tablet_manager_v2 *tablet_v2; diff --git a/include/rootston/layers.h b/include/rootston/layers.h index 9eab53ca..0dacf20f 100644 --- a/include/rootston/layers.h +++ b/include/rootston/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 roots_layer_surface { - struct wlr_layer_surface *layer_surface; + struct wlr_layer_surface_v1 *layer_surface; struct wl_list link; struct wl_listener destroy; diff --git a/include/rootston/seat.h b/include/rootston/seat.h index 3ddb97c5..c5e584b6 100644 --- a/include/rootston/seat.h +++ b/include/rootston/seat.h @@ -17,7 +17,7 @@ struct roots_seat { double touch_x, touch_y; // 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 non-null, only this client can receive input events struct wl_client *exclusive_client; @@ -140,7 +140,7 @@ struct roots_view *roots_seat_get_focus(struct roots_seat *seat); void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view); void roots_seat_set_focus_layer(struct roots_seat *seat, - struct wlr_layer_surface *layer); + struct wlr_layer_surface_v1 *layer); void roots_seat_cycle_focus(struct roots_seat *seat); |