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

progress

This commit is contained in:
Liam Galvin 2018-06-29 15:28:35 +01:00
parent 7d0aebbfc2
commit 9b890c370d
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
raft
View File

Binary file not shown.

35
terminal/terminal.go
View File

@ -86,7 +86,9 @@ type Position struct {
func New(pty *os.File, logger *zap.SugaredLogger) *Terminal { func New(pty *os.File, logger *zap.SugaredLogger) *Terminal {
return &Terminal{ return &Terminal{
lines: []Line{}, lines: []Line{
NewLine(),
},
pty: pty, pty: pty,
logger: logger, logger: logger,
onUpdate: []func(){}, onUpdate: []func(){},
@ -256,7 +258,10 @@ func (terminal *Terminal) Read() error {
switch b { switch b {
case 0x0a: case 0x0a:
terminal.newLine() for terminal.position.Line+1 >= len(terminal.lines) {
terminal.lines = append(terminal.lines, NewLine())
}
terminal.position.Line++
case 0x0d: case 0x0d:
terminal.position.Col = 0 terminal.position.Col = 0
case 0x08: case 0x08:
@ -298,19 +303,10 @@ func (terminal *Terminal) writeRune(r rune) {
} }
func (terminal *Terminal) newLine() {
if terminal.position.Line >= len(terminal.lines) {
terminal.lines = append(terminal.lines, NewLine())
}
terminal.position.Col = 0
terminal.position.Line++
}
func (terminal *Terminal) Clear() { func (terminal *Terminal) Clear() {
// @todo actually should just add a bunch of newlines? // @todo actually should just add a bunch of newlines?
for i := 0; i < int(terminal.size.Height); i++ { for i := 0; i < int(terminal.size.Height); i++ {
terminal.newLine() terminal.lines = append(terminal.lines, NewLine())
} }
terminal.SetPosition(Position{Line: 0, Col: 0}) terminal.SetPosition(Position{Line: 0, Col: 0})
} }
@ -339,11 +335,6 @@ func (terminal *Terminal) GetCellAtPos(pos Position) (*Cell, error) {
func (terminal *Terminal) setRuneAtPos(pos Position, r rune) error { func (terminal *Terminal) setRuneAtPos(pos Position, r rune) error {
if int(terminal.size.Height) <= pos.Line {
terminal.logger.Errorf("Line %d does not exist", pos.Line)
return fmt.Errorf("Line %d does not exist", pos.Line)
}
if int(terminal.size.Width) <= pos.Col { if int(terminal.size.Width) <= pos.Col {
terminal.logger.Errorf("Col %d does not exist", pos.Col) terminal.logger.Errorf("Col %d does not exist", pos.Col)
return fmt.Errorf("Col %d does not exist", pos.Col) return fmt.Errorf("Col %d does not exist", pos.Col)
@ -355,13 +346,9 @@ func (terminal *Terminal) setRuneAtPos(pos Position, r rune) error {
line := terminal.getBufferedLine(pos.Line) line := terminal.getBufferedLine(pos.Line)
if line == nil { if line == nil {
for pos.Line >= len(terminal.lines) {
terminal.lines = append(terminal.lines, NewLine()) return fmt.Errorf("Impossible?")
}
line = terminal.getBufferedLine(pos.Line)
if line == nil {
panic(fmt.Errorf("Impossible?"))
}
} }
for pos.Col >= len(line.Cells) { for pos.Col >= len(line.Cells) {