Propagate mouse motion events to boxes

This makes window-level keybinds possible. Exciting!

go.mod

@@ -3,7 +3,7 @@ module git.tebibyte.media/tomo/backend
 go 1.20
 
 require (
-	git.tebibyte.media/tomo/tomo v0.41.0
+	git.tebibyte.media/tomo/tomo v0.41.1
 	git.tebibyte.media/tomo/typeset v0.7.1
 	git.tebibyte.media/tomo/xgbkb v1.0.1
 	github.com/jezek/xgb v1.1.1

go.sum

@@ -1,6 +1,6 @@
 git.tebibyte.media/sashakoshka/xgbkb v1.0.0/go.mod h1:pNcE6TRO93vHd6q42SdwLSTTj25L0Yzggz7yLe0JV6Q=
-git.tebibyte.media/tomo/tomo v0.41.0 h1:Z+7FHhbGiKjs+kQNvuJOfz47xIct5qxvSJqyDuoNIOs=
+git.tebibyte.media/tomo/tomo v0.41.1 h1:XdbyF3VjsLj1Zppr70gUaufuh49hU32JQo2ENnw4PcA=
-git.tebibyte.media/tomo/tomo v0.41.0/go.mod h1:C9EzepS9wjkTJjnZaPBh22YvVPyA4hbBAJVU20Rdmps=
+git.tebibyte.media/tomo/tomo v0.41.1/go.mod h1:C9EzepS9wjkTJjnZaPBh22YvVPyA4hbBAJVU20Rdmps=
 git.tebibyte.media/tomo/typeset v0.7.1 h1:aZrsHwCG5ZB4f5CruRFsxLv5ezJUCFUFsQJJso2sXQ8=
 git.tebibyte.media/tomo/typeset v0.7.1/go.mod h1:PwDpSdBF3l/EzoIsa2ME7QffVVajnTHZN6l3MHEGe1g=
 git.tebibyte.media/tomo/xgbkb v1.0.1 h1:b3HDUopjdQp1MZrb5Vpil4bOtk3NnNXtfQW27Blw2kE=

internal/system/box.go

@@ -69,6 +69,7 @@ func (this *System) newBox (outer anyBox) *box {
 		system:  this,
 		outer:   outer,
 		drawer:  outer,
+		tags:    make(util.Set[string]),
 	}
 	box.canvas = util.NewMemo (func () canvas.Canvas {
 		if box.parent == nil { return nil }
@@ -335,13 +336,6 @@ func (this *box) handleMouseDown (button input.Button) (caught bool) {
 		this.invalidateStyle()
 	}
 	
-	if this.focusable {
-		this.SetFocused(true)
-	} else {
-		hierarchy := this.getHierarchy()
-		if hierarchy == nil { return }
-		hierarchy.focus(nil)
-	}
 	for _, listener := range this.on.buttonDown.Listeners() {
 		if listener(button) { caught = true }
 	}
@@ -483,9 +477,6 @@ func (this *box) calculateMinimumSize () image.Point {
 		minSize.Y = userMinSize.Y
 	}
 	
-	if this.parent != nil {
-		this.parent.notifyMinimumSizeChange(this)
-	}
 	return minSize
 }
 
@@ -512,7 +503,7 @@ func (this *box) doLayout () {
 }
 
 func (this *box) doStyle () {
-	this.styleApplicator.apply(this)
+	this.styleApplicator.apply(this.outer)
 }
 
 func (this *box) setParent (parent parent) {
@@ -563,6 +554,9 @@ func (this *box) invalidateDraw () {
 
 func (this *box) invalidateMinimum () {
 	this.minSize.Invalidate()
+	if this.parent != nil {
+		this.parent.notifyMinimumSizeChange(this)
+	}
 }
 
 func (this *box) recursiveReApply () {
@@ -614,7 +608,8 @@ func (this *box) propagateAlt (callback func (anyBox) bool) bool {
 func (this *box) transparent () bool {
 	// TODO uncomment once we have
 	// a way to detect texture transparency
-	return util.Transparent(this.attrColor.Value()) /*&&
+	col := this.attrColor.Value().Color
+	return col == nil || util.Transparent(col) /*&&
 		(this.texture == nil || !this.texture.Opaque())*/
 }
 

internal/system/boxquerier.go

@@ -20,6 +20,7 @@ func (querier boxQuerier) RecommendedWidth (index int, height int) int {
 		if box, ok := box.(anyContentBox); ok {
 			return box.recommendedWidth(height)
 		}
+		return box.minimumSize().X
 	}
 	return 0
 }
@@ -29,6 +30,7 @@ func (querier boxQuerier) RecommendedHeight (index int, width int) int {
 		if box, ok := box.(anyContentBox); ok {
 			return box.recommendedHeight(width)
 		}
+		return box.minimumSize().Y
 	}
 	return 0
 }

internal/system/containerbox.go

@@ -20,7 +20,6 @@ type containerBox struct {
 	attrLayout   attrHierarchy[tomo.AttrLayout]
 
 	children []anyBox
-	layout   tomo.Layout
 
 	on struct {
 		contentBoundsChange event.FuncBroadcaster
@@ -174,6 +173,7 @@ func (this *containerBox) setAttr (attr tomo.Attr, user bool) {
 	case tomo.AttrOverflow:
 		if this.attrOverflow.Set(attr, user) {
 			this.invalidateLayout()
+			this.invalidateMinimum()
 		}
 		
 	case tomo.AttrLayout:
@@ -187,19 +187,21 @@ func (this *containerBox) setAttr (attr tomo.Attr, user bool) {
 }
 
 func (this *containerBox) recommendedHeight (width int) int {
-	if this.layout == nil || this.attrOverflow.Value().Y {
+	layout := this.attrLayout.Value().Layout
+	if layout == nil || !this.attrOverflow.Value().Y {
 		return this.minSize.Value().Y
 	} else {
-		return this.layout.RecommendedHeight(this.layoutHints(), this.boxQuerier(), width) +
+		return layout.RecommendedHeight(this.layoutHints(), this.boxQuerier(), width) +
 			this.borderAndPaddingSum().Vertical()
 	}
 }
 
 func (this *containerBox) recommendedWidth (height int) int {
-	if this.layout == nil || this.attrOverflow.Value().X {
+	layout := this.attrLayout.Value().Layout
+	if layout == nil || !this.attrOverflow.Value().X {
 		return this.minSize.Value().X
 	} else {
-		return this.layout.RecommendedWidth(this.layoutHints(), this.boxQuerier(), height) +
+		return layout.RecommendedWidth(this.layoutHints(), this.boxQuerier(), height) +
 			this.borderAndPaddingSum().Horizontal()
 	}
 }
@@ -274,8 +276,9 @@ func (this *containerBox) layoutHints () tomo.LayoutHints {
 func (this *containerBox) contentMinimum () image.Point {
 	overflow := this.attrOverflow.Value()
 	minimum  := this.box.contentMinimum()
-	if this.layout != nil {
+	layout := this.attrLayout.Value().Layout
-		layoutMinimum := this.layout.MinimumSize (
+	if layout != nil {
+		layoutMinimum := layout.MinimumSize (
 			this.layoutHints(),
 			this.boxQuerier())
 		if overflow.X { layoutMinimum.X = 0 }
@@ -288,12 +291,13 @@ func (this *containerBox) contentMinimum () image.Point {
 func (this *containerBox) doLayout () {
 	this.box.doLayout()
 	previousContentBounds := this.contentBounds
+	layout := this.attrLayout.Value().Layout
 
 	// by default, use innerBounds (translated to 0, 0) for contentBounds.
 	// if a direction overflows, use the layout's minimum size for it.
 	var minimum image.Point
-	if this.layout != nil {
+	if layout != nil {
-		minimum = this.layout.MinimumSize (
+		minimum = layout.MinimumSize (
 			this.layoutHints(),
 			this.boxQuerier())
 	}
@@ -304,10 +308,10 @@ func (this *containerBox) doLayout () {
 	if overflow.Y { this.contentBounds.Max.Y = this.contentBounds.Min.Y + minimum.Y }
 	
 	// arrange children
-	if this.layout != nil {
+	if layout != nil {
 		layoutHints := this.layoutHints()
 		layoutHints.Bounds = this.contentBounds
-		this.layout.Arrange(layoutHints, this.boxArranger())
+		layout.Arrange(layoutHints, this.boxArranger())
 	}
 
 	// build an accurate contentBounds by unioning the bounds of all child
@@ -323,7 +327,7 @@ func (this *containerBox) doLayout () {
 
 	// offset children and contentBounds by scroll
 	for _, box := range this.children {
-		assertAnyBox(box).setBounds(box.Bounds().Add(this.scroll).Add(innerBounds.Min))
+		box.setBounds(box.Bounds().Add(this.scroll).Add(innerBounds.Min))
 	}
 	this.contentBounds = this.contentBounds.Add(this.scroll)
 	

internal/system/event.go

@@ -3,7 +3,6 @@ package system
 import "image"
 import "git.tebibyte.media/tomo/tomo/input"
 
-// TODO: redo all of this because there are new event propogation rules
 // TODO: once go v1.23 comes out, replace the explicit iterator calls here with
 // range loops
 
@@ -25,21 +24,30 @@ func (this *Hierarchy) HandleModifiers (modifiers input.Modifiers) {
 // HandleModifiers must be called *before* HandleKeyDown.
 func (this *Hierarchy) HandleKeyDown (key input.Key, numberPad bool) {
 	caught := false
-	this.keyboardTargets(func (target anyBox) bool {
+	if this.anyFocused() {
-		if target.handleKeyDown(key, numberPad) {
+		this.keyboardTargets(func (target anyBox) bool {
-			caught = true
+			if target.handleKeyDown(key, numberPad) {
-			return false
+				caught = true
+				return false
+			}
+			return true
+		})
+	} else {
+		if this.root != nil {
+			caught = this.root.handleKeyDown(key, numberPad)
 		}
-		return true
+	}
-	})
 	if caught { return }
 
-	if key == input.KeyTab && this.modifiers.Alt {
+	switch key {
+	case input.KeyTab:
 		if this.modifiers.Shift {
 			this.focusPrevious()
 		} else {
 			this.focusNext()
 		}
+	case input.KeyUp:   this.focusPrevious()
+	case input.KeyDown: this.focusNext()
 	}
 }
 
@@ -47,12 +55,18 @@ func (this *Hierarchy) HandleKeyDown (key input.Key, numberPad bool) {
 // which triggers this comes with modifier key information, HandleModifiers must
 // be called *before* HandleKeyUp.
 func (this *Hierarchy) HandleKeyUp (key input.Key, numberPad bool) {
-	this.keyboardTargets(func (target anyBox) bool {
+	if this.anyFocused() {
-		if target.handleKeyUp(key, numberPad) {
+		this.keyboardTargets(func (target anyBox) bool {
-			return false
+			if target.handleKeyUp(key, numberPad) {
+				return false
+			}
+			return true
+		})
+	} else {
+		if this.root != nil {
+			this.root.handleKeyUp(key, numberPad)
 		}
-		return true
+	}
-	})
 }
 
 // HandleMouseDown sends a mouse down event to the Boxes positioned underneath
@@ -62,7 +76,16 @@ func (this *Hierarchy) HandleKeyUp (key input.Key, numberPad bool) {
 // information, HandleMouseMove must be called *before* HandleMouseDown.
 func (this *Hierarchy) HandleMouseDown (button input.Button) {
 	boxes := []anyBox { }
+	first := true
 	this.boxesUnder(this.mousePosition)(func (box anyBox) bool {
+		if first {
+			if box.canBeFocused() {
+				this.focus(box)
+			} else {
+				this.focus(nil)
+			}
+			first = false
+		}
 		boxes = append(boxes, box)
 		return !box.handleMouseDown(button)
 	})
@@ -92,17 +115,18 @@ func (this *Hierarchy) HandleMouseMove (position image.Point) {
 	for _, dragSet := range this.drags {
 		for _, box := range dragSet {
 			if box.handleMouseMove() { break }
+			dragged = true
 		}
-		dragged = true
 	}
 	if dragged { return }
 
 	// TODO we can hover over multiple boxes at once. however, any way of
 	// detecting this involves several slice allocations every time we
 	// process a MouseMove event. perhaps we just ought to suck it up and do
-	// it.
+	// it. or perhaps doing *this* is the better way? we may never know.
 	box := this.boxUnder(position)
 	if box != nil {
+		box := this.considerMaskingParents(box)
 		this.hover(box)
 		box.handleMouseMove()
 	}

internal/system/hierarchy.go

@@ -287,13 +287,26 @@ func (this *Hierarchy) considerMaskingParents (box anyBox) anyBox {
 	return box
 }
 
+func (this *Hierarchy) isMasked (box anyBox) bool {
+	parent := box.getParent()
+	for {
+		parentBox, ok := parent.(anyBox)
+		if !ok { break }
+		if parent.masks() {
+			return true
+		}
+		parent = parentBox.getParent()
+	}
+	return false
+}
+
 func (this *Hierarchy) focusNext () {
 	found   := !this.anyFocused()
 	focused := false
 	this.propagateAlt(func (box anyBox) bool {
 		if found {
 			// looking for the next box to select
-			if box.canBeFocused() {
+			if box.canBeFocused() && !this.isMasked(box) {
 				// found it
 				this.focus(box)
 				focused = true
@@ -318,7 +331,7 @@ func (this *Hierarchy) focusPrevious () {
 		if box == this.focused {
 			return false
 		}
-		if box.canBeFocused() { behind = box }
+		if box.canBeFocused() && !this.isMasked(box) { behind = box }
 		return true
 	})
 	this.focus(behind)
@@ -341,15 +354,21 @@ func (this *Hierarchy) drawBackgroundPart (canvas.Canvas) {
 	// if so, windows should be transparent if the color has transparency
 }
 
+// var minimumSizeCount = 0
 func (this *Hierarchy) doMinimumSize () {
 	this.minimumClean = true
+	// println("doMinimumSize", minimumSizeCount)
+	// minimumSizeCount ++
 
+	previousMinimumSize := this.minimumSize
 	this.minimumSize = image.Point { }
 	if this.root != nil {
 		this.minimumSize = this.root.minimumSize()
 	}
 
-	this.link.NotifyMinimumSizeChange()
+	if previousMinimumSize != this.minimumSize {
+		this.link.NotifyMinimumSizeChange()
+	}
 }
 
 func (this *Hierarchy) newStyleApplicator () *styleApplicator {

internal/system/style.go

@@ -5,20 +5,21 @@ import "git.tebibyte.media/tomo/tomo"
 type styleApplicator struct {
 	style *tomo.Style
 	role  tomo.Role
-	rules []*tomo.Rule
+	rules []tomo.Rule
 }
 
 func (this *styleApplicator) apply (box anyBox) {
 	if box.Role() != this.role {
+		this.role = box.Role()
 		// the role has changed, so re-cache the list of rules
-		this.rules = make([]*tomo.Rule, 4)
+		this.rules = nil
 		for _, rule := range this.style.Rules {
 			role := box.Role()
 			// blank fields match anything
 			if rule.Role.Package == "" { role.Package = "" }
 			if rule.Role.Object  == "" { role.Object  = "" }
 			if rule.Role == role {
-				this.rules = append(this.rules, &rule)
+				this.rules = append(this.rules, rule)
 			}
 		}
 	}

internal/system/textbox.go

@@ -24,6 +24,7 @@ type textBox struct {
 	attrOverflow  attrHierarchy[tomo.AttrOverflow]
 
 	text        string
+	runes       []rune
 	selectable  bool
 	selecting   bool
 	selectStart int
@@ -70,8 +71,9 @@ func (this *textBox) OnContentBoundsChange (callback func()) event.Cookie {
 
 func (this *textBox) SetText (text string) {
 	if this.text == text { return }
-	this.text = text
+	this.text  = text
-	this.drawer.SetText([]rune(text))
+	this.runes = []rune(text)
+	this.drawer.SetText(this.runes)
 	this.invalidateMinimum()
 	this.invalidateLayout()
 }
@@ -109,10 +111,10 @@ func (this *textBox) Draw (can canvas.Canvas) {
 	if col == nil { col = color.Transparent }
 	
 	this.drawBorders(can)
+	
 	pen := can.Pen()
 	pen.Fill(col)
 	pen.Texture(texture)
-	
 	if this.transparent() && this.parent != nil {
 		this.parent.drawBackgroundPart(can)
 	}
@@ -150,17 +152,22 @@ func (this *textBox) setAttr (attr tomo.Attr, user bool) {
 		
 	case tomo.AttrWrap:
 		if this.attrWrap.Set(attr, user) {
+			this.drawer.SetWrap(bool(attr))
 			this.invalidateMinimum()
 			this.invalidateLayout()
 		}
 		
 	case tomo.AttrAlign:
 		if this.attrAlign.Set(attr, user) {
+			this.drawer.SetAlign (
+				typeset.Align(attr.X),
+				typeset.Align(attr.Y))
 			this.invalidateDraw()
 		}
 		
 	case tomo.AttrOverflow:
 		if this.attrOverflow.Set(attr, user) {
+			this.invalidateMinimum()
 			this.invalidateLayout()
 		}
 		
@@ -182,12 +189,10 @@ func (this *textBox) drawDot (can canvas.Canvas) {
 	face      := this.attrFace.Value().Face
 	textColor := this.attrTextColor.Value().Color
 	dotColor  := this.attrDotColor.Value().Color
-	if textColor == nil { textColor = color.Transparent }
+	if textColor == nil { textColor = color.Black }
 	if dotColor  == nil { dotColor  = color.RGBA { G: 255, B: 255, A: 255 } }
 	
 	pen := can.Pen()
-	pen.Fill(color.Transparent)
-	pen.Stroke(textColor)
 
 	bounds  := this.InnerBounds()
 	metrics := face.Metrics()
@@ -200,6 +205,7 @@ func (this *textBox) drawDot (can canvas.Canvas) {
 
 	switch {
 	case dot.Empty():
+		pen.Stroke(textColor)
 		pen.StrokeWeight(1)
 		pen.Path(roundPt(start.Add(ascent)), roundPt(start.Sub(descent)))
 
@@ -243,14 +249,18 @@ func (this *textBox) textOffset () image.Point {
 		Sub(this.drawer.LayoutBoundsSpace().Min)
 }
 
+func (this *textBox) handleFocusEnter () {
+	this.invalidateDraw()
+	this.box.handleFocusEnter()
+}
+
 func (this *textBox) handleFocusLeave () {
-	this.on.dotChange.Broadcast()
 	this.invalidateDraw()
 	this.box.handleFocusLeave()
 }
 
 func (this *textBox) handleMouseDown (button input.Button) bool {
-	if button == input.ButtonLeft {
+	if this.mouseButtonCanDrag(button) {
 		index           := this.runeUnderMouse()
 		this.selectStart = index
 		this.selecting   = true
@@ -260,7 +270,7 @@ func (this *textBox) handleMouseDown (button input.Button) bool {
 }
 
 func (this *textBox) handleMouseUp (button input.Button) bool {
-	if button == input.ButtonLeft && this.selecting {
+	if this.mouseButtonCanDrag(button) && this.selecting {
 		index         := this.runeUnderMouse()
 		this.selecting = false
 		this.Select(text.Dot { Start: this.selectStart, End: index })
@@ -268,6 +278,12 @@ func (this *textBox) handleMouseUp (button input.Button) bool {
 	return this.box.handleMouseUp(button)
 }
 
+func (this *textBox) mouseButtonCanDrag (button input.Button) bool {
+	 return button == input.ButtonLeft   ||
+	 	button == input.ButtonMiddle ||
+	 	button == input.ButtonRight
+}
+
 func (this *textBox) handleMouseMove () bool {
 	if this.selecting {
 		index := this.runeUnderMouse()
@@ -283,6 +299,71 @@ func (this *textBox) runeUnderMouse () int {
 	return this.drawer.AtPosition(fixPt(position))
 }
 
+func (this *textBox) handleKeyDown (key input.Key, numberPad bool) bool {
+	if this.box.handleKeyDown(key, numberPad) { return true  }
+	if !this.selectable                       { return false }
+
+	// because fuck you thats why!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	modifiers := this.Window().Modifiers()
+	dot       := this.Dot()
+	sel       := modifiers.Shift
+	word      := modifiers.Control
+	switch {
+	case key == input.KeyHome || (modifiers.Alt && key == input.KeyLeft):
+		dot.End = 0
+		if !sel { dot.Start = dot.End }
+		this.Select(dot)
+		return true
+	case key == input.KeyEnd || (modifiers.Alt && key == input.KeyRight):
+		dot.End = len(this.text)
+		if !sel { dot.Start = dot.End }
+		this.Select(dot)
+		return true
+	case key == input.KeyLeft:
+		if sel {
+			this.Select(text.SelectLeft(this.runes, dot, word))
+		} else {
+			this.Select(text.MoveLeft(this.runes, dot, word))
+		}
+		return true
+	case key == input.KeyRight:
+		if sel {
+			this.Select(text.SelectRight(this.runes, dot, word))
+		} else {
+			this.Select(text.MoveRight(this.runes, dot, word))
+		}
+		return true
+	case key == input.Key('a') && modifiers.Control:
+		dot.Start = 0
+		dot.End   = len(this.text)
+		this.Select(dot)
+		return true
+	default:
+		return false
+	}
+}
+
+func (this *textBox) handleKeyUp (key input.Key, numberPad bool) bool {
+	if this.box.handleKeyUp(key, numberPad) { return true  }
+	if !this.selectable                     { return false }
+	
+	modifiers := this.Window().Modifiers()
+	switch {
+	case key == input.KeyHome || (modifiers.Alt && key == input.KeyLeft):
+		return true
+	case key == input.KeyEnd || (modifiers.Alt && key == input.KeyRight):
+		return true
+	case key == input.KeyLeft:
+		return true
+	case key == input.KeyRight:
+		return true
+	case key == input.Key('a') && modifiers.Control:
+		return true
+	default:
+		return false
+	}
+}
+
 func (this *textBox) normalizedLayoutBoundsSpace () image.Rectangle {
 	bounds := this.drawer.LayoutBoundsSpace()
 	return bounds.Sub(bounds.Min)

internal/util/util.go

@@ -83,6 +83,7 @@ func NewMemo[T any] (update func () T) Memo[T] {
 func (this *Memo[T]) Value () T {
 	if !this.valid {
 		this.cache = this.update()
+		this.valid = true
 	}
 	return this.cache
 }