Merge branch 'wlroots' into split-containers2

2 files changed, 43 insertions, 4 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 97b4473c..9229e92d 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -180,13 +180,18 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
 	double sx, sy;
 	struct sway_container *cont =
 		container_at_cursor(cursor, &surface, &sx, &sy);
+	if (surface && wlr_surface_is_layer_surface(surface)) {
+		struct wlr_layer_surface *layer =
+			wlr_layer_surface_from_wlr_surface(surface);
+		if (layer->current.keyboard_interactive) {
+			seat_set_focus_layer(cursor->seat, layer);
+			return;
+		}
+	}
 	// Avoid moving keyboard focus from a surface that accepts it to one
 	// that does not unless the change would move us to a new workspace.
 	//
 	// This prevents, for example, losing focus when clicking on swaybar.
-	//
-	// TODO: Replace this condition with something like
-	// !surface_accepts_keyboard_input
 	if (surface && cont && cont->type != C_VIEW) {
 		struct sway_container *new_ws = cont;
 		if (new_ws && new_ws->type != C_WORKSPACE) {
diff --git a/sway/input/seat.c b/sway/input/seat.c
index c326f176..4a99e9eb 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -352,8 +352,11 @@ void seat_configure_xcursor(struct sway_seat *seat) {
 
 void seat_set_focus_warp(struct sway_seat *seat,
 		struct sway_container *container, bool warp) {
-	struct sway_container *last_focus = seat_get_focus(seat);
+	if (seat->focused_layer) {
+		return;
+	}
 
+	struct sway_container *last_focus = seat_get_focus(seat);
 	if (container && last_focus == container) {
 		return;
 	}
@@ -419,6 +422,37 @@ void seat_set_focus(struct sway_seat *seat,
 	seat_set_focus_warp(seat, container, true);
 }
 
+void seat_set_focus_layer(struct sway_seat *seat,
+		struct wlr_layer_surface *layer) {
+	if (!layer) {
+		seat->focused_layer = NULL;
+		return;
+	}
+	if (seat->focused_layer == layer) {
+		return;
+	}
+	if (seat->has_focus) {
+		struct sway_container *focus = seat_get_focus(seat);
+		if (focus->type == C_VIEW) {
+			wlr_seat_keyboard_clear_focus(seat->wlr_seat);
+			view_set_activated(focus->sway_view, false);
+		}
+	}
+	if (layer->layer >= ZWLR_LAYER_SHELL_V1_LAYER_TOP) {
+		seat->focused_layer = layer;
+	}
+	struct wlr_keyboard *keyboard =
+		wlr_seat_get_keyboard(seat->wlr_seat);
+	if (keyboard) {
+		wlr_seat_keyboard_notify_enter(seat->wlr_seat,
+				layer->surface, keyboard->keycodes,
+				keyboard->num_keycodes, &keyboard->modifiers);
+	} else {
+		wlr_seat_keyboard_notify_enter(seat->wlr_seat,
+				layer->surface, NULL, 0, NULL);
+	}
+}
+
 struct sway_container *seat_get_focus_inactive(struct sway_seat *seat,
 		struct sway_container *container) {
 	return seat_get_focus_by_type(seat, container, C_TYPES);