Merge branch 'master' into feature/xwm-selection

3 files changed, 14 insertions, 12 deletions

diff --git a/backend/session/direct-freebsd.c b/backend/session/direct-freebsd.c
index fc4bab04..c0621416 100644
--- a/backend/session/direct-freebsd.c
+++ b/backend/session/direct-freebsd.c
@@ -148,8 +148,8 @@ static bool setup_tty(struct direct_session *session, struct wl_display *display
 
 	struct vt_mode mode = {
 		.mode = VT_PROCESS,
-		.relsig = SIGUSR1,
-		.acqsig = SIGUSR1,
+		.relsig = SIGUSR2,
+		.acqsig = SIGUSR2,
 		.frsig = SIGIO, // has to be set
 	};
 
@@ -159,7 +159,7 @@ static bool setup_tty(struct direct_session *session, struct wl_display *display
 	}
 
 	struct wl_event_loop *loop = wl_display_get_event_loop(display);
-	session->vt_source = wl_event_loop_add_signal(loop, SIGUSR1,
+	session->vt_source = wl_event_loop_add_signal(loop, SIGUSR2,
 		vt_handler, session);
 	if (!session->vt_source) {
 		goto error;
diff --git a/backend/session/direct.c b/backend/session/direct.c
index 942dc552..9d6cd36d 100644
--- a/backend/session/direct.c
+++ b/backend/session/direct.c
@@ -184,8 +184,8 @@ static bool setup_tty(struct direct_session *session, struct wl_display *display
 
 	struct vt_mode mode = {
 		.mode = VT_PROCESS,
-		.relsig = SIGUSR1,
-		.acqsig = SIGUSR1,
+		.relsig = SIGUSR2,
+		.acqsig = SIGUSR2,
 	};
 
 	if (ioctl(fd, VT_SETMODE, &mode) < 0) {
@@ -194,7 +194,7 @@ static bool setup_tty(struct direct_session *session, struct wl_display *display
 	}
 
 	struct wl_event_loop *loop = wl_display_get_event_loop(display);
-	session->vt_source = wl_event_loop_add_signal(loop, SIGUSR1,
+	session->vt_source = wl_event_loop_add_signal(loop, SIGUSR2,
 		vt_handler, session);
 	if (!session->vt_source) {
 		goto error;
diff --git a/backend/session/logind.c b/backend/session/logind.c
index daff75b6..e9d4c8f3 100644
--- a/backend/session/logind.c
+++ b/backend/session/logind.c
@@ -347,12 +347,6 @@ static struct wlr_session *logind_session_create(struct wl_display *disp) {
 		goto error;
 	}
 
-	ret = sd_session_get_vt(session->id, &session->base.vtnr);
-	if (ret < 0) {
-		wlr_log(L_ERROR, "Session not running in virtual terminal");
-		goto error;
-	}
-
 	char *seat;
 	ret = sd_session_get_seat(session->id, &seat);
 	if (ret < 0) {
@@ -360,6 +354,14 @@ static struct wlr_session *logind_session_create(struct wl_display *disp) {
 		goto error;
 	}
 	snprintf(session->base.seat, sizeof(session->base.seat), "%s", seat);
+
+	if (strcmp(seat, "seat0") == 0) {
+		ret = sd_session_get_vt(session->id, &session->base.vtnr);
+		if (ret < 0) {
+			wlr_log(L_ERROR, "Session not running in virtual terminal");
+			goto error;
+		}
+	}
 	free(seat);
 
 	ret = sd_bus_default_system(&session->bus);