From 8e2b3ea89ad7b83af5bb09ff94f65608f3f4c875 Mon Sep 17 00:00:00 2001
From: Johan Malm <jgm323@gmail.com>
Date: Wed, 7 Oct 2020 21:49:58 +0100
Subject: [PATCH] seat: remove seat_focused_surface()

---
 include/labwc.h          | 1 -
 src/desktop.c            | 2 +-
 src/output.c             | 5 +++--
 src/seat.c               | 6 ------
 src/xwayland-unmanaged.c | 4 ++--
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/include/labwc.h b/include/labwc.h
index 13d6502c..8d7c5eb7 100644
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -241,7 +241,6 @@ void keyboard_init(struct seat *seat);
 void seat_init(struct server *server);
 void seat_finish(struct server *server);
 void seat_focus_surface(struct wlr_seat *seat, struct wlr_surface *surface);
-struct wlr_surface *seat_focused_surface(void);
 
 void interactive_begin(struct view *view, enum cursor_mode mode,
 		       uint32_t edges);
diff --git a/src/desktop.c b/src/desktop.c
index 09f2f8d9..1f0db9db 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -76,7 +76,7 @@ focus_view(struct view *view)
 		return;
 	}
 	if (prev_surface) {
-		set_activated(wlr_seat->keyboard_state.focused_surface, false);
+		set_activated(prev_surface, false);
 	}
 
 	move_to_front(view);
diff --git a/src/output.c b/src/output.c
index 7cf62b73..a355b675 100644
--- a/src/output.c
+++ b/src/output.c
@@ -134,7 +134,8 @@ render_decorations(struct wlr_output *output, struct view *view)
 	draw_rect(&ddata, deco_box(view, LAB_DECO_PART_LEFT));
 
 	/* title */
-	if (view->surface == seat_focused_surface())
+	struct wlr_seat *seat = view->server->seat.seat;
+	if (view->surface == seat->keyboard_state.focused_surface)
 		ddata.rgba = theme.window_active_title_bg_color;
 	else
 		ddata.rgba = theme.window_inactive_title_bg_color;
@@ -152,7 +153,7 @@ render_decorations(struct wlr_output *output, struct view *view)
 	}
 
 	/* buttons */
-	if (view->surface == seat_focused_surface()) {
+	if (view->surface == seat->keyboard_state.focused_surface) {
 		render_icon(&ddata, deco_box(view, LAB_DECO_BUTTON_CLOSE),
 			    theme.xbm_close_active_unpressed);
 		render_icon(&ddata, deco_box(view, LAB_DECO_BUTTON_MAXIMIZE),
diff --git a/src/seat.c b/src/seat.c
index 1fea72f7..d9a09b49 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -128,9 +128,3 @@ seat_focus_surface(struct wlr_seat *seat, struct wlr_surface *surface)
 	wlr_seat_keyboard_notify_enter(seat, surface, kb->keycodes,
 		kb->num_keycodes, &kb->modifiers);
 }
-
-struct wlr_surface *
-seat_focused_surface(void)
-{
-	return current_seat->seat->keyboard_state.focused_surface;
-}
diff --git a/src/xwayland-unmanaged.c b/src/xwayland-unmanaged.c
index 74895a21..606f28b6 100644
--- a/src/xwayland-unmanaged.c
+++ b/src/xwayland-unmanaged.c
@@ -52,7 +52,8 @@ unmanaged_handle_unmap(struct wl_listener *listener, void *data)
 	wl_list_remove(&unmanaged->link);
 	wl_list_remove(&unmanaged->commit.link);
 
-	if (seat_focused_surface() == xsurface->surface) {
+	struct wlr_seat *seat = unmanaged->server->seat.seat;
+	if (seat->keyboard_state.focused_surface == xsurface->surface) {
 		struct xwayland_unmanaged *u;
 		struct wl_list *list = &unmanaged->server->unmanaged_surfaces;
 		wl_list_for_each (u, list, link) {
@@ -60,7 +61,6 @@ unmanaged_handle_unmap(struct wl_listener *listener, void *data)
 			if (!wlr_xwayland_or_surface_wants_focus(prev)) {
 				continue;
 			}
-			struct wlr_seat *seat = unmanaged->server->seat.seat;
 			seat_focus_surface(seat, prev->surface);
 			return;
 		}