Add Raylib integration for GUI and enhance Lua input handling

Author: nullidea2602

go.mod

@@ -2,4 +2,13 @@ module glos
 
 go 1.23.5
 
-require github.com/yuin/gopher-lua v1.1.1
+require (
+	github.com/gen2brain/raylib-go/raylib v0.0.0-20250109172833-6dbba4f81a9b
+	github.com/yuin/gopher-lua v1.1.1
+)
+
+require (
+	github.com/ebitengine/purego v0.7.1 // indirect
+	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+)

go.sum

@@ -1,2 +1,10 @@
+github.com/ebitengine/purego v0.7.1 h1:6/55d26lG3o9VCZX8lping+bZcmShseiqlh2bnUDiPA=
+github.com/ebitengine/purego v0.7.1/go.mod h1:ah1In8AOtksoNK6yk5z1HTJeUkC1Ez4Wk2idgGslMwQ=
+github.com/gen2brain/raylib-go/raylib v0.0.0-20250109172833-6dbba4f81a9b h1:JJfspevP3YOXcSKVABizYOv++yMpTJIdPUtoDzF/RWw=
+github.com/gen2brain/raylib-go/raylib v0.0.0-20250109172833-6dbba4f81a9b/go.mod h1:BaY76bZk7nw1/kVOSQObPY1v1iwVE1KHAGMfvI6oK1Q=
 github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
 github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
+golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
+golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

luaexec/lua_runner.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"fmt"
 	"glos/glosfs"
+	"glos/ui"
 	"os"
 	"strings"
 
@@ -20,10 +21,12 @@ func Execute(content string, args []string) error {
 	L.SetGlobal("list_files", L.NewFunction(luaListFiles))
 	L.SetGlobal("write_file", L.NewFunction(luaWriteFile))
 	L.SetGlobal("read_multiline_input", L.NewFunction(luaReadMultilineInput))
+	L.SetGlobal("read_multiline_input_raylib", L.NewFunction(luaReadMultilineInputRaylib))
 	L.SetGlobal("delete_file", L.NewFunction(luaDeleteFile))
 	L.SetGlobal("set_env", L.NewFunction(luaSetEnv))
 	L.SetGlobal("get_env", L.NewFunction(luaGetEnv))
 	L.SetGlobal("clear_screen", L.NewFunction(luaClearScreen))
+	L.SetGlobal("print", L.NewFunction(luaPrint))
 
 	luaTable := L.NewTable()
 	for i, arg := range args {
@@ -96,6 +99,23 @@ func luaReadMultilineInput(L *lua.LState) int {
 	return 1
 }
 
+func luaReadMultilineInputRaylib(L *lua.LState) int {
+	input := ""
+	maxInputLen := 256
+	var content strings.Builder
+
+	for input != ":exit" {
+		ui.DrawUI(input)
+
+		if ui.HandleInput(&input, maxInputLen) {
+			content.WriteString(input + "\n")
+			input = ""
+		}
+	}
+	L.Push(lua.LString(content.String()))
+	return 1
+}
+
 // Example usage in Lua, including error handling:
 // success, error_message = delete_file("filename")
 // if not success then
@@ -146,6 +166,15 @@ func luaGetEnv(L *lua.LState) int {
 // Example usage in Lua:
 // clear_screen()
 func luaClearScreen(L *lua.LState) int {
-	fmt.Print("\033[2J\033[H") // ANSI code: Clear screen and move cursor to home
+	ui.Output = ""
+	return 0
+}
+
+func luaPrint(L *lua.LState) int {
+	n := L.GetTop()
+	for i := 1; i <= n; i++ {
+		ui.Output += L.ToString(i)
+	}
+	ui.Output += "\n"
 	return 0
 }

main.go

@@ -1,7 +1,80 @@
 package main
 
-import "glos/repl"
+import (
+	"fmt"
+	"glos/glosfs"
+	"glos/luaexec"
+	"glos/ui"
+	"strings"
+
+	rl "github.com/gen2brain/raylib-go/raylib"
+)
+
+const (
+	windowWidth  = 800
+	windowHeight = 600
+	maxInputLen  = 256
+)
 
 func main() {
-	repl.StartREPL()
+	glosfs.LoadMemoryFS() // Load memoryFS on start
+
+	rl.InitWindow(windowWidth, windowHeight, "GLOS GUI")
+	defer rl.CloseWindow()
+	rl.SetTargetFPS(60)
+
+	input := ""
+
+	for !rl.WindowShouldClose() {
+		ui.DrawUI(input)
+
+		if ui.HandleInput(&input, maxInputLen) {
+			runLuaCommand(strings.ToLower(input))
+			input = ""
+		}
+	}
+
+}
+
+func runLuaCommand(input string) {
+	args := strings.SplitN(input, " ", 2)
+	command := args[0]
+	var param string
+	if len(args) > 1 {
+		param = args[1]
+	}
+
+	switch command {
+	case "exit":
+		glosfs.SaveMemoryFS() // Save memoryFS before exit
+	case "run":
+		runLua(param)
+	default:
+		if _, exists := glosfs.MemoryFS[command]; exists {
+			runLua(command + " " + param) // Execute exact match
+		} else if _, exists := glosfs.MemoryFS[command+".lua"]; exists {
+			runLua(command + ".lua" + " " + param) // Try with .lua extension
+		} else {
+			ui.Output = "Unknown command"
+		}
+	}
+}
+
+func runLua(input string) {
+	args := strings.SplitN(input, " ", 2)
+	filename := args[0]
+	var luaArgs []string
+
+	if len(args) > 1 {
+		luaArgs = strings.Fields(args[1])
+	}
+
+	content, exists := glosfs.MemoryFS[filename]
+	if !exists {
+		ui.Output = fmt.Sprintf("File '%s' not found.\n", filename)
+	}
+
+	if err := luaexec.Execute(content, luaArgs); err != nil {
+		ui.Output = fmt.Sprintln("Error executing Lua:", err)
+	}
 }

ui/ui.go

@@ -0,0 +1,36 @@
+package ui
+
+import rl "github.com/gen2brain/raylib-go/raylib"
+
+var Output = "Welcome to GLOS GUI!\n"
+
+func DrawUI(input string) {
+	rl.BeginDrawing()
+	rl.ClearBackground(rl.RayWhite)
+
+	rl.DrawText("GLOS GUI Terminal", 20, 20, 20, rl.Black)
+	rl.DrawRectangleLines(20, 50, 760, 40, rl.Gray)
+	rl.DrawText(input, 30, 60, 20, rl.Black)
+	rl.DrawRectangle(20, 100, 760, 400, rl.LightGray)
+	rl.DrawText(Output, 30, 110, 20, rl.Black)
+
+	rl.EndDrawing()
+}
+
+func HandleInput(input *string, maxInputLen int) bool {
+	if rl.IsKeyPressed(rl.KeyEnter) {
+		Output += "\n> " + *input
+		return true // Indicates that Enter was pressed
+	}
+
+	if rl.IsKeyPressed(rl.KeyBackspace) && len(*input) > 0 {
+		*input = (*input)[:len(*input)-1]
+	}
+
+	for char := rl.GetCharPressed(); char > 0; char = rl.GetCharPressed() {
+		if len(*input) < maxInputLen {
+			*input += string(char)
+		}
+	}
+	return false
+}

utils/write.lua

@@ -8,6 +8,6 @@ local filename = args[1]
 local content = ""
 
 print("Enter content line by line. Type ':exit' to finish.")
-content = read_multiline_input()
+content = read_multiline_input_raylib()
 
 write_file(filename, content)