Merge branch 'wlroots' into split-containers2

2 files changed, 8 insertions, 0 deletions

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index c780a52b..137fcd22 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -1,6 +1,7 @@
 #ifndef _SWAY_INPUT_SEAT_H
 #define _SWAY_INPUT_SEAT_H
 
+#include <wlr/types/wlr_layer_shell.h>
 #include <wlr/types/wlr_seat.h>
 #include "sway/input/input-manager.h"
 
@@ -28,6 +29,9 @@ struct sway_seat {
         bool has_focus;
         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 wl_listener focus_destroy;
         struct wl_listener new_container;
 
@@ -57,6 +61,9 @@ void seat_set_focus(struct sway_seat *seat, struct sway_container *container);
 void seat_set_focus_warp(struct sway_seat *seat,
                 struct sway_container *container, bool warp);
 
+void seat_set_focus_layer(struct sway_seat *seat,
+                struct wlr_layer_surface *layer);
+
 struct sway_container *seat_get_focus(struct sway_seat *seat);
 
 /**
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 74292519..503b961c 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -58,6 +58,7 @@ struct swaybar_output {
         bool focused;
 
         uint32_t width, height;
+        int32_t scale;
         struct pool_buffer buffers[2];
         struct pool_buffer *current_buffer;
 };