Concurrent v0.5.5 -> v0.6.7

README.md

@@ -40,7 +40,9 @@ https://github.com/as/a/wiki/Alterations
 https://github.com/as/a/issues
 
 # hints
-To reshape the windows and columns, click on the invisible 10x10px sizer that I haven't rendered yet with the middle mouse button. Hold the button down and move the window to the location. Release the button.
+To reshape the windows and columns, click on the invisible 10x10px sizer that I haven't rendered yet with the left mouse button. 
+Hold the button down and move the window to the location. 
+Release the button.
 
 # edit
 - 80% of the sam command language is implemented.
@@ -83,10 +85,6 @@ Edit ,x,the standard editor is any editor,x,any editor,c,ed,
 - Looking (right click) in the main tag finds the result in all open windows
 ![paint](jump.png)    
 
-# purpose
-- ACME SAC doesn't run on my computer
-- The solution is to create a text editor from scratch then
-
 # future
 - Fixing the bugs
 - Cleaning the code up

a.go

@@ -1,31 +1 @@
 package main
-
-import (
-	"github.com/as/edit"
-	"github.com/as/frame"
-)
-
-func (g *Grid) acolor(e edit.File) {
-	// TODO(as): O(n*m) -> O(1)
-	if t := g.FindName(e.Name); t != nil {
-		if t.Body == nil {
-			return
-		}
-		fr := t.Body.Frame
-		p0, p1 := e.Q0, e.Q1
-		p0 -= clamp(p0-t.Body.Origin(), 0, fr.Len())
-		p1 -= clamp(p1-t.Body.Origin(), 0, fr.Len())
-		fr.Recolor(fr.PointOf(p0), p0, p1, frame.Mono.Palette)
-		fr.Mark()
-	}
-}
-
-func clamp(v, l, h int64) int64 {
-	if v < l {
-		return l
-	}
-	if v > h {
-		return h
-	}
-	return v
-}

active.go

@@ -4,15 +4,21 @@ import (
 	"image"
 
 	"github.com/as/ui/tag"
-	"github.com/as/ui/win"
 )
 
 var (
 	actCol *Col
 	actTag *tag.Tag
-	act    *win.Win
+	act    tag.Window
 )
 
+func actinit(g *Grid) {
+	// This in particular needs to go
+	actCol = g.List[0].(*Col)
+	actTag = actCol.List[0].(*tag.Tag)
+	act = actTag.Body
+}
+
 func active2(pt image.Point, list ...Plane) (x Plane) {
 	for i, w := range list {
 		if w == nil {
@@ -26,36 +32,29 @@ func active2(pt image.Point, list ...Plane) (x Plane) {
 	return nil
 }
 
-// Put
-func active(pt image.Point, act Plane, list ...Plane) (x Plane) {
-	if tag.Buttonsdown != 0 {
-		return act
+func activelabel(pt image.Point, t *tag.Tag) bool {
+	if t.Win == nil {
+		panic("FLAG: label is nil")
 	}
-	if act != nil {
-		list = append([]Plane{act}, list...)
-	}
-	for i, w := range list {
-		if w == nil {
-			continue
-		}
-		r := w.Loc()
-		if pt.In(r) {
-			return list[i]
-		}
+	if pt.In(t.Win.Loc()) {
+		actTag = t
+		act = t.Win
+		return true
 	}
-	return act
+	return false
 }
 
 func activate(pt image.Point, w Plane) {
-	if tag.Buttonsdown != 0 {
-		return
-	}
 	switch w := w.(type) {
 	case *Grid:
+		if activelabel(pt, w.Tag) {
+			return
+		}
 		x := active2(pt, w.List...)
 		switch x := x.(type) {
 		case *tag.Tag:
-			actCol = w.Col
+			panic("tag not allowed in column anymore")
+			//actCol = w.Col
 			actTag = x
 			act = x.Win
 		case *Col:
@@ -65,19 +64,17 @@ func activate(pt image.Point, w Plane) {
 		}
 	case *Col:
 		actCol = w
-		x := active2(pt, w.List...)
-		if eq(x, w.List[0]) {
-			actTag = x.(*tag.Tag)
-			act = x.(*tag.Tag).Win
-		} else {
-			activate(pt, x)
+		if activelabel(pt, w.Tag) {
+			return
 		}
+		x := active2(pt, w.List...)
+		activate(pt, x)
 	case *tag.Tag:
 		actTag = w
 		if w.Body != nil {
 			activate(pt, active2(pt, w.Body, w.Win))
 		}
-	case *win.Win:
+	case tag.Window:
 		act = w
 	}
 }

args.go

@@ -0,0 +1,13 @@
+package main
+
+import "flag"
+
+func argparse() (list []string) {
+	if len(flag.Args()) > 0 {
+		list = append(list, flag.Args()...)
+	} else {
+		list = append(list, "guide")
+		list = append(list, ".")
+	}
+	return
+}

assert.go

@@ -0,0 +1,61 @@
+package main
+
+import (
+	"image"
+	"log"
+
+	"github.com/as/ui/tag"
+)
+
+const debug = 1 ^ 1
+
+func assert(where string, g *Grid) {
+	if debug == 0 {
+		return
+	}
+	log.Printf("%s: grid %s\n", where, g.Loc())
+	for i, c := range g.List {
+		for j, c2 := range g.List {
+			if c == c2 {
+				continue
+			}
+			if c.Loc().Intersect(c2.Loc()) != image.ZR {
+				log.Printf("%s: 	col %v %s intersects col %v %s\n", where, i, c.Loc(), j, c2.Loc())
+				panic("suicide")
+			}
+		}
+	}
+	if g.Tag.Vis != tag.VisTag {
+		log.Printf("%v\n", g.Tag.Vis)
+		//		panic("grid tag not vistag") // Put
+	}
+	for i, c := range g.List {
+		if c.(*Col).Tag.Vis != tag.VisTag {
+			log.Printf("number %d = %v\n", i, g.Tag.Vis)
+			//panic("col tag not vistag")
+		}
+		if !c.Loc().In(g.Loc()) {
+			log.Printf("%s: col %v %s not in grid %s\n", where, i, c.Loc(), g.Loc())
+			//			panic("suicide")
+		}
+		log.Printf("%s: col %v %s is good\n", where, i, c.Loc())
+		{
+			c, _ := c.(*Col)
+			if c == nil {
+				continue
+			}
+			for j, t := range c.List {
+				if !t.Loc().In(c.Loc()) {
+					log.Printf("%s: 	tag %v %s not in col %v %s\n", where, j, t.Loc(), i, c.Loc())
+					//panic("suicide")
+				}
+				if !t.Loc().In(g.Loc()) {
+					log.Printf("%s: 	tag %v %s not in grid %v %s\n", where, j, t.Loc(), i, g.Loc())
+					//panic("suicide")
+
+				}
+				log.Printf("%s: 	tag %v %s is good\n", where, j, t.Loc())
+			}
+		}
+	}
+}

border.go

@@ -0,0 +1,69 @@
+package main
+
+import (
+	mus "github.com/as/text/mouse"
+	"github.com/as/ui/col"
+	"github.com/as/ui/win"
+	"golang.org/x/mobile/event/mouse"
+)
+
+func borderHit(e mouse.Event) bool {
+	pt := p(e)
+	return inSizer(pt) || inScroll(pt)
+}
+
+func procBorderHit(e mouse.Event) {
+	apt := p(e)
+	e = rel(e, act)
+	pt := p(e)
+
+	switch {
+	case inSizer(pt):
+		if HasButton(1, down) {
+			if !apt.In(g.Area()) {
+				for down != 0 {
+					g.Move(apt)
+					g.Refresh()
+					col.Fill(g)
+					apt = p(readmouse(<-D.Mouse))
+				}
+			} else if canopy(apt) {
+				dragCol(g, actCol, e, D.Mouse)
+			} else {
+				dragTag(actCol, actTag, e, D.Mouse)
+			}
+			break
+		}
+		switch down {
+		case Button(2):
+		case Button(3):
+			//			actCol.PrintList()
+			actCol.RollUp(actCol.ID(actTag), act.Loc().Min.Y)
+			//			actCol.PrintList()
+			moveMouse(act.Loc().Min)
+		}
+		for down != 0 {
+			readmouse(<-D.Mouse)
+		}
+	case inScroll(pt):
+		switch down {
+		case Button(1):
+			scroll(act, mus.ScrollEvent{Dy: 10, Event: e})
+		case Button(2):
+			w, _ := act.(*win.Win)
+			if w == nil {
+				break
+			}
+			w.Clicksb(pt, 0)
+			repaint()
+			for HasButton(2, down) {
+				w.Clicksb(p(rel(readmouse(<-D.Mouse), w)), 0)
+				repaint()
+			}
+		case Button(3):
+			scroll(act, mus.ScrollEvent{Dy: -10, Event: e})
+		}
+	default:
+		logf("unknown border action at pt: %s", pt)
+	}
+}