bloeys/nterm
1
0
Fork 0
mirror of https://github.com/bloeys/nterm.git synced 2025-12-29 06:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cmd buffer and text buffer

Browse Source
This commit is contained in:
bloeys
2022-07-12 16:58:23 +04:00
parent 68962238e2
commit 2821505d47
1 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
main.go
View File

@ -42,14 +42,19 @@ type program struct {
textBufSize int64 textBufSize int64
textBufHead int64 textBufHead int64
cmdBuf []rune
cmdBufHead int64
cursorPos *gglm.Vec3 cursorPos *gglm.Vec3
} }
const ( const (
subPixelX = 64 subPixelX = 64
subPixelY = 64 subPixelY = 64
hinting = font.HintingNone hinting = font.HintingNone
defaultTextBufSize = 4 * 1024 * 1024 defaultTextBufSize = 4 * 1024 * 1024
defaultCmdBufSize = 4 * 1024
) )
var ( var (
@ -83,13 +88,15 @@ func main() {
win: win, win: win,
rend: rend, rend: rend,
imguiInfo: nmageimgui.NewImGUI(), imguiInfo: nmageimgui.NewImGUI(),
FontSize: 40,
FontSize: 40,
textBuf: make([]rune, defaultTextBufSize), textBuf: make([]rune, defaultTextBufSize),
textBufSize: defaultTextBufSize, textBufSize: defaultTextBufSize,
textBufHead: 0, textBufHead: 0,
cursorPos: gglm.NewVec3(0, 0, 0), cursorPos: gglm.NewVec3(0, 0, 0),
cmdBuf: make([]rune, defaultCmdBufSize),
cmdBufHead: 0,
} }
p.win.EventCallbacks = append(p.win.EventCallbacks, p.handleSDLEvent) p.win.EventCallbacks = append(p.win.EventCallbacks, p.handleSDLEvent)
@ -115,7 +122,8 @@ func (p *program) handleSDLEvent(e sdl.Event) {
switch e := e.(type) { switch e := e.(type) {
case *sdl.TextInputEvent: case *sdl.TextInputEvent:
p.WriteToBuf([]rune(e.GetText())) p.WriteToCmdBuf([]rune(e.GetText()))
// p.WriteToTextBuf([]rune(e.GetText()))
case *sdl.WindowEvent: case *sdl.WindowEvent:
if e.Event == sdl.WINDOWEVENT_SIZE_CHANGED { if e.Event == sdl.WINDOWEVENT_SIZE_CHANGED {
p.HandleWindowResize() p.HandleWindowResize()
@ -191,7 +199,7 @@ func (p *program) Update() {
p.MainUpdate() p.MainUpdate()
} }
func (p *program) WriteToBuf(text []rune) { func (p *program) WriteToTextBuf(text []rune) {
newHeadPos := p.textBufHead + int64(len(text)) newHeadPos := p.textBufHead + int64(len(text))
if newHeadPos <= p.textBufSize { if newHeadPos <= p.textBufSize {
@ -200,24 +208,49 @@ func (p *program) WriteToBuf(text []rune) {
return return
} }
assert.T(false, "Circular buffer not implemented") assert.T(false, "Circular buffer not implemented for text buf")
} }
func (p *program) WriteToCmdBuf(text []rune) {
newHeadPos := p.cmdBufHead + int64(len(text))
if newHeadPos <= p.textBufSize {
copy(p.cmdBuf[p.cmdBufHead:], text)
p.cmdBufHead = newHeadPos
return
}
assert.T(false, "Circular buffer not implemented for cmd buf")
}
var sepLinePos = gglm.NewVec3(0, 0, 0)
func (p *program) MainUpdate() { func (p *program) MainUpdate() {
if input.KeyClicked(sdl.K_RETURN) || input.KeyClicked(sdl.K_KP_ENTER) { if input.KeyClicked(sdl.K_RETURN) || input.KeyClicked(sdl.K_KP_ENTER) {
p.WriteToBuf([]rune{'\n'}) p.WriteToCmdBuf([]rune{'\n'})
p.RunCmd()
} }
// @TODO: Implement hold to delete // @TODO: Implement hold to delete
if input.KeyClicked(sdl.K_BACKSPACE) { if input.KeyClicked(sdl.K_BACKSPACE) {
p.textBufHead = clamp(p.textBufHead-1, 0, p.textBufSize) p.cmdBufHead = clamp(p.cmdBufHead-1, 0, int64(len(p.cmdBuf)))
} }
p.cursorPos.Data = p.GlyphRend.DrawTextOpenGLAbs(p.textBuf[:p.textBufHead], gglm.NewVec3(0, float32(p.GlyphRend.ScreenHeight)-p.GlyphRend.Atlas.LineHeight, 0), gglm.NewVec4(1, 1, 1, 1)).Data p.cursorPos.Data = p.GlyphRend.DrawTextOpenGLAbs(p.textBuf[:p.textBufHead], gglm.NewVec3(0, float32(p.GlyphRend.ScreenHeight)-p.GlyphRend.Atlas.LineHeight, 0), gglm.NewVec4(1, 1, 1, 1)).Data
sepLinePos.Data = p.cursorPos.Data
p.cursorPos.SetX(0)
p.cursorPos.AddY(-p.GlyphRend.Atlas.LineHeight)
p.cursorPos.Data = p.GlyphRend.DrawTextOpenGLAbs(p.cmdBuf[:p.cmdBufHead], p.cursorPos, gglm.NewVec4(1, 1, 1, 1)).Data
p.DrawCursor() p.DrawCursor()
} }
func (p *program) RunCmd() {
p.WriteToTextBuf(p.cmdBuf[:p.cmdBufHead])
p.cmdBufHead = 0
}
func (p *program) DrawCursor() { func (p *program) DrawCursor() {
p.ScreenPosToGridPos(p.cursorPos) p.ScreenPosToGridPos(p.cursorPos)
p.GlyphRend.DrawTextOpenGLAbs([]rune{'|'}, p.cursorPos, gglm.NewVec4(1, 1, 1, 1)) p.GlyphRend.DrawTextOpenGLAbs([]rune{'|'}, p.cursorPos, gglm.NewVec4(1, 1, 1, 1))
@ -280,6 +313,9 @@ func (p *program) Render() {
if consts.Mode_Debug { if consts.Mode_Debug {
p.DebugRender() p.DebugRender()
sizeX := float32(p.GlyphRend.ScreenWidth)
p.rend.Draw(p.gridMesh, gglm.NewTrMatId().Translate(gglm.NewVec3(sizeX/2, sepLinePos.Y(), 0)).Scale(gglm.NewVec3(sizeX, 1, 1)), p.gridMat)
} }
} }