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

tty: Use SIGUSR1 for both enter and leave signals

Browse Source 
Now that we track has_vt, we can use the same handler for both enter and leave.
This commit is contained in:
Kristian Høgsberg
2012-01-18 12:42:16 -05:00
parent 62d2774956
commit 08fcbf0f3d
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tty.c
+14 -23
View File
@@ -40,33 +40,26 @@ struct tty {
struct termios terminal_attributes; struct termios terminal_attributes;
struct wl_event_source *input_source; struct wl_event_source *input_source;
struct wl_event_source *enter_vt_source; struct wl_event_source *vt_source;
struct wl_event_source *leave_vt_source;
tty_vt_func_t vt_func; tty_vt_func_t vt_func;
int vt, starting_vt, has_vt; int vt, starting_vt, has_vt;
}; };
static int on_enter_vt(int signal_number, void *data) static int vt_handler(int signal_number, void *data)
{ {
struct tty *tty = data; struct tty *tty = data;
ioctl(tty->fd, VT_RELDISP, VT_ACKACQ); if (tty->has_vt) {
tty->vt_func(tty->compositor, TTY_LEAVE_VT);
tty->has_vt = 0;
tty->vt_func(tty->compositor, TTY_ENTER_VT); ioctl(tty->fd, VT_RELDISP, 1);
tty->has_vt = 1; } else {
ioctl(tty->fd, VT_RELDISP, VT_ACKACQ);
return 1; tty->vt_func(tty->compositor, TTY_ENTER_VT);
} tty->has_vt = 1;
}
static int
on_leave_vt(int signal_number, void *data)
{
struct tty *tty = data;
tty->vt_func(tty->compositor, TTY_LEAVE_VT);
tty->has_vt = 0;
ioctl(tty->fd, VT_RELDISP, 1);
return 1; return 1;
} }
@@ -191,16 +184,14 @@ tty_create(struct weston_compositor *compositor, tty_vt_func_t vt_func,
tty->has_vt = 1; tty->has_vt = 1;
mode.mode = VT_PROCESS; mode.mode = VT_PROCESS;
mode.relsig = SIGUSR1; mode.relsig = SIGUSR1;
mode.acqsig = SIGUSR2; mode.acqsig = SIGUSR1;
if (ioctl(tty->fd, VT_SETMODE, &mode) < 0) { if (ioctl(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");
return NULL; return NULL;
} }
tty->leave_vt_source = tty->vt_source =
wl_event_loop_add_signal(loop, SIGUSR1, on_leave_vt, tty); wl_event_loop_add_signal(loop, SIGUSR1, vt_handler, tty);
tty->enter_vt_source =
wl_event_loop_add_signal(loop, SIGUSR2, on_enter_vt, tty);
return tty; return tty;
} }