go-vise

commit 68fef90684b9aef9168be7ddf1760f895de8ee92
parent ca4e9e963a6280fc31ec16135231ab8be21efefa
Author: lash <dev@holbrook.no>
Date:   Tue, 11 Apr 2023 08:35:00 +0100

Add menu navigation to net remaining in browseable render

Diffstat:
M
go/render/page.go
 | 
61
++++++++++++++++++++++++++++++++++++++++++++-----------------
M
go/render/size.go
 | 
4
++++
M
go/render/size_test.go
 | 
2
+-
M
go/testdata/testdata.go
 | 
2
+-

4 files changed, 50 insertions(+), 19 deletions(-)
diff --git a/go/render/page.go b/go/render/page.go
@@ -158,6 +158,7 @@ func(pg *Page) RenderTemplate(sym string, values map[string]string, idx uint16) 
 }
 
 // render menu and all syms except sink, split sink into display chunks
+// TODO: Function too long, split up
 func(pg *Page) prepare(sym string, values map[string]string, idx uint16) (map[string]string, error) {
 	var sink string
 
@@ -191,32 +192,51 @@ func(pg *Page) prepare(sym string, values map[string]string, idx uint16) (map[st
 	if err != nil {
 		return nil, err
 	}
+	// remaining includes core menu
+	remaining, ok := pg.sizer.Check(s)
+	if !ok {
+		return nil, fmt.Errorf("capacity exceeded")
+	}
 
+	var menuSizes [4]uint32 // mainSize, prevsize, nextsize, nextsize+prevsize
 	if pg.menu != nil {
-		r, err := pg.menu.Render(idx)
+		cfg := pg.menu.GetBrowseConfig()
+		tmpm := NewMenu().WithBrowseConfig(cfg)
+		v, err := tmpm.Render(0)
 		if err != nil {
 			return nil, err
 		}
-		log.Printf("appending %s for menu", r)
-		s += r
-	}
-
-	remaining, ok := pg.sizer.Check(s)
-	if !ok {
-		return nil, fmt.Errorf("capacity exceeded")
+		menuSizes[0] = uint32(len(v))
+		tmpm = tmpm.WithPageCount(2)
+		v, err = tmpm.Render(0)
+		if err != nil {
+			return nil, err
+		}
+		menuSizes[1] = uint32(len(v)) - menuSizes[0]
+		v, err = tmpm.Render(1)
+		if err != nil {
+			return nil, err
+		}
+		menuSizes[2] = uint32(len(v)) - menuSizes[0]
+		menuSizes[3] = menuSizes[1] + menuSizes[2]
 	}
 
-	log.Printf("%v bytes available for sink split", remaining)
+	log.Printf("%v bytes available for sink split before navigation", remaining)
 
 	l := 0
 	var count uint16
 	tb := strings.Builder{}
 	rb := strings.Builder{}
 
+	netRemaining := remaining
+	if len(sinkValues) > 1 {
+		netRemaining -= menuSizes[1]
+	}
+
 	for i, v := range sinkValues {
 		log.Printf("processing sinkvalue %v: %s", i, v)
 		l += len(v)
-		if uint32(l) > remaining {
+		if uint32(l) > netRemaining {
 			if tb.Len() == 0 {
 				return nil, fmt.Errorf("capacity insufficient for sink field %v", i)
 			}
@@ -226,6 +246,9 @@ func(pg *Page) prepare(sym string, values map[string]string, idx uint16) (map[st
 			pg.sizer.AddCursor(c)
 			tb.Reset()
 			l = 0
+			if count == 0 {
+				netRemaining -= menuSizes[2]
+			}
 			count += 1
 		}
 		if tb.Len() > 0 {
@@ -264,14 +287,18 @@ func(pg *Page) render(sym string, values map[string]string, idx uint16) (string,
 	}
 	log.Printf("rendered %v bytes for template", len(s))
 	r += s
-	s, err = pg.menu.Render(idx)
-	if err != nil {
-		return "", err
-	}
-	log.Printf("rendered %v bytes for menu", len(s))
-	if len(s) > 0 {
-		r += "\n" + s
+
+	if pg.menu != nil {
+		s, err = pg.menu.Render(idx)
+		if err != nil {
+			return "", err
+		}
+		log.Printf("rendered %v bytes for menu", len(s))
+		if len(s) > 0 {
+			r += "\n" + s
+		}
 	}
+
 	if pg.sizer != nil {
 		_, ok = pg.sizer.Check(r)
 		if !ok {
diff --git a/go/render/size.go b/go/render/size.go
@@ -65,6 +65,10 @@ func(szr *Sizer) Size(s string) (uint16, error) {
 	return r, nil
 }
 
+func(szr *Sizer) MenuSize() uint16 {
+	return szr.menuSize
+}
+
 func(szr *Sizer) AddCursor(c uint32) {
 	log.Printf("added cursor: %v", c)
 	szr.crsrs = append(szr.crsrs, c)
diff --git a/go/render/size_test.go b/go/render/size_test.go
@@ -166,7 +166,7 @@ lala poo
 
 
 	if r != expect {
-		t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", expect, r)
+		t.Fatalf("expected:\n\t%x\ngot:\n\t%x\n", expect, r)
 	}
 	r, err = pg.Render("pages", 1)
 	if err != nil {
diff --git a/go/testdata/testdata.go b/go/testdata/testdata.go
@@ -112,7 +112,7 @@ func long() error {
 	b := []byte{}
 	b = vm.NewLine(b, vm.MOUT, []string{"0", "back"}, nil, nil)
 	b = vm.NewLine(b, vm.MNEXT, []string{"00", "nexxt"}, nil, nil)
-	b = vm.NewLine(b, vm.MPREV, []string{"11", "prevv"}, nil, nil)
+	b = vm.NewLine(b, vm.MPREV, []string{"11", "prevvv"}, nil, nil)
 	b = vm.NewLine(b, vm.LOAD, []string{"longdata"}, []byte{0x00}, nil)
 	b = vm.NewLine(b, vm.MAP, []string{"longdata"}, nil, nil)
 	b = vm.NewLine(b, vm.HALT, nil, nil, nil)