From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Tue, 24 Jan 2023 03:12:02 +0000 (+0100)
Subject: Chase wlroots: wlr_session refactor
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=46e3e29e263a48134d3b4f78f31931be8f7903cc;p=proto%2Flabwc.git

Chase wlroots: wlr_session refactor

Chases 41b7acbab78597e2eb0724e415ed94b910d113c1
backend: return wlr_session in wlr_backend_autocreate() call
---

diff --git a/include/labwc.h b/include/labwc.h
index aef85f18..efd12d86 100644
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -201,6 +201,7 @@ struct server {
 	struct wlr_renderer *renderer;
 	struct wlr_allocator *allocator;
 	struct wlr_backend *backend;
+	struct wlr_session *session;
 
 	struct wlr_xdg_shell *xdg_shell;
 	struct wlr_layer_shell_v1 *layer_shell;
diff --git a/src/input/keyboard.c b/src/input/keyboard.c
index 14b6864c..cedb0367 100644
--- a/src/input/keyboard.c
+++ b/src/input/keyboard.c
@@ -18,13 +18,7 @@ static bool should_cancel_cycling_on_next_key_release;
 static void
 change_vt(struct server *server, unsigned int vt)
 {
-	if (!wlr_backend_is_multi(server->backend)) {
-		return;
-	}
-	struct wlr_session *session = wlr_backend_get_session(server->backend);
-	if (session) {
-		wlr_session_change_vt(session, vt);
-	}
+	wlr_session_change_vt(server->session, vt);
 }
 
 bool
diff --git a/src/server.c b/src/server.c
index 29868e96..c6be022d 100644
--- a/src/server.c
+++ b/src/server.c
@@ -244,7 +244,8 @@ server_init(struct server *server)
 	 * backend based on the current environment, such as opening an x11
 	 * window if an x11 server is running.
 	 */
-	server->backend = wlr_backend_autocreate(server->wl_display);
+	server->backend = wlr_backend_autocreate(
+		server->wl_display, &server->session);
 	if (!server->backend) {
 		wlr_log(WLR_ERROR, "unable to create backend");
 		fprintf(stderr, helpful_seat_error_message);
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index a767d442..8de14c55 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = 258bf9be1e44d8a2fb953d727ff4ffcf9ebd6503
+revision = e7c556fcf61eb3121d741cd4da526b2619862678
 
 [provide]
 dependency_names = wlroots