Maarrk/tio
1
0
Fork 0
mirror of https://github.com/tio/tio.git synced 2026-05-01 14:57:59 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Cleaned up and simplified key handling

Browse source
This commit is contained in:
Martin Lund 2016-05-16 22:51:34 +02:00
parent 2a5ee61c54
commit 9571a84d70
1 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/tty.c
View file

@ -49,7 +49,7 @@ void wait_for_tty_device(void)
fd_set rdfs; fd_set rdfs;
int status; int status;
struct timeval tv; struct timeval tv;
static char c_stdin[3]; static char input_char, previous_char = 0;
static bool first = true; static bool first = true;
/* Loop until device pops up */ /* Loop until device pops up */
@ -78,7 +78,7 @@ void wait_for_tty_device(void)
/* Input from stdin ready */ /* Input from stdin ready */
/* Read one character */ /* Read one character */
status = read(STDIN_FILENO, &c_stdin[0], 1); status = read(STDIN_FILENO, &input_char, 1);
if (status <= 0) if (status <= 0)
{ {
error_printf("Could not read from stdin"); error_printf("Could not read from stdin");
@ -86,11 +86,11 @@ void wait_for_tty_device(void)
} }
/* Exit upon ctrl-t + q sequence */ /* Exit upon ctrl-t + q sequence */
c_stdin[2] = c_stdin[1]; if ((input_char == KEY_Q) && (previous_char == KEY_CTRL_T))
c_stdin[1] = c_stdin[0];
if ((c_stdin[1] == KEY_Q) && (c_stdin[2] == KEY_CTRL_T))
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
previous_char = input_char;
} else if (status == -1) } else if (status == -1)
{ {
error_printf("select() failed (%s)", strerror(errno)); error_printf("select() failed (%s)", strerror(errno));
@ -167,8 +167,7 @@ int connect_tty(void)
fd_set rdfs; /* Read file descriptor set */ fd_set rdfs; /* Read file descriptor set */
int maxfd; /* Maximum file descriptor used */ int maxfd; /* Maximum file descriptor used */
static bool first = true; static bool first = true;
char c_tty; static char input_char, previous_char = 0;
char c_stdin[3] = {};
int status; int status;
/* Open tty device */ /* Open tty device */
@ -201,8 +200,6 @@ int connect_tty(void)
color_printf("[tio %s] Connected", current_time()); color_printf("[tio %s] Connected", current_time());
connected = true; connected = true;
tainted = false; tainted = false;
bzero(&c_stdin[0], 3);
c_tty = 0;
/* Save current port settings */ /* Save current port settings */
if (tcgetattr(fd, &old_tio) < 0) if (tcgetattr(fd, &old_tio) < 0)
@ -244,15 +241,15 @@ int connect_tty(void)
if (FD_ISSET(fd, &rdfs)) if (FD_ISSET(fd, &rdfs))
{ {
/* Input from tty device ready */ /* Input from tty device ready */
if (read(fd, &c_tty, 1) > 0) if (read(fd, &input_char, 1) > 0)
{ {
/* Print received tty character to stdout */ /* Print received tty character to stdout */
putchar(c_tty); putchar(input_char);
fflush(stdout); fflush(stdout);
/* Write to log */ /* Write to log */
if (option.log) if (option.log)
log_write(c_tty); log_write(input_char);
tainted = true; tainted = true;
} else } else
@ -265,7 +262,7 @@ int connect_tty(void)
if (FD_ISSET(STDIN_FILENO, &rdfs)) if (FD_ISSET(STDIN_FILENO, &rdfs))
{ {
/* Input from stdin ready */ /* Input from stdin ready */
status = read(STDIN_FILENO, &c_stdin[0], 1); status = read(STDIN_FILENO, &input_char, 1);
if (status <= 0) if (status <= 0)
{ {
error_printf("Could not read from stdin"); error_printf("Could not read from stdin");
@ -273,24 +270,24 @@ int connect_tty(void)
} }
/* Exit upon ctrl-t + q sequence */ /* Exit upon ctrl-t + q sequence */
c_stdin[2] = c_stdin[1]; if ((input_char == KEY_Q) && (previous_char == KEY_CTRL_T))
c_stdin[1] = c_stdin[0];
if ((c_stdin[1] == KEY_Q) && (c_stdin[2] == KEY_CTRL_T))
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
/* Ignore ctrl-t except when repeated */ /* Ignore ctrl-t except when repeated */
if ((c_stdin[0] != KEY_CTRL_T) || if ((input_char != KEY_CTRL_T) ||
((c_stdin[1] == KEY_CTRL_T) && (c_stdin[2] == KEY_CTRL_T))) ((input_char == KEY_CTRL_T) && (previous_char == KEY_CTRL_T)))
{ {
/* Forward input to tty device */ /* Forward input to tty device */
status = write(fd, &c_stdin[0], 1); status = write(fd, &input_char, 1);
if (status < 0) if (status < 0)
printf("Warning: Could not write to tty device\r\n"); printf("Warning: Could not write to tty device\r\n");
} }
previous_char = input_char;
/* Write to log */ /* Write to log */
if (option.log) if (option.log)
log_write(c_stdin[0]); log_write(input_char);
/* Insert output delay */ /* Insert output delay */
if (option.output_delay) if (option.output_delay)