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

Do vt ioctl on the right fd.

Browse Source
This commit is contained in:
Kristian Høgsberg 2008-12-19 10:15:35 -05:00
parent 19ad6a9db3
commit 38ccd3a23e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
egl-compositor.c
View File

@ -1054,6 +1054,8 @@ static void on_enter_vt(int signal_number, void *data)
int i, ret; int i, ret;
int fd; int fd;
ioctl(ec->tty_fd, VT_RELDISP, VT_ACKACQ);
fd = ec->gem_fd; fd = ec->gem_fd;
resources = drmModeGetResources(fd); resources = drmModeGetResources(fd);
if (!resources) { if (!resources) {
@ -1110,7 +1112,6 @@ static void on_leave_vt(int signal_number, void *data)
static void watch_for_vt_changes(struct egl_compositor *ec, struct wl_event_loop *loop) static void watch_for_vt_changes(struct egl_compositor *ec, struct wl_event_loop *loop)
{ {
int fd;
struct vt_mode mode = { 0 }; struct vt_mode mode = { 0 };
ec->tty_fd = open("/dev/tty0", O_RDWR | O_NOCTTY); ec->tty_fd = open("/dev/tty0", O_RDWR | O_NOCTTY);
@ -1118,7 +1119,7 @@ static void watch_for_vt_changes(struct egl_compositor *ec, struct wl_event_loop
mode.relsig = SIGUSR1; mode.relsig = SIGUSR1;
mode.acqsig = SIGUSR2; mode.acqsig = SIGUSR2;
if (!ioctl (fd, VT_SETMODE, &mode) < 0) { if (!ioctl (ec->tty_fd, VT_SETMODE, &mode) < 0) {
fprintf(stderr, "failed to take control of vt handling\n"); fprintf(stderr, "failed to take control of vt handling\n");
} }