enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

ecore-drm: Unify and cleanup tty code 

This patch brings the tty code more inline with what the logind code
Was doing. It also fixes the return value from the vt_signal handler,
and opens the tty in non-blocking mode now.

@fix

Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
This commit is contained in:
Chris Michael 2016-01-21 11:38:07 -05:00
parent e0c36d27f5
commit cb983f747b
2 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/ecore_drm/ecore_drm_private.h
View File

@ -263,6 +263,7 @@ void _ecore_drm_launcher_device_close(const char *device, int fd);
int _ecore_drm_launcher_device_flags_set(int fd, int flags);
Eina_Bool _ecore_drm_tty_switch(Ecore_Drm_Device *dev, int activate_vt);
void _ecore_drm_tty_restore(Ecore_Drm_Device *dev);
Ecore_Drm_Evdev *_ecore_drm_evdev_device_create(Ecore_Drm_Seat *seat, struct libinput_device *device);
void _ecore_drm_evdev_device_destroy(Ecore_Drm_Evdev *evdev);

50
src/lib/ecore_drm/ecore_drm_tty.c
View File

@ -17,8 +17,10 @@ _ecore_drm_tty_cb_vt_signal(void *data, int type EINA_UNUSED, void *event)
ev = event;
sig = ev->data;
if (sig.si_code != SI_KERNEL) return ECORE_CALLBACK_RENEW;
if (!(dev = data)) return ECORE_CALLBACK_RENEW;
if (sig.si_code != SI_KERNEL) return ECORE_CALLBACK_PASS_ON;
if (!(dev = data)) return ECORE_CALLBACK_PASS_ON;
DBG("TTY SWITCH SIGNAL");
switch (ev->number)
{
@ -38,7 +40,7 @@ _ecore_drm_tty_cb_vt_signal(void *data, int type EINA_UNUSED, void *event)
break;
}
return ECORE_CALLBACK_RENEW;
return ECORE_CALLBACK_PASS_ON;
}
Eina_Bool
@ -55,7 +57,8 @@ _ecore_drm_tty_setup(Ecore_Drm_Device *dev)
struct vt_mode vtmode = { 0, 0, SIGUSR1, SIGUSR2, 0 };
if ((fstat(dev->tty.fd, &st) == -1) ||
(major(st.st_rdev) != TTY_MAJOR) || (minor(st.st_rdev) == 0))
(major(st.st_rdev) != TTY_MAJOR) || (minor(st.st_rdev) <= 0) ||
(minor(st.st_rdev) >= 64))
{
ERR("Failed to get stats for tty");
return EINA_FALSE;
@ -70,23 +73,25 @@ _ecore_drm_tty_setup(Ecore_Drm_Device *dev)
if (kmode != KD_TEXT)
WRN("Virtual Terminal already in KD_GRAPHICS mode");
if (ioctl(dev->tty.fd, VT_ACTIVATE, minor(st.st_rdev)) < 0)
{
ERR("Failed to activate vt: %m");
return EINA_FALSE;
}
/* if (ioctl(dev->tty.fd, VT_ACTIVATE, minor(st.st_rdev)) < 0) */
/* { */
/* ERR("Failed to activate vt: %m"); */
/* return EINA_FALSE; */
/* } */
if (ioctl(dev->tty.fd, VT_WAITACTIVE, minor(st.st_rdev)) < 0)
{
ERR("Failed to wait active: %m");
return EINA_FALSE;
}
/* if (ioctl(dev->tty.fd, VT_WAITACTIVE, minor(st.st_rdev)) < 0) */
/* { */
/* ERR("Failed to wait active: %m"); */
/* return EINA_FALSE; */
/* } */
if (ioctl(dev->tty.fd, KDGKBMODE, &kbd_mode))
{
ERR("Could not get curent kbd mode: %m");
return EINA_FALSE;
WRN("Could not get current kbd mode: %m");
dev->tty.kbd_mode = K_UNICODE;
}
else if (dev->tty.kbd_mode == K_OFF)
dev->tty.kbd_mode = K_UNICODE;
if (ioctl(dev->tty.fd, KDSKBMUTE, 1) &&
ioctl(dev->tty.fd, KDSKBMODE, K_OFF))
@ -105,6 +110,7 @@ _ecore_drm_tty_setup(Ecore_Drm_Device *dev)
vtmode.waitv = 0;
vtmode.relsig = SIGUSR1;
vtmode.acqsig = SIGUSR2;
if (ioctl(dev->tty.fd, VT_SETMODE, &vtmode) < 0)
{
ERR("Could not set Terminal Mode: %m");
@ -115,6 +121,8 @@ _ecore_drm_tty_setup(Ecore_Drm_Device *dev)
err_setmode:
ioctl(dev->tty.fd, KDSETMODE, KD_TEXT);
err_kmode:
ioctl(dev->tty.fd, KDSKBMUTE, 0);
ioctl(dev->tty.fd, KDSKBMODE, dev->tty.kbd_mode);
return EINA_FALSE;
}
@ -158,10 +166,10 @@ ecore_drm_tty_open(Ecore_Drm_Device *dev, const char *name)
{
DBG("Trying to Open Tty: %s", tty);
dev->tty.fd = open(tty, (O_RDWR | O_CLOEXEC)); //O_RDWR | O_NOCTTY);
dev->tty.fd = open(tty, (O_RDWR | O_CLOEXEC | O_NONBLOCK));
if (dev->tty.fd < 0)
{
DBG("Failed to Open Tty: %m");
DBG("Failed to Open Tty %s: %m", tty);
return EINA_FALSE;
}
}
@ -193,7 +201,7 @@ ecore_drm_tty_open(Ecore_Drm_Device *dev, const char *name)
return EINA_TRUE;
}
static void
void
_ecore_drm_tty_restore(Ecore_Drm_Device *dev)
{
int fd = dev->tty.fd;
@ -226,9 +234,11 @@ ecore_drm_tty_close(Ecore_Drm_Device *dev)
_ecore_drm_tty_restore(dev);
close(dev->tty.fd);
dev->tty.fd = -1;
if (dev->tty.event_hdlr)
ecore_event_handler_del(dev->tty.event_hdlr);
/* clear the tty name */
if (dev->tty.name) eina_stringshare_del(dev->tty.name);
dev->tty.name = NULL;