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

Merge branch 'master' into bug/92-fflush

Browse source
This commit is contained in:
Martin Lund 2021-01-18 01:11:05 +01:00 • committed by GitHub
commit 50e33a1a5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 80 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

72
src/tty.c
View file

@ -30,6 +30,7 @@
#include <sys/stat.h>
#include <sys/param.h>
#include <sys/file.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <termios.h>
#include <stdbool.h>
@ -79,10 +80,36 @@ static void print_normal(char c)
fflush(stdout);
}
static void toggle_line(const char *line_name, int mask)
{
int state;
if (ioctl(fd, TIOCMGET, &state) < 0)
{
error_printf("Could not get line state: %s", strerror(errno));
}
else
{
if (state & mask)
{
state &= ~mask;
tio_printf("set %s to LOW", line_name);
}
else
{
state |= mask;
tio_printf("set %s to HIGH", line_name);
}
if (ioctl(fd, TIOCMSET, &state) < 0)
error_printf("Could not set line state: %s", strerror(errno));
}
}
void handle_command_sequence(char input_char, char previous_char, char *output_char, bool *forward)
{
char unused_char;
bool unused_bool;
int state;
/* Ignore unused arguments */
if (output_char == NULL)
@ -111,9 +138,34 @@ void handle_command_sequence(char input_char, char previous_char, char *output_c
tio_printf(" ctrl-t s Show statistics");
tio_printf(" ctrl-t t Send ctrl-t key code");
tio_printf(" ctrl-t T Toggle timestamps");
tio_printf(" ctrl-t L Show lines");
tio_printf(" ctrl-t d Toggle DTR");
tio_printf(" ctrl-t r Toggle RTS");
tio_printf(" ctrl-t v Show version");
break;
case KEY_SHIFT_L:
if (ioctl(fd, TIOCMGET, &state) < 0)
{
error_printf("Could not get line state: %s", strerror(errno));
break;
}
tio_printf("Lines state:");
tio_printf(" DTR: %s", (state & TIOCM_DTR) ? "HIGH" : "LOW");
tio_printf(" RTS: %s", (state & TIOCM_RTS) ? "HIGH" : "LOW");
tio_printf(" CTS: %s", (state & TIOCM_CTS) ? "HIGH" : "LOW");
tio_printf(" DSR: %s", (state & TIOCM_DSR) ? "HIGH" : "LOW");
tio_printf(" DCD: %s", (state & TIOCM_CD) ? "HIGH" : "LOW");
tio_printf(" RI : %s", (state & TIOCM_RI) ? "HIGH" : "LOW");
break;
case KEY_D:
toggle_line("DTR", TIOCM_DTR);
break;
case KEY_R:
toggle_line("RTS", TIOCM_RTS);
break;
case KEY_B:
tcsendbreak(fd, 0);
break;
@ -236,6 +288,10 @@ void stdout_configure(void)
{
int status;
/* Disable line buffering in stdout. This is necessary if we
* want things like local echo to work correctly. */
setbuf(stdout, NULL);
/* Save current stdout settings */
if (tcgetattr(STDOUT_FILENO, &stdout_old) < 0)
{
@ -537,6 +593,7 @@ static void optional_local_echo(char c)
if (!option.local_echo)
return;
print(c);
fflush(stdout);
if (option.log)
log_write(c);
}
@ -550,6 +607,7 @@ int tty_connect(void)
static bool first = true;
int status;
time_t next_timestamp = 0;
char* now = NULL;
/* Open tty device */
#ifdef __APPLE__
@ -643,7 +701,19 @@ int tty_connect(void)
/* Print timestamp on new line, if desired. */
if (next_timestamp && input_char != '\n' && input_char != '\r')
{
fprintf(stdout, ANSI_COLOR_GRAY "[%s] " ANSI_COLOR_RESET, current_time());
now = current_time();
fprintf(stdout, ANSI_COLOR_GRAY "[%s] " ANSI_COLOR_RESET, now);
if (option.log)
{
log_write('[');
while (*now != '\0')
{
log_write(*now);
++now;
}
log_write(']');
log_write(' ');
}
next_timestamp = 0;
}