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

Adds ICRCRNL flag to map <CR> to <CR><NL> on input

Browse source 
I'm working with a device that terminates command with a bare <CR>.
This results in everything on the same line, which is confusing.
Remapping that bare <CR> to <CR><NL> makes it much easier to work
with, and this seems like a natural counterpart to INLCRNL.
This commit is contained in:
Lars Kellogg-Stedman 2019-10-16 22:54:51 -04:00
parent 39a8f63640
commit 68824e778a
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
man/tio.1
View file

@ -76,6 +76,8 @@ Ignore CR on input.
Map NL to CR on input. Map NL to CR on input.
.IP "\fBINLCRNL" .IP "\fBINLCRNL"
Map NL to CR-NL on input. Map NL to CR-NL on input.
.IP "\fBICRCRNL"
Map CR to CR-NL on input.
.IP "\fBOCRNL" .IP "\fBOCRNL"
Map CR to NL on output. Map CR to NL on output.
.IP "\fBODELBS" .IP "\fBODELBS"

9
src/tty.c
View file

@ -56,6 +56,7 @@ static bool standard_baudrate = true;
static void (*print)(char c); static void (*print)(char c);
static int fd; static int fd;
static bool map_i_nl_crnl = false; static bool map_i_nl_crnl = false;
static bool map_i_cr_crnl = false;
static bool map_o_cr_nl = false; static bool map_o_cr_nl = false;
static bool map_o_nl_crnl = false; static bool map_o_nl_crnl = false;
static bool map_o_del_bs = false; static bool map_o_del_bs = false;
@ -439,6 +440,8 @@ void tty_configure(void)
map_o_del_bs = true; map_o_del_bs = true;
else if (strcmp(token,"INLCRNL") == 0) else if (strcmp(token,"INLCRNL") == 0)
map_i_nl_crnl = true; map_i_nl_crnl = true;
else if (strcmp(token,"ICRCRNL") == 0)
map_i_cr_crnl = true;
else if (strcmp(token, "ONLCRNL") == 0) else if (strcmp(token, "ONLCRNL") == 0)
map_o_nl_crnl = true; map_o_nl_crnl = true;
else else
@ -647,6 +650,12 @@ int tty_connect(void)
/* Map input character */ /* Map input character */
if ((input_char == '\n') && (map_i_nl_crnl)) if ((input_char == '\n') && (map_i_nl_crnl))
{
print('\r');
print('\n');
if (option.timestamp)
next_timestamp = time(NULL);
} else if ((input_char == '\r') && (map_i_cr_crnl))
{ {
print('\r'); print('\r');
print('\n'); print('\n');