interesting
/
aminal
mirror of https://github.com/liamg/aminal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #43 from liamg/tabbery 

fix tabs
This commit is contained in:
Liam Galvin 2018-10-26 09:53:27 +01:00 committed by GitHub
parent 19cbba9936 25802bc97a
commit 03edabd918
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buffer/buffer.go
View File

@ -644,7 +644,7 @@ func (buffer *Buffer) CarriageReturn() {
func (buffer *Buffer) Tab() { func (buffer *Buffer) Tab() {
defer buffer.emitDisplayChange() defer buffer.emitDisplayChange()
tabSize := 4 tabSize := 4
shift := int(buffer.cursorX) % tabSize shift := int(buffer.cursorX-1) % tabSize
if shift == 0 { if shift == 0 {
shift = tabSize shift = tabSize
} }

11
terminal/output.go
View File

@ -26,11 +26,15 @@ var escapeSequenceMap = map[rune]escapeSequenceHandler{
} }
func newLineSequenceHandler(pty chan rune, terminal *Terminal) error { func newLineSequenceHandler(pty chan rune, terminal *Terminal) error {
terminal.logger.Debugf("New line!")
terminal.ActiveBuffer().NewLine() terminal.ActiveBuffer().NewLine()
return nil return nil
} }
func tabSequenceHandler(pty chan rune, terminal *Terminal) error {
terminal.ActiveBuffer().Tab()
return nil
}
func carriageReturnSequenceHandler(pty chan rune, terminal *Terminal) error { func carriageReturnSequenceHandler(pty chan rune, terminal *Terminal) error {
terminal.ActiveBuffer().CarriageReturn() terminal.ActiveBuffer().CarriageReturn()
return nil return nil
@ -61,11 +65,6 @@ func shiftInSequenceHandler(pty chan rune, terminal *Terminal) error {
return nil return nil
} }
func tabSequenceHandler(pty chan rune, terminal *Terminal) error {
terminal.logger.Errorf("Received tab")
return nil
}
func (terminal *Terminal) processInput(ctx context.Context, pty chan rune) { func (terminal *Terminal) processInput(ctx context.Context, pty chan rune) {
// https://en.wikipedia.org/wiki/ANSI_escape_code // https://en.wikipedia.org/wiki/ANSI_escape_code