mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-02 09:01:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stop remembering the drm fd in child.

Browse source
This commit is contained in:
Scott Anderson 2017-07-09 22:23:54 +12:00
parent 2f2c8205d8
commit 3779ef802d
3 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
session/direct.c
View file

@ -65,7 +65,7 @@ static void direct_session_close(struct wlr_session *base, int fd) {
}
if (major(st.st_rdev) == DRM_MAJOR) {
direct_ipc_dropmaster(session->sock);
direct_ipc_dropmaster(session->sock, session->base.drm_fd);
session->base.drm_fd = -1;
} else if (major(st.st_rdev) == INPUT_MAJOR) {
ioctl(fd, EVIOCREVOKE, 0);
@ -109,11 +109,11 @@ static int vt_handler(int signo, void *data) {
if (session->base.active) {
session->base.active = false;
wl_signal_emit(&session->base.session_signal, session);
direct_ipc_dropmaster(session->sock);
direct_ipc_dropmaster(session->sock, session->base.drm_fd);
ioctl(session->tty_fd, VT_RELDISP, 1);
} else {
ioctl(session->tty_fd, VT_RELDISP, VT_ACKACQ);
direct_ipc_setmaster(session->sock);
direct_ipc_setmaster(session->sock, session->base.drm_fd);
session->base.active = true;
wl_signal_emit(&session->base.session_signal, session);
}