vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

readline: allow writing without tty + small fixes

pull/1989/head
Henrixounez 2019-09-15 03:33:31 +02:00 committed by Alexander Medvednikov
parent 1d7b9a3b0b
commit 04ff9ede9f
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vlib/readline/readline_lin.v
View File

@ -42,6 +42,7 @@ mut:
prompt string prompt string
previous_lines []string previous_lines []string
search_index int search_index int
is_tty bool
} }
@ -69,7 +70,8 @@ enum Action {
// Toggle raw mode of the terminal by changing its attributes // Toggle raw mode of the terminal by changing its attributes
pub fn (r mut Readline) enable_raw_mode() { pub fn (r mut Readline) enable_raw_mode() {
if ( C.tcgetattr(0, &r.orig_termios) == -1 ) { if ( C.tcgetattr(0, &r.orig_termios) == -1 ) {
panic('No tty') r.is_tty = false
return
} }
mut raw := r.orig_termios mut raw := r.orig_termios
raw.c_iflag &= ~( C.BRKINT | C.ICRNL | C.INPCK | C.ISTRIP | C.IXON ) raw.c_iflag &= ~( C.BRKINT | C.ICRNL | C.INPCK | C.ISTRIP | C.IXON )
@ -79,12 +81,14 @@ pub fn (r mut Readline) enable_raw_mode() {
raw.c_cc[C.VTIME] = 0 raw.c_cc[C.VTIME] = 0
C.tcsetattr(0, C.TCSADRAIN, &raw) C.tcsetattr(0, C.TCSADRAIN, &raw)
r.is_raw = true r.is_raw = true
r.is_tty = true
} }
// Not catching the SIGUSER (CTRL+C) Signal // Not catching the SIGUSER (CTRL+C) Signal
pub fn (r Readline) enable_raw_mode2() { pub fn (r mut Readline) enable_raw_mode2() {
if ( C.tcgetattr(0, &r.orig_termios) == -1 ) { if ( C.tcgetattr(0, &r.orig_termios) == -1 ) {
panic('No tty') r.is_tty = false
return
} }
mut raw := r.orig_termios mut raw := r.orig_termios
raw.c_iflag &= ~( C.BRKINT | C.ICRNL | C.INPCK | C.ISTRIP | C.IXON ) raw.c_iflag &= ~( C.BRKINT | C.ICRNL | C.INPCK | C.ISTRIP | C.IXON )
@ -93,6 +97,8 @@ pub fn (r Readline) enable_raw_mode2() {
raw.c_cc[C.VMIN] = 1 raw.c_cc[C.VMIN] = 1
raw.c_cc[C.VTIME] = 0 raw.c_cc[C.VTIME] = 0
C.tcsetattr(0, C.TCSADRAIN, &raw) C.tcsetattr(0, C.TCSADRAIN, &raw)
r.is_raw = true
r.is_tty = true
} }
// Reset back the terminal to its default value // Reset back the terminal to its default value
@ -224,8 +230,8 @@ fn (r mut Readline) execute(a Action, c byte) bool {
fn get_screen_columns() int { fn get_screen_columns() int {
ws := winsize{} ws := winsize{}
cols := if C.ioctl(1, C.TIOCGWINSZ, &ws) == -1 { 80 } else { ws.ws_col } cols := if C.ioctl(1, C.TIOCGWINSZ, &ws) == -1 { 80 } else { int(ws.ws_col) }
return int(cols) return cols
} }
fn shift_cursor(xpos int, yoffset int) { fn shift_cursor(xpos int, yoffset int) {
@ -299,7 +305,9 @@ fn (r mut Readline) insert_character(c byte) {
} }
r.cursor++ r.cursor++
// Refresh the line to add the new character // Refresh the line to add the new character
r.refresh_line() if r.is_tty {
r.refresh_line()
}
} }
// Removes the character behind cursor. // Removes the character behind cursor.
@ -325,7 +333,9 @@ fn (r mut Readline) suppr_character() {
fn (r mut Readline) commit_line() bool { fn (r mut Readline) commit_line() bool {
r.previous_lines.insert(1, r.current) r.previous_lines.insert(1, r.current)
r.current = r.current + '\n' r.current = r.current + '\n'
println('') if r.is_tty {
println('')
}
return true return true
} }