hmm rednering

gui/gui.go

@@ -31,6 +31,8 @@ type GUI struct {
 	charHeight float32
 	texts      [][]*v41.Text
 	textLock   sync.Mutex
+	cols       int
+	rows       int
 }
 
 func New(config config.Config, terminal *terminal.Terminal, logger *zap.SugaredLogger) *GUI {
@@ -54,6 +56,13 @@ func (gui *GUI) SetSize(w int, h int) {
 }
 
 func (gui *GUI) resize(w *glfw.Window, width int, height int) {
+
+	if width == gui.width && height == gui.height {
+		return
+	}
+
+	gui.logger.Debugf("GUI resize to %dx%d", width, height)
+
 	gui.width = width
 	gui.height = height
 	if gui.font != nil {
@@ -65,22 +74,20 @@ func (gui *GUI) resize(w *glfw.Window, width int, height int) {
 	text := v41.NewText(gui.font, scaleMin, scaleMax)
 	text.SetString("A")
 	gui.charWidth, gui.charHeight = text.Width(), text.Height()
+	text.Release()
 
-	cols := int(math.Floor(float64(float32(width) / gui.charWidth)))
+	gui.cols = int(math.Floor(float64(float32(width) / gui.charWidth)))
-	rows := int(math.Floor(float64(float32(height) / gui.charHeight)))
+	gui.rows = int(math.Floor(float64(float32(height) / gui.charHeight)))
 
-	if err := gui.terminal.SetSize(cols, rows); err != nil {
+	if err := gui.terminal.SetSize(gui.cols, gui.rows); err != nil {
-		gui.logger.Errorf("Failed to resize terminal to %d cols, %d rows: %s", cols, rows, err)
+		gui.logger.Errorf("Failed to resize terminal to %d cols, %d rows: %s", gui.cols, gui.rows, err)
 	}
 
 	gui.createTexts()
 }
 
 func (gui *GUI) getTermSize() (int, int) {
-	scaleMin, scaleMax := float32(1.0), float32(1.1)
+	return gui.cols, gui.rows
-	text := v41.NewText(gui.font, scaleMin, scaleMax)
-	text.SetString("A")
-	return gui.width / int(text.Width()), gui.height / int(text.Height())
 }
 
 // checks if the terminals cells have been updated, and updates the text objects if needed
@@ -88,6 +95,8 @@ func (gui *GUI) updateTexts() {
 	gui.textLock.Lock()
 	defer gui.textLock.Unlock()
 
+	//gui.logger.Debugf("Updating texts...")
+
 	cols, rows := gui.getTermSize()
 
 	for row := 0; row < rows; row++ {
@@ -101,6 +110,11 @@ func (gui *GUI) updateTexts() {
 				gui.texts[row][col].SetString(string(r))
 				gui.texts[row][col].SetColor(mgl32.Vec3{1, 1, 1})
 				// @todo set colour
+				gui.texts[row][col].Show()
+			} else {
+				//gui.texts[row][col].Hide()
+				gui.texts[row][col].SetString("?")
+				gui.texts[row][col].SetColor(mgl32.Vec3{0.1, 0.1, 0.15})
 			}
 		}
 	}
@@ -109,7 +123,6 @@ func (gui *GUI) updateTexts() {
 // builds text objects
 func (gui *GUI) createTexts() {
 	gui.textLock.Lock()
-	defer gui.textLock.Unlock()
 	scaleMin, scaleMax := float32(1.0), float32(1.1)
 
 	cols, rows := gui.getTermSize()
@@ -123,18 +136,27 @@ func (gui *GUI) createTexts() {
 		for col := 0; col < cols; col++ {
 			if len(texts[row]) <= col {
 				text := v41.NewText(gui.font, scaleMin, scaleMax)
+				text.Hide()
 
 				if row < len(gui.texts) {
 					if col < len(gui.texts[row]) {
 						text.SetString(gui.texts[row][col].String)
+						gui.texts[row][col].Release()
+						if gui.texts[row][col].String != "" {
+							text.Show()
+						}
 					}
 				}
 
-				text.SetColor(mgl32.Vec3{1, 1, 1})
-
 				x := ((float32(col) * gui.charWidth) - (float32(gui.width) / 2)) + (gui.charWidth / 2)
 				y := -(((float32(row) * gui.charHeight) - (float32(gui.height) / 2)) + (gui.charHeight / 2))
 
+				if col == 0 && row == 0 {
+					gui.logger.Debugf("0,0 is at %f,%f", x, y)
+				} else if col == cols-1 && row == rows-1 {
+					gui.logger.Debugf("%d,%d is at %f,%f", col, row, x, y)
+				}
+
 				text.SetPosition(mgl32.Vec2{x, y})
 				texts[row] = append(texts[row], text)
 			}
@@ -142,7 +164,9 @@ func (gui *GUI) createTexts() {
 	}
 
 	gui.texts = texts
+	gui.textLock.Unlock()
 
+	gui.updateTexts()
 }
 
 func (gui *GUI) Render() error {
@@ -170,16 +194,14 @@ func (gui *GUI) Render() error {
 		return fmt.Errorf("Failed to load font: %s", err)
 	}
 
-	gui.resize(gui.window, gui.width, gui.height)
-
 	gui.window.SetFramebufferSizeCallback(gui.resize)
-	w, h := gui.window.GetFramebufferSize()
+	w, h := gui.window.GetSize()
-	gl.Viewport(0, 0, int32(w), int32(h))
+	gui.resize(gui.window, w, h)
+
+	gl.Viewport(0, 0, int32(gui.width), int32(gui.height))
 
 	gui.logger.Debugf("Starting pty read handling...")
-	gui.terminal.OnUpdate(func() {
+	gui.terminal.OnUpdate(gui.updateTexts)
-		gui.updateTexts()
-	})
 	go gui.terminal.Read()
 
 	scaleMin, scaleMax := float32(1.0), float32(1.1)
@@ -201,7 +223,7 @@ func (gui *GUI) Render() error {
 
 		select {
 		case <-ticker.C:
-			text.SetString(fmt.Sprintf("%d fps | %d, %d", frames, gui.terminal.GetPosition().Row, gui.terminal.GetPosition().Col))
+			text.SetString(fmt.Sprintf("%d fps | %d, %d | %s", frames, gui.terminal.GetPosition().Col, gui.terminal.GetPosition().Row, gui.texts[0][0].String))
 			frames = 0
 		default:
 		}
@@ -217,6 +239,8 @@ func (gui *GUI) Render() error {
 
 		for row := 0; row < rows; row++ {
 			for col := 0; col < cols; col++ {
+				gui.texts[row][col].SetColor(mgl32.Vec3{1, 1, 1})
+				//gui.texts[row][col].SetString("?")
 				gui.texts[row][col].Draw()
 			}
 		}

main.go

@@ -43,6 +43,7 @@ func main() {
 	go func() {
 		time.Sleep(time.Second * 5)
 		terminal.Write([]byte("tput cols && tput lines\n"))
+		terminal.Write([]byte("ls -la\n"))
 	}()
 
 	g := gui.New(conf, terminal, sugaredLogger)

terminal/cell.go

@@ -1,5 +1,5 @@
 package terminal
 
 type Cell struct {
-	rune rune
+	r rune
 }

terminal/terminal.go

@@ -86,12 +86,35 @@ func (terminal *Terminal) Read() error {
 				b = <-buffer
 				switch b {
 				case 0x5b: // CSI: Control Sequence Introducer ]
-					b = <-buffer
+					var final byte
-					switch b {
+					params := []byte{}
-					case 0x4b: // K - EOL - Erase to end of line
+					intermediate := []byte{}
+				CSI:
+					for {
+						b = <-buffer
+						switch true {
+						case b >= 0x30 && b <= 0x3F:
+							params = append(params, b)
+						case b >= 0x20 && b <= 0x2F:
+							intermediate = append(intermediate, b)
+						case b >= 0x40 && b <= 0x7e:
+							final = b
+							break CSI
+						}
+					}
 
+					switch final {
+					case 0x4b: // K - EOL - Erase to end of line
+						if len(params) == 0 || params[0] == byte('0') {
+							terminal.ClearToEndOfLine()
+						} else {
+							terminal.logger.Errorf("Unsupported EL")
+						}
+					case byte('m'):
+						// SGR: colour and shit
 					default:
-						terminal.logger.Debugf("Unknown CSI control sequence: 0x%02X (%s)", b, string([]byte{b}))
+						b = <-buffer
+						terminal.logger.Debugf("Unknown CSI control sequence: 0x%02X (%s)", final, string([]byte{final}))
 					}
 				case 0x5d: // OSC: Operating System Command
 					b = <-buffer
@@ -128,11 +151,13 @@ func (terminal *Terminal) Read() error {
 				default:
 					// render character at current location
 					//		fmt.Printf("%s\n", string([]byte{b}))
-					terminal.writeRune([]rune(string([]byte{b}))[0])
+					if err := terminal.writeRune([]rune(string([]byte{b}))[0]); err != nil {
+						terminal.logger.Errorf("Failed to write rune %s", string([]byte{b}))
+					}
 				}
 
 			}
-
+			terminal.triggerOnUpdate()
 		}
 	}()
 
@@ -148,7 +173,7 @@ func (terminal *Terminal) Read() error {
 			for _, x := range readBytes {
 				buffer <- x
 			}
-			terminal.triggerOnUpdate()
+
 		}
 	}
 }
@@ -187,7 +212,7 @@ func (terminal *Terminal) newLine() {
 func (terminal *Terminal) Clear() {
 	for y := range terminal.cells {
 		for x := range terminal.cells[y] {
-			terminal.cells[y][x].rune = 0
+			terminal.cells[y][x].r = 0
 		}
 	}
 	terminal.position = Position{0, 0}
@@ -206,7 +231,7 @@ func (terminal *Terminal) GetRuneAtPos(pos Position) (rune, error) {
 		return 0, fmt.Errorf("Col %d does not exist", pos.Col)
 	}
 
-	return terminal.cells[pos.Row][pos.Col].rune, nil
+	return terminal.cells[pos.Row][pos.Col].r, nil
 }
 
 func (terminal *Terminal) setRuneAtPos(pos Position, r rune) error {
@@ -219,9 +244,11 @@ func (terminal *Terminal) setRuneAtPos(pos Position, r rune) error {
 		return fmt.Errorf("Col %d does not exist", pos.Col)
 	}
 
-	//fmt.Printf("%d %d %s\n", pos.Row, pos.Col, string(r))
+	if pos.Row == 0 && pos.Col == 0 {
+		fmt.Printf("\n\nSetting %d %d to %q\n\n\n", pos.Row, pos.Col, string(r))
+	}
 
-	terminal.cells[pos.Row][pos.Col].rune = r
+	terminal.cells[pos.Row][pos.Col].r = r
 	return nil
 }