still working on the layout tool
- started doing it in a more adhoc way and will engineer it once I have a clear vision
This commit is contained in:
+221
-36
@@ -2,12 +2,19 @@
|
||||
package cdashdisplay
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"os"
|
||||
"path"
|
||||
|
||||
helper "esdi/helpers"
|
||||
"esdi/peripheral/communication"
|
||||
"esdi/peripheral/communication/packets"
|
||||
"esdi/peripheral/types"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
var pLogger *slog.Logger
|
||||
@@ -16,62 +23,124 @@ func SetLogger(l *slog.Logger) {
|
||||
pLogger = l
|
||||
}
|
||||
|
||||
// I have to move this to some kind of configuration place
|
||||
const (
|
||||
newWindowCMDID types.Command = 3
|
||||
destroyWindowCMDID types.Command = 4
|
||||
moveWindowCMDID types.Command = 5
|
||||
newLayoutCMDID types.Command = 6
|
||||
layoutsDir = "./layouts/"
|
||||
)
|
||||
|
||||
var (
|
||||
DefaultDecorations = UIDecorations{
|
||||
HasBorder: 1,
|
||||
BGColour: 0x1041, // Look in the eslabsCurses library for these colours
|
||||
FGColour: 0xffff,
|
||||
TitleColour: 0xffff,
|
||||
BorderColour: 0xf800,
|
||||
TitleSize: 2,
|
||||
TextSize: 4,
|
||||
Padding: 0x00,
|
||||
}
|
||||
const (
|
||||
newWindowCMDID types.Command = 3
|
||||
destroyWindowCMDID types.Command = 4
|
||||
updateWindowDimsCMDID types.Command = 5
|
||||
newLayoutCMDID types.Command = 6
|
||||
)
|
||||
|
||||
const (
|
||||
MoveLeft = iota
|
||||
MoveDown
|
||||
MoveUp
|
||||
MoveRight
|
||||
)
|
||||
|
||||
var DefaultDecorations = UIDecorations{
|
||||
HasBorder: 1,
|
||||
BGColour: 0x1041, // Look in the eslabsCurses library for these colours
|
||||
FGColour: 0xffff,
|
||||
TitleColour: 0xffff,
|
||||
BorderColour: 0xf800,
|
||||
TitleSize: 2,
|
||||
TextSize: 4,
|
||||
Padding: 0x00,
|
||||
}
|
||||
|
||||
type UIDimensions struct {
|
||||
X0 uint16
|
||||
Y0 uint16
|
||||
Width uint16
|
||||
Height uint16
|
||||
X0 uint16 `yaml:"X0"`
|
||||
Y0 uint16 `yaml:"Y0"`
|
||||
Width uint16 `yaml:"Width"`
|
||||
Height uint16 `yaml:"Height"`
|
||||
}
|
||||
|
||||
type UpdateDimsPacket struct {
|
||||
ID int16
|
||||
Dims UIDimensions
|
||||
}
|
||||
|
||||
type UIDecorations struct {
|
||||
BGColour uint16
|
||||
FGColour uint16
|
||||
TitleColour uint16
|
||||
BorderColour uint16
|
||||
TitleSize uint8
|
||||
TextSize uint8
|
||||
HasBorder uint8
|
||||
Padding uint8
|
||||
BGColour uint16 `yaml:"BGColour"`
|
||||
FGColour uint16 `yaml:"FGColour"`
|
||||
TitleColour uint16 `yaml:"TitleColour"`
|
||||
BorderColour uint16 `yaml:"BorderColour"`
|
||||
TitleSize uint8 `yaml:"TitleSize"`
|
||||
TextSize uint8 `yaml:"TextSize"`
|
||||
HasBorder uint8 `yaml:"HasBorder"`
|
||||
Padding uint8 `yaml:"Padding"`
|
||||
}
|
||||
|
||||
type FString32 [32]byte
|
||||
|
||||
func (s FString32) String() string {
|
||||
n := bytes.IndexByte(s[:], 0)
|
||||
if n == -1 {
|
||||
n = len(s)
|
||||
}
|
||||
return string(s[:n])
|
||||
}
|
||||
|
||||
func (s FString32) MarshalYAML() (any, error) {
|
||||
// trim trailing zero bytes
|
||||
n := bytes.IndexByte(s[:], 0)
|
||||
if n == -1 {
|
||||
n = len(s)
|
||||
}
|
||||
return string(s[:n]), nil
|
||||
}
|
||||
|
||||
func (s *FString32) UnmarshalYAML(value *yaml.Node) error {
|
||||
if value.Kind != yaml.ScalarNode {
|
||||
return fmt.Errorf("expected YAML scalar for FixedString32")
|
||||
}
|
||||
|
||||
b := []byte(value.Value)
|
||||
|
||||
if len(b) > len(s) {
|
||||
return fmt.Errorf("string too long (max %d bytes)", len(s))
|
||||
}
|
||||
|
||||
// zero-fill first
|
||||
for i := range s {
|
||||
s[i] = 0
|
||||
}
|
||||
|
||||
copy(s[:], b)
|
||||
return nil
|
||||
}
|
||||
|
||||
type UIWindow struct {
|
||||
Dims UIDimensions
|
||||
Decor UIDecorations
|
||||
Title [32]byte
|
||||
Dims UIDimensions `yaml:"Dims"`
|
||||
Decor UIDecorations `yaml:"Decor"`
|
||||
Title FString32 `yaml:"Title"`
|
||||
}
|
||||
|
||||
type LayoutTree struct {
|
||||
Windows map[int16]UIWindow
|
||||
Windows map[int16]*UIWindow `yaml:"Windows"`
|
||||
}
|
||||
|
||||
func NewLayoutTree() *LayoutTree {
|
||||
return &LayoutTree{
|
||||
Windows: make(map[int16]UIWindow),
|
||||
Windows: make(map[int16]*UIWindow),
|
||||
}
|
||||
}
|
||||
|
||||
func (l *LayoutTree) AddWindow(idx int16, w UIWindow) {
|
||||
l.Windows[idx] = w
|
||||
pLogger.Debug(fmt.Sprintf("adding window '%d' - %v", idx, w))
|
||||
l.Windows[idx] = &w
|
||||
pLogger.Debug(fmt.Sprintf("new map - %v", l.Windows))
|
||||
}
|
||||
|
||||
func (l *LayoutTree) RemoveWindow(idx int16) {
|
||||
pLogger.Debug(fmt.Sprintf("removing window '%d'", idx))
|
||||
delete(l.Windows, idx)
|
||||
pLogger.Debug(fmt.Sprintf("new map - %v", l.Windows))
|
||||
}
|
||||
|
||||
type CDashState struct {
|
||||
@@ -103,6 +172,9 @@ func NewCDashDisplay() (*CDashDisplay, error) {
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (d *CDashDisplay) SendCommand() {
|
||||
}
|
||||
|
||||
func (d *CDashDisplay) CreateWindow(win UIWindow) (int16, error) {
|
||||
bytes, err := helper.StructToBytes(win)
|
||||
if err != nil {
|
||||
@@ -144,7 +216,120 @@ func (d *CDashDisplay) DestroyWindow(wID int16) error {
|
||||
}
|
||||
|
||||
// NODE: add this
|
||||
// d.State.Layout.RemoveWindow(wID)
|
||||
d.State.Layout.RemoveWindow(wID)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (d *CDashDisplay) updateWindowDimensions(win *UIWindow, packet UpdateDimsPacket) error {
|
||||
pLogger.Debug(fmt.Sprintf("UPDATE: %v", packet))
|
||||
|
||||
bytes, err := helper.StructToBytes(packet)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// var ack packets.AckPacket
|
||||
err = d.WT.SendCommand(updateWindowDimsCMDID, bytes, nil)
|
||||
if err != nil && err != io.EOF {
|
||||
return err
|
||||
}
|
||||
|
||||
// Nothing bad happened afaik
|
||||
pLogger.Debug(fmt.Sprintf("cur dims: %v", win.Dims))
|
||||
win.Dims = packet.Dims
|
||||
pLogger.Debug(fmt.Sprintf("new dims: %v", win.Dims))
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (d *CDashDisplay) MoveWindow(wID int16, delta helper.Vector) error {
|
||||
// Get the window from the layout
|
||||
window, ok := d.State.Layout.Windows[wID]
|
||||
if !ok {
|
||||
return fmt.Errorf("window with ID '%d' doesn't exist", wID)
|
||||
}
|
||||
|
||||
// Now we will create new dimensions
|
||||
newDimensions := window.Dims
|
||||
|
||||
newDimensions.X0 += delta.DX
|
||||
newDimensions.Y0 += delta.DY
|
||||
|
||||
packet := UpdateDimsPacket{
|
||||
ID: wID,
|
||||
Dims: newDimensions,
|
||||
}
|
||||
|
||||
return d.updateWindowDimensions(window, packet)
|
||||
}
|
||||
|
||||
func (d *CDashDisplay) ResizeWindow(wID int16, delta helper.Vector) error {
|
||||
// Get the window from the layout
|
||||
window, ok := d.State.Layout.Windows[wID]
|
||||
if !ok {
|
||||
return fmt.Errorf("window with ID '%d' doesn't exist", wID)
|
||||
}
|
||||
|
||||
// Now we will create new dimensions
|
||||
newDimensions := window.Dims
|
||||
|
||||
if delta.DX > 0 {
|
||||
newDimensions.Width += delta.DX
|
||||
} else {
|
||||
newDimensions.Width -= delta.DX
|
||||
newDimensions.X0 -= 2 * delta.DX
|
||||
}
|
||||
|
||||
if delta.DY > 0 {
|
||||
newDimensions.Height += delta.DY
|
||||
} else {
|
||||
newDimensions.Height -= delta.DY
|
||||
newDimensions.Y0 -= 2 * delta.DY
|
||||
}
|
||||
|
||||
packet := UpdateDimsPacket{
|
||||
ID: wID,
|
||||
Dims: newDimensions,
|
||||
}
|
||||
|
||||
return d.updateWindowDimensions(window, packet)
|
||||
}
|
||||
|
||||
func (d *CDashDisplay) SaveLayout() {
|
||||
file, err := os.OpenFile(path.Join(layoutsDir, "layout.yaml"),
|
||||
os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0755)
|
||||
if err != nil {
|
||||
panic("failed to open logging file: " + err.Error())
|
||||
}
|
||||
|
||||
data, err := yaml.Marshal(d.State.Layout)
|
||||
if err != nil {
|
||||
panic("failed to marshal layout data")
|
||||
}
|
||||
|
||||
_, err = file.Write(data)
|
||||
if err != nil {
|
||||
panic("failed to write data to file")
|
||||
}
|
||||
}
|
||||
|
||||
func (d *CDashDisplay) LoadLayout() {
|
||||
data, err := os.ReadFile(path.Join(layoutsDir, "layout.yaml"))
|
||||
if err != nil {
|
||||
panic(err.Error())
|
||||
}
|
||||
|
||||
layout := NewLayoutTree()
|
||||
err = yaml.Unmarshal(data, layout)
|
||||
if err != nil {
|
||||
panic(err.Error())
|
||||
}
|
||||
|
||||
for _, w := range layout.Windows {
|
||||
_, err = d.CreateWindow(*w)
|
||||
if err != nil {
|
||||
pLogger.Debug(fmt.Sprintf("Failed to create window: %v", w))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,6 +6,11 @@ import (
|
||||
"encoding/binary"
|
||||
)
|
||||
|
||||
type Vector struct {
|
||||
DX uint16
|
||||
DY uint16
|
||||
}
|
||||
|
||||
func B32(s string) [32]byte {
|
||||
var b [32]byte
|
||||
copy(b[:], s)
|
||||
|
||||
Executable
+33
@@ -0,0 +1,33 @@
|
||||
Windows:
|
||||
1:
|
||||
Dims:
|
||||
X0: 250
|
||||
Y0: 120
|
||||
Width: 148
|
||||
Height: 76
|
||||
Decor:
|
||||
BGColour: 4161
|
||||
FGColour: 65535
|
||||
TitleColour: 65535
|
||||
BorderColour: 63488
|
||||
TitleSize: 2
|
||||
TextSize: 4
|
||||
HasBorder: 1
|
||||
Padding: 0
|
||||
Title: TITLE
|
||||
2:
|
||||
Dims:
|
||||
X0: 401
|
||||
Y0: 120
|
||||
Width: 176
|
||||
Height: 76
|
||||
Decor:
|
||||
BGColour: 4161
|
||||
FGColour: 65535
|
||||
TitleColour: 65535
|
||||
BorderColour: 63488
|
||||
TitleSize: 2
|
||||
TextSize: 4
|
||||
HasBorder: 1
|
||||
Padding: 0
|
||||
Title: NEWTITLE
|
||||
@@ -9,11 +9,18 @@ import (
|
||||
"esdi/tui/internal/events"
|
||||
"esdi/tui/internal/ui"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
|
||||
"github.com/rivo/tview"
|
||||
)
|
||||
|
||||
var pLogger *slog.Logger
|
||||
|
||||
func mcLog(msg string, args ...any) {
|
||||
pLogger.Debug(msg, args)
|
||||
}
|
||||
|
||||
type Ctrls struct {
|
||||
MC *MainController
|
||||
WindowingController *LayoutController
|
||||
@@ -29,8 +36,8 @@ type MainController struct {
|
||||
}
|
||||
|
||||
func NewMainController(logger *slog.Logger) *MainController {
|
||||
pLogger = logger
|
||||
mc := &MainController{
|
||||
Logger: logger,
|
||||
App: tview.NewApplication(),
|
||||
Dom: dom.NewDOM(),
|
||||
EvBus: events.NewBus(),
|
||||
@@ -83,23 +90,66 @@ func NewMainController(logger *slog.Logger) *MainController {
|
||||
})
|
||||
|
||||
mc.EvBus.On(ui.DestroyWindowEv{}, func(e any) {
|
||||
mc.Logger.Info(fmt.Sprintf("Called in to destroy win: %d", e.(ui.DestroyWindowEv).ID))
|
||||
mc.CDash.DestroyWindow(e.(ui.DestroyWindowEv).ID)
|
||||
go func() {
|
||||
pLogger.Info(fmt.Sprintf("Called in to destroy win: %d", e.(ui.DestroyWindowEv).ID))
|
||||
mc.CDash.DestroyWindow(e.(ui.DestroyWindowEv).ID)
|
||||
|
||||
mc.EvBus.Emit(ui.WindowDestroyedEv{ID: e.(ui.DestroyWindowEv).ID})
|
||||
}()
|
||||
})
|
||||
|
||||
mc.EvBus.On(ui.MoveWindowEv{}, func(e any) {
|
||||
mvData := e.(ui.MoveWindowEv)
|
||||
pLogger.Debug(fmt.Sprintf("request to move window '%d'", mvData.WindowID))
|
||||
err := mc.CDash.MoveWindow(mvData.WindowID, mvData.Delta)
|
||||
if err != nil && err != io.EOF {
|
||||
pLogger.Debug(fmt.Sprintf("failed to move window '%d' %s", mvData.WindowID, err.Error()))
|
||||
return
|
||||
}
|
||||
})
|
||||
|
||||
mc.EvBus.On(ui.ResizeWindowEv{}, func(e any) {
|
||||
mvData := e.(ui.ResizeWindowEv)
|
||||
pLogger.Debug(fmt.Sprintf("requested to resize window '%d'", mvData.WindowID))
|
||||
err := mc.CDash.ResizeWindow(mvData.WindowID, mvData.Delta)
|
||||
if err != nil && err != io.EOF {
|
||||
pLogger.Debug(fmt.Sprintf("failed to resize window '%d' %s", mvData.WindowID, err.Error()))
|
||||
return
|
||||
}
|
||||
})
|
||||
|
||||
mc.EvBus.On(ui.SaveLayoutEv{}, func(e any) {
|
||||
mc.CDash.SaveLayout()
|
||||
})
|
||||
|
||||
mc.EvBus.On(ui.LoadLayoutEv{}, func(e any) {
|
||||
mc.CDash.LoadLayout()
|
||||
mc.EvBus.Emit(ui.RegisterLoadedLayout{*mc.CDash.State.Layout})
|
||||
})
|
||||
|
||||
mc.EvBus.On(ui.FindCDashDisplay{}, func(e any) {
|
||||
go func() {
|
||||
mc.Logger.Info("Looking for CDashDisplay")
|
||||
cdashdisplay.SetLogger(mc.Logger.With("[device]", "cdashdisplay"))
|
||||
mc.EvBus.Emit(ui.PrintLogEv{Log: "looking for cdash display\n"})
|
||||
pLogger.Info("Looking for CDashDisplay")
|
||||
|
||||
cdashdisplay.SetLogger(pLogger.With("[device]", "cdashdisplay"))
|
||||
|
||||
display, err := cdashdisplay.NewCDashDisplay()
|
||||
if err != nil {
|
||||
pLogger.Info("didn't find cdashdisplay")
|
||||
mc.EvBus.Emit(ui.PrintLogEv{Log: "didn't find cdash display\n"})
|
||||
return
|
||||
}
|
||||
|
||||
// pLogger.Info(fmt.Sprintf("found cdashdisplay on %s!", mc.CDash.WT.Cfg.Name))
|
||||
// mc.EvBus.Emit(ui.PrintLogEv{Log: "found cdashdisplay" + mc.CDash.WT.Cfg.Name + "\n"})
|
||||
mc.CDash = display
|
||||
}()
|
||||
})
|
||||
|
||||
mc.EvBus.On(ui.ForceRedraw{}, func(e any) {
|
||||
mc.App.QueueUpdateDraw(func() {})
|
||||
})
|
||||
|
||||
return mc
|
||||
}
|
||||
|
||||
@@ -112,3 +112,8 @@ func (d *DOM) GetNodeByID(ID string) *UINode {
|
||||
func (d *DOM) AppendElem(root *UINode, elem *UINode) error {
|
||||
return root.AppendItem(elem)
|
||||
}
|
||||
|
||||
// DeleteElem deletes and element from the DOM
|
||||
func (d *DOM) DeleteElem(elem *UINode) {
|
||||
delete(d.elements, elem.ID)
|
||||
}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"esdi/cdashdisplay"
|
||||
helper "esdi/helpers"
|
||||
"esdi/tui/internal/models"
|
||||
|
||||
"github.com/rivo/tview"
|
||||
@@ -8,6 +10,9 @@ import (
|
||||
|
||||
// Main controller events
|
||||
|
||||
// Find a way to remove this
|
||||
type ForceRedraw struct{}
|
||||
|
||||
type LogEv struct {
|
||||
Log string
|
||||
}
|
||||
@@ -26,6 +31,12 @@ type ChangeFocusEv struct {
|
||||
|
||||
// Layout events
|
||||
|
||||
type SaveLayoutEv struct{}
|
||||
type LoadLayoutEv struct{}
|
||||
type RegisterLoadedLayout struct {
|
||||
Layout cdashdisplay.LayoutTree
|
||||
}
|
||||
|
||||
type CreateWindowEv struct {
|
||||
Window models.Window
|
||||
}
|
||||
@@ -38,6 +49,16 @@ type LayoutRegisterWindowEv struct {
|
||||
Window models.Window
|
||||
}
|
||||
|
||||
type MoveWindowEv struct {
|
||||
WindowID int16
|
||||
Delta helper.Vector
|
||||
}
|
||||
|
||||
type ResizeWindowEv struct {
|
||||
WindowID int16
|
||||
Delta helper.Vector
|
||||
}
|
||||
|
||||
type WindowCreatedEv struct {
|
||||
ID int16
|
||||
Title string
|
||||
|
||||
@@ -3,10 +3,8 @@ package views
|
||||
import (
|
||||
"esdi/tui/internal/dom"
|
||||
"esdi/tui/internal/events"
|
||||
"esdi/tui/internal/models"
|
||||
"esdi/tui/internal/ui"
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
"github.com/gdamore/tcell/v2"
|
||||
"github.com/rivo/tview"
|
||||
@@ -47,41 +45,64 @@ func BindWindowEvents(
|
||||
// I recon I have to change this for some type os event system that
|
||||
// triggers directly on the UINodes I want them to be triggered on
|
||||
bus.On(ui.WindowCreatedEv{}, func(e any) {
|
||||
bus.Emit(ui.LogEv{Log: "Received a window created event\n"})
|
||||
if tree == nil {
|
||||
bus.Emit(ui.LogEv{Log: "tree view is nil"})
|
||||
return
|
||||
}
|
||||
go func() {
|
||||
bus.Emit(ui.LogEv{Log: "Received a window created event\n"})
|
||||
if tree == nil {
|
||||
bus.Emit(ui.LogEv{Log: "tree view is nil"})
|
||||
return
|
||||
}
|
||||
|
||||
root := tree.GetRoot()
|
||||
if root == nil {
|
||||
bus.Emit(ui.LogEv{Log: "unable to get root of tree view"})
|
||||
return
|
||||
}
|
||||
root := tree.GetRoot()
|
||||
if root == nil {
|
||||
bus.Emit(ui.LogEv{Log: "unable to get root of tree view"})
|
||||
return
|
||||
}
|
||||
|
||||
newWindow := tview.NewTreeNode(e.(ui.WindowCreatedEv).Title).
|
||||
SetReference(e.(ui.WindowCreatedEv).ID)
|
||||
root.AddChild(newWindow)
|
||||
newWindow := tview.NewTreeNode(e.(ui.WindowCreatedEv).Title).
|
||||
SetReference(e.(ui.WindowCreatedEv).ID)
|
||||
root.AddChild(newWindow)
|
||||
}()
|
||||
})
|
||||
|
||||
bus.On(ui.WindowDestroyedEv{}, func(e any) {
|
||||
go func() {
|
||||
root := tree.GetRoot()
|
||||
if root == nil {
|
||||
bus.Emit(ui.LogEv{Log: "unable to get current tree node"})
|
||||
}
|
||||
|
||||
node := FindNodeByReference(root, e.(ui.WindowDestroyedEv).ID)
|
||||
if node != nil {
|
||||
root.RemoveChild(node)
|
||||
}
|
||||
|
||||
// NODE: add a log here in case it fails so we know whats going on
|
||||
bus.Emit(ui.ForceRedraw{})
|
||||
}()
|
||||
})
|
||||
|
||||
bus.On(ui.RegisterLoadedLayout{}, func(e any) {
|
||||
root := tree.GetRoot()
|
||||
if root == nil {
|
||||
bus.Emit(ui.LogEv{Log: "unable to get current tree node"})
|
||||
return
|
||||
}
|
||||
|
||||
node := FindNodeByReference(root, e.(ui.WindowDestroyedEv).ID)
|
||||
if node != nil {
|
||||
root.RemoveChild(node)
|
||||
layout := e.(ui.RegisterLoadedLayout)
|
||||
for idx, w := range layout.Layout.Windows {
|
||||
newWindow := tview.NewTreeNode(w.Title.String()).SetReference(idx)
|
||||
root.AddChild(newWindow)
|
||||
}
|
||||
// NODE: add a log here in case it fails so we know whats going on
|
||||
|
||||
// bus.Emit(ui.ForceRedraw{})
|
||||
})
|
||||
|
||||
bus.On(ui.ErrorCreateWindowEv{}, func(e any) {
|
||||
bus.Emit(ui.LogEv{
|
||||
Log: fmt.Sprintf(
|
||||
"Error performing action: %s\n", e.(ui.ErrorCreateWindowEv).Error.Error(),
|
||||
)})
|
||||
go func() {
|
||||
bus.Emit(ui.LogEv{
|
||||
Log: fmt.Sprintf(
|
||||
"Error performing action: %s\n", e.(ui.ErrorCreateWindowEv).Error.Error(),
|
||||
)})
|
||||
}()
|
||||
})
|
||||
}
|
||||
|
||||
@@ -121,8 +142,28 @@ func layoutToolTreeViewEvents(bus *events.Bus, doc *dom.DOM,
|
||||
bus.Emit(ui.DestroyWindowEv{ID: wID})
|
||||
case 'm':
|
||||
// Go into move mode
|
||||
curNode := tree.GetCurrentNode()
|
||||
if curNode == nil {
|
||||
bus.Emit(ui.LogEv{Log: "unable to get current tree node"})
|
||||
break
|
||||
}
|
||||
|
||||
ref := curNode.GetReference()
|
||||
wID, ok := ref.(int16)
|
||||
if !ok {
|
||||
// Whatever, do something better here
|
||||
break
|
||||
}
|
||||
|
||||
windowManipulationTool(bus, doc, wID)
|
||||
case 'e':
|
||||
// Go into edit mode
|
||||
case 's':
|
||||
// Save the current layout
|
||||
bus.Emit(ui.SaveLayoutEv{})
|
||||
case 'l':
|
||||
// Load the layout
|
||||
bus.Emit(ui.LoadLayoutEv{})
|
||||
}
|
||||
|
||||
return event
|
||||
@@ -218,92 +259,3 @@ func buildLayoutFlexComponent(bus *events.Bus, doc *dom.DOM) (*dom.UINode, error
|
||||
|
||||
return layoutToolFlexNode, nil
|
||||
}
|
||||
|
||||
// Layout tool actions
|
||||
|
||||
// Validate the form inputs
|
||||
func validateFormInputs(x, y, w, h, title string) (models.Window, error) {
|
||||
xValue, err := strconv.ParseUint(x, 10, 64)
|
||||
if err != nil {
|
||||
return models.Window{}, err
|
||||
}
|
||||
yValue, err := strconv.ParseUint(y, 10, 64)
|
||||
if err != nil {
|
||||
return models.Window{}, err
|
||||
}
|
||||
widthValue, err := strconv.ParseUint(w, 10, 64)
|
||||
if err != nil {
|
||||
return models.Window{}, err
|
||||
}
|
||||
heightValue, err := strconv.ParseUint(h, 10, 64)
|
||||
if err != nil {
|
||||
return models.Window{}, err
|
||||
}
|
||||
|
||||
return models.Window{
|
||||
X: uint16(xValue),
|
||||
Y: uint16(yValue),
|
||||
Width: uint16(widthValue),
|
||||
Height: uint16(heightValue),
|
||||
Title: title,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func createNewWindowForm(bus *events.Bus, doc *dom.DOM) {
|
||||
var err error
|
||||
|
||||
x0 := tview.NewInputField().SetLabel("x")
|
||||
y0 := tview.NewInputField().SetLabel("y")
|
||||
width := tview.NewInputField().SetLabel("width")
|
||||
height := tview.NewInputField().SetLabel("height")
|
||||
title := tview.NewInputField().SetLabel("title")
|
||||
|
||||
form := tview.NewForm().
|
||||
AddFormItem(x0).
|
||||
AddFormItem(y0).
|
||||
AddFormItem(width).
|
||||
AddFormItem(height).
|
||||
AddFormItem(title).
|
||||
AddButton("Create", func() {
|
||||
// Validate the inputs
|
||||
window, err := validateFormInputs(
|
||||
x0.GetText(),
|
||||
y0.GetText(),
|
||||
width.GetText(),
|
||||
height.GetText(),
|
||||
title.GetText(),
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
bus.Emit(ui.LogEv{Log: fmt.Sprintf("failed to parse form: %s\n", err.Error())})
|
||||
return
|
||||
}
|
||||
|
||||
bus.Emit(ui.CreateWindowEv{Window: window})
|
||||
})
|
||||
|
||||
form.SetBorder(true).
|
||||
SetTitle("new window form").
|
||||
SetTitleAlign(tview.AlignLeft).
|
||||
SetInputCapture(func(ev *tcell.EventKey) *tcell.EventKey {
|
||||
switch ev.Key() {
|
||||
case tcell.KeyEscape:
|
||||
bus.Emit(ui.ChangeFocusEv{Target: doc.GetElemByID(layoutToolFlexID)})
|
||||
}
|
||||
|
||||
return ev
|
||||
})
|
||||
|
||||
var formNode *dom.UINode
|
||||
formNode = doc.GetNodeByID("new-window-form")
|
||||
if formNode == nil {
|
||||
formNode, err = doc.NewUINode("new-window-form",
|
||||
doc.GetElemByID(layoutToolActionPagesID), form)
|
||||
if err != nil {
|
||||
panic("failed to create UI node for the new window form: " + err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
AddAndShowPage(bus, doc, doc.GetElemByID(layoutToolActionPagesID).(*tview.Pages),
|
||||
formNode)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
package views
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
"esdi/tui/internal/dom"
|
||||
"esdi/tui/internal/events"
|
||||
"esdi/tui/internal/models"
|
||||
"esdi/tui/internal/ui"
|
||||
|
||||
"github.com/gdamore/tcell/v2"
|
||||
"github.com/rivo/tview"
|
||||
)
|
||||
|
||||
// Validate the form inputs
|
||||
func validateFormInputs(x, y, w, h, title string) (models.Window, error) {
|
||||
xValue, err := strconv.ParseUint(x, 10, 64)
|
||||
if err != nil {
|
||||
return models.Window{}, err
|
||||
}
|
||||
yValue, err := strconv.ParseUint(y, 10, 64)
|
||||
if err != nil {
|
||||
return models.Window{}, err
|
||||
}
|
||||
widthValue, err := strconv.ParseUint(w, 10, 64)
|
||||
if err != nil {
|
||||
return models.Window{}, err
|
||||
}
|
||||
heightValue, err := strconv.ParseUint(h, 10, 64)
|
||||
if err != nil {
|
||||
return models.Window{}, err
|
||||
}
|
||||
|
||||
return models.Window{
|
||||
X: uint16(xValue),
|
||||
Y: uint16(yValue),
|
||||
Width: uint16(widthValue),
|
||||
Height: uint16(heightValue),
|
||||
Title: title,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func createNewWindowForm(bus *events.Bus, doc *dom.DOM) {
|
||||
var err error
|
||||
|
||||
x0 := tview.NewInputField().SetLabel("x")
|
||||
y0 := tview.NewInputField().SetLabel("y")
|
||||
width := tview.NewInputField().SetLabel("width")
|
||||
height := tview.NewInputField().SetLabel("height")
|
||||
title := tview.NewInputField().SetLabel("title")
|
||||
|
||||
form := tview.NewForm().
|
||||
AddFormItem(x0).
|
||||
AddFormItem(y0).
|
||||
AddFormItem(width).
|
||||
AddFormItem(height).
|
||||
AddFormItem(title).
|
||||
AddButton("Create", func() {
|
||||
// Validate the inputs
|
||||
window, err := validateFormInputs(
|
||||
x0.GetText(),
|
||||
y0.GetText(),
|
||||
width.GetText(),
|
||||
height.GetText(),
|
||||
title.GetText(),
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
bus.Emit(ui.LogEv{Log: fmt.Sprintf("failed to parse form: %s\n", err.Error())})
|
||||
return
|
||||
}
|
||||
|
||||
bus.Emit(ui.CreateWindowEv{Window: window})
|
||||
})
|
||||
|
||||
form.SetBorder(true).
|
||||
SetTitle("new window form").
|
||||
SetTitleAlign(tview.AlignLeft).
|
||||
SetInputCapture(func(ev *tcell.EventKey) *tcell.EventKey {
|
||||
switch ev.Key() {
|
||||
case tcell.KeyEscape:
|
||||
bus.Emit(ui.ChangeFocusEv{Target: doc.GetElemByID(layoutToolFlexID)})
|
||||
}
|
||||
|
||||
return ev
|
||||
})
|
||||
|
||||
var formNode *dom.UINode
|
||||
formNode = doc.GetNodeByID("new-window-form")
|
||||
if formNode == nil {
|
||||
formNode, err = doc.NewUINode("new-window-form",
|
||||
doc.GetElemByID(layoutToolActionPagesID), form)
|
||||
if err != nil {
|
||||
panic("failed to create UI node for the new window form: " + err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
AddAndShowPage(bus, doc, doc.GetElemByID(layoutToolActionPagesID).(*tview.Pages),
|
||||
formNode)
|
||||
}
|
||||
@@ -0,0 +1,172 @@
|
||||
package views
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
helper "esdi/helpers"
|
||||
"esdi/tui/internal/dom"
|
||||
"esdi/tui/internal/events"
|
||||
"esdi/tui/internal/ui"
|
||||
|
||||
"github.com/gdamore/tcell/v2"
|
||||
"github.com/rivo/tview"
|
||||
)
|
||||
|
||||
type ManipMode int
|
||||
|
||||
const (
|
||||
moveMode ManipMode = iota
|
||||
resizeMode
|
||||
)
|
||||
|
||||
type windowManipState struct {
|
||||
Mode ManipMode
|
||||
}
|
||||
|
||||
func keyToVector(r rune) (helper.Vector, bool) {
|
||||
var mult uint16 = 1
|
||||
|
||||
// Is uppercase? For fast movement
|
||||
if r >= 'A' && r <= 'Z' {
|
||||
mult = 10
|
||||
r += 'a' - 'A'
|
||||
}
|
||||
|
||||
switch r {
|
||||
case 'h':
|
||||
return helper.Vector{DX: -mult, DY: 0}, true
|
||||
case 'j':
|
||||
return helper.Vector{DX: 0, DY: mult}, true
|
||||
case 'k':
|
||||
return helper.Vector{DX: 0, DY: -mult}, true
|
||||
case 'l':
|
||||
return helper.Vector{DX: mult, DY: 0}, true
|
||||
}
|
||||
|
||||
return helper.Vector{}, false
|
||||
}
|
||||
|
||||
func handleMovementCapture(bus *events.Bus, id int16, ev *tcell.EventKey) *tcell.EventKey {
|
||||
vec, ok := keyToVector(ev.Rune())
|
||||
if !ok {
|
||||
return ev
|
||||
}
|
||||
|
||||
bus.Emit(ui.MoveWindowEv{
|
||||
WindowID: id,
|
||||
Delta: vec,
|
||||
})
|
||||
|
||||
return ev
|
||||
}
|
||||
|
||||
func handleResizeCapture(bus *events.Bus, id int16, ev *tcell.EventKey) *tcell.EventKey {
|
||||
vec, ok := keyToVector(ev.Rune())
|
||||
if !ok {
|
||||
return ev
|
||||
}
|
||||
|
||||
bus.Emit(ui.ResizeWindowEv{
|
||||
WindowID: id,
|
||||
Delta: vec,
|
||||
})
|
||||
|
||||
return ev
|
||||
}
|
||||
|
||||
type modeHandler func(*tcell.EventKey) *tcell.EventKey
|
||||
|
||||
func (s *windowManipState) CurrentHandler(
|
||||
bus *events.Bus,
|
||||
id int16,
|
||||
) modeHandler {
|
||||
switch s.Mode {
|
||||
case moveMode:
|
||||
return func(ev *tcell.EventKey) *tcell.EventKey {
|
||||
return handleMovementCapture(bus, id, ev)
|
||||
}
|
||||
case resizeMode:
|
||||
return func(ev *tcell.EventKey) *tcell.EventKey {
|
||||
return handleResizeCapture(bus, id, ev)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func windowManipulationEvCapture(
|
||||
bus *events.Bus,
|
||||
doc *dom.DOM,
|
||||
id int16,
|
||||
state *windowManipState,
|
||||
) func(ev *tcell.EventKey) *tcell.EventKey {
|
||||
return func(ev *tcell.EventKey) *tcell.EventKey {
|
||||
switch ev.Key() {
|
||||
case tcell.KeyEscape:
|
||||
bus.Emit(ui.ChangeFocusEv{
|
||||
Target: doc.GetElemByID(layoutToolFlexID),
|
||||
})
|
||||
return ev
|
||||
}
|
||||
|
||||
bus.Emit(ui.PrintLogEv{
|
||||
Log: fmt.Sprintf("-> IDX: %d\n", id),
|
||||
})
|
||||
|
||||
// Mode switching
|
||||
switch ev.Rune() {
|
||||
case 'r':
|
||||
state.Mode = resizeMode
|
||||
bus.Emit(ui.PrintLogEv{Log: "switched to resizeMode"})
|
||||
case 'm':
|
||||
state.Mode = moveMode
|
||||
bus.Emit(ui.PrintLogEv{Log: "switched to moveMode"})
|
||||
}
|
||||
|
||||
// Delegate the current handler input
|
||||
handler := state.CurrentHandler(bus, id)
|
||||
if handler != nil {
|
||||
return handler(ev)
|
||||
}
|
||||
|
||||
return ev
|
||||
}
|
||||
}
|
||||
|
||||
func windowManipulationTool(bus *events.Bus, doc *dom.DOM, idx int16) {
|
||||
bus.Emit(ui.PrintLogEv{Log: fmt.Sprintf("WID: %d\n", idx)})
|
||||
|
||||
// Get the ActionPages parent
|
||||
box := tview.NewBox().SetTitle("MOVE WINDOW TOOL")
|
||||
box.SetBorder(true)
|
||||
|
||||
var err error
|
||||
var boxNode *dom.UINode
|
||||
|
||||
// delete the currently existing move-window-box
|
||||
actionPages := doc.GetElemByID(layoutToolActionPagesID).(*tview.Pages)
|
||||
actionPages.RemovePage("move-window-box")
|
||||
|
||||
boxNode = doc.GetNodeByID("move-window-box")
|
||||
if boxNode != nil {
|
||||
doc.DeleteElem(boxNode)
|
||||
}
|
||||
|
||||
boxNode, err = doc.NewUINode(
|
||||
"move-window-box",
|
||||
doc.GetElemByID(layoutToolActionPagesID),
|
||||
box,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// Create the state for this tool
|
||||
state := windowManipState{
|
||||
Mode: moveMode,
|
||||
}
|
||||
|
||||
box.SetInputCapture(windowManipulationEvCapture(bus, doc, idx, &state))
|
||||
AddAndShowPage(bus, doc, actionPages, boxNode)
|
||||
}
|
||||
Reference in New Issue
Block a user