blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backend/session: Allow setting a custom tty via WLR_DIRECT_TTY

This commit is contained in:
Niklas Schulze 2019-03-06 12:46:35 +01:00 committed by emersion
parent a3c31bb875
commit 2baad6eba6
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/session/direct.c
View File

@ -155,9 +155,19 @@ static int vt_handler(int signo, void *data) {
} }
static bool setup_tty(struct direct_session *session, struct wl_display *display) { static bool setup_tty(struct direct_session *session, struct wl_display *display) {
int fd = open("/dev/tty", O_RDWR | O_CLOEXEC);
bool default_tty = false;
const char *tty_path = getenv("WLR_DIRECT_TTY");
if (!tty_path) {
tty_path = "/dev/tty";
default_tty = true;
}
int fd = open(tty_path, O_RDWR | O_CLOEXEC);
if (fd == -1) { if (fd == -1) {
wlr_log_errno(WLR_ERROR, "Cannot open /dev/tty"); wlr_log_errno(WLR_ERROR, "Cannot open %s", tty_path);
return false; return false;
} }
@ -176,7 +186,7 @@ static bool setup_tty(struct direct_session *session, struct wl_display *display
goto error; goto error;
} }
if (kd_mode != KD_TEXT) { if (default_tty && kd_mode != KD_TEXT) {
wlr_log(WLR_ERROR, wlr_log(WLR_ERROR,
"tty already in graphics mode; is another display server running?"); "tty already in graphics mode; is another display server running?");
goto error; goto error;

1
docs/env_vars.md
View File

@ -20,6 +20,7 @@ wlroots specific
hardware cursors hardware cursors
* *WLR_SESSION*: specifies the wlr\_session to be used (available sessions: * *WLR_SESSION*: specifies the wlr\_session to be used (available sessions:
logind/systemd, direct) logind/systemd, direct)
* *WLR_DIRECT_TTY*: specifies the tty to be used (instead of using /dev/tty)
rootston specific rootston specific
------------------ ------------------