mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tty: If no tty option is given, use stdin and make sure it's a vt

Browse Source
This commit is contained in:
Kristian Høgsberg 2012-01-15 14:27:10 -05:00
parent 2f6219f127
commit 1201b75bec
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compositor-drm.c
View File

@ -932,7 +932,7 @@ backend_init(struct wl_display *display, char *options)
int connector = 0, i; int connector = 0, i;
const char *seat; const char *seat;
char *p, *value; char *p, *value;
int tty = 1; int tty = 0;
static char * const tokens[] = { "connector", "seat", "tty", NULL }; static char * const tokens[] = { "connector", "seat", "tty", NULL };

2
src/compositor-openwfd.c
View File

@ -675,7 +675,7 @@ backend_init(struct wl_display *display, char *options)
int connector = 0, i; int connector = 0, i;
const char *seat; const char *seat;
char *p, *value; char *p, *value;
int tty = 1; int tty = 0;
static char * const tokens[] = { "connector", "seat", "tty", NULL }; static char * const tokens[] = { "connector", "seat", "tty", NULL };

23
src/tty.c
View File

@ -29,6 +29,7 @@
#include <signal.h> #include <signal.h>
#include <linux/kd.h> #include <linux/kd.h>
#include <linux/vt.h> #include <linux/vt.h>
#include <linux/major.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "compositor.h" #include "compositor.h"
@ -97,21 +98,33 @@ tty_create(struct weston_compositor *compositor, tty_vt_func_t vt_func,
int ret; int ret;
struct tty *tty; struct tty *tty;
struct wl_event_loop *loop; struct wl_event_loop *loop;
struct stat buf;
char filename[16]; char filename[16];
tty = malloc(sizeof *tty); tty = malloc(sizeof *tty);
if (tty == NULL) if (tty == NULL)
return NULL; return NULL;
snprintf(filename, sizeof filename, "/dev/tty%d", tty_nr);
fprintf(stderr, "compositor: using %s\n", filename);
memset(tty, 0, sizeof *tty); memset(tty, 0, sizeof *tty);
tty->compositor = compositor; tty->compositor = compositor;
tty->vt_func = vt_func; tty->vt_func = vt_func;
tty->fd = open(filename, O_RDWR | O_NOCTTY); if (tty_nr > 0) {
snprintf(filename, sizeof filename, "/dev/tty%d", tty_nr);
fprintf(stderr, "compositor: using %s\n", filename);
tty->fd = open(filename, O_RDWR | O_NOCTTY | O_CLOEXEC);
} else {
tty->fd = fcntl(0, F_DUPFD_CLOEXEC, 0);
}
if (tty->fd <= 0) { if (tty->fd <= 0) {
fprintf(stderr, "failed to open active tty: %m\n"); fprintf(stderr, "failed to open tty: %m\n");
return NULL;
}
if (fstat(tty->fd, &buf) < 0 ||
major(buf.st_rdev) != TTY_MAJOR || minor(buf.st_rdev) == 0) {
fprintf(stderr, "stdin not a vt (%d, %d)\n",
major(buf.st_dev), minor(buf.st_dev));
return NULL; return NULL;
} }