We load fonts but it's a bit broken

go.mod

@@ -8,9 +8,12 @@ require (
 	git.tebibyte.media/tomo/objects v0.20.1
 	git.tebibyte.media/tomo/tomo v0.41.1
 	git.tebibyte.media/tomo/xdg v0.1.0
+	github.com/flopp/go-findfont v0.1.0
 	golang.org/x/image v0.11.0
 )
 
+replace git.tebibyte.media/tomo/tomo => /home/sashakoshka/Repos/tebibyte/tomo/tomo
+
 require (
 	git.tebibyte.media/tomo/typeset v0.7.1 // indirect
 	git.tebibyte.media/tomo/xgbkb v1.0.1 // indirect
@@ -18,4 +21,5 @@ require (
 	github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 // indirect
 	github.com/jezek/xgb v1.1.1 // indirect
 	github.com/jezek/xgbutil v0.0.0-20231116234834-47f30c120111 // indirect
+	golang.org/x/text v0.12.0 // indirect
 )

go.sum

@@ -5,8 +5,6 @@ git.tebibyte.media/tomo/backend v0.5.1 h1:u3DLVcNWNdQsIxAEGcZ+kGG7zuew8tpPbyEFBx
 git.tebibyte.media/tomo/backend v0.5.1/go.mod h1:urnfu+D56Q9AOCZ/qp5YqkmlRRTIB5p9RbzBN7yIibQ=
 git.tebibyte.media/tomo/objects v0.20.1 h1:dCMMzaHmj7w016XtTb8QWvKMHVK2Fru/2a70NqApzHQ=
 git.tebibyte.media/tomo/objects v0.20.1/go.mod h1:hbBlQem9cNOt/G2rBvH/C94FT1oWgbtEftwg6ield9U=
-git.tebibyte.media/tomo/tomo v0.41.1 h1:XdbyF3VjsLj1Zppr70gUaufuh49hU32JQo2ENnw4PcA=
-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/xdg v0.1.0 h1:6G2WYPPiM2IXleCpKKHuJA34BxumwNWuLsUoX3yu5zA=
@@ -17,6 +15,8 @@ github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 h1:1qlsVAQJ
 github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298/go.mod h1:D+QujdIlUNfa0igpNMk6UIvlb6C252URs4yupRUV4lQ=
 github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 h1:lTG4HQym5oPKjL7nGs+csTgiDna685ZXjxijkne828g=
 github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966/go.mod h1:Mid70uvE93zn9wgF92A/r5ixgnvX8Lh68fxp9KQBaI0=
+github.com/flopp/go-findfont v0.1.0 h1:lPn0BymDUtJo+ZkV01VS3661HL6F4qFlkhcJN55u6mU=
+github.com/flopp/go-findfont v0.1.0/go.mod h1:wKKxRDjD024Rh7VMwoU90i6ikQRCr+JTHB5n4Ejkqvw=
 github.com/jezek/xgb v1.1.0/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
 github.com/jezek/xgb v1.1.1 h1:bE/r8ZZtSv7l9gk6nU0mYx51aXrvnyb44892TwSaqS4=
 github.com/jezek/xgb v1.1.1/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
@@ -50,6 +50,7 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

internal/style/aluminum.tss

@@ -0,0 +1,211 @@
+// Colors
+$ColorDot                   = #7391c0;
+$ColorAccent                = #5f8bc4;
+$ColorHighlight             = #5f8bc4;
+$ColorBackground            = #d4d4d4;
+$ColorForeground            = #000;
+$ColorOutline               = $ColorForeground;
+$ColorGutter                = #bfc6d1;
+$ColorGutterHovered         = #c5cbd6;
+$ColorRaised                = #e9eaea;
+$ColorRaisedPressed         = #ccd4dd;
+$ColorRaisedFocused         = #cfd6dd;
+$ColorRaisedHovered         = #f1f3f5;
+$ColorSunken                = #e9eaea;
+$ColorSunkenFocused         = #e0e6ee;
+$ColorSunkenPressed         = #e0e6ee;
+$ColorCalendarWeekdayHeader = #d3cac2;
+$ColorCalendarWeekend       = #c2d3c4;
+$ColorCalendarDay           = #d6dae2;
+
+// Borders
+$BorderOutline        = $ColorOutline                   / 1;
+$BorderEngraved       = #c3c3c5 #e3e3e3 #e9e9e9 #c2c2c2 / 1;
+$BorderGap            = #697c7c #566767 #566767 #697c7c / 1;
+$BorderLifted         = #f9fafc #c2c8d3 #a4afc0 #f5f6f8 / 1;
+$BorderLiftedFocused  = #f0f4f9 #b1baca #9aa6b7 #e4e9ee / 1;
+$BorderFocused        = #5f8bc4 #5f8bc4 #5f8bc4 #5f8bc4 / 1;
+$BorderTear           = $BorderEngraved;
+$BorderTearFocused    = #7f94b5 #ced7e4 #ced7e4 #7f94b5 / 1;
+$BorderTearPad        = #0000                           / 3;
+$BorderTearPadFocused = #7391c080                       / 3;
+$BorderInnerShadow    = #a4afc0                         / 1 0 0 1;
+$BorderOuterShadow    = #a4afc0                         / 0 1 1 0;
+
+*.* {
+	TextColor: $ColorForeground;
+	DotColor:  $ColorDot;
+	Gap:       8;
+	Face:      "DMMono-Regular.ttf" 11;
+}
+
+*.Button {
+	Border:  $BorderEngraved, $BorderGap, $BorderLifted;
+	Padding: 4 8;
+	Color:   $ColorRaised;
+}
+
+*.Button[focused] {
+	Border:  $BorderEngraved, $BorderGap, $BorderLiftedFocused;
+	Padding: 4 8;
+	Color:   $ColorRaisedFocused;
+}
+
+*.Button[hovered] {
+	Color: $ColorRaisedHovered;
+}
+
+*.Button[pressed] {
+	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Padding: 5 8 4 9;
+	Color:   $ColorRaisedPressed;
+}
+
+*.TextInput {
+	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Padding: 5 4 4 5;
+	Color:   $ColorSunken;
+}
+
+*.TextInput[focused] {
+	Border: $BorderEngraved, $BorderFocused, $BorderInnerShadow;
+}
+
+*.TextView {
+	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Padding: 5 4 4 5;
+	Color:   $ColorSunken;
+}
+
+*.NumberInput {
+	Gap: 0;
+}
+
+*.Container[sunken] {
+	Border:  $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Padding: 5 4 4 5;
+	Color:   $ColorSunken;
+}
+
+*.Container[outer] {
+	Color:   $ColorBackground;
+	Padding: 8;
+}
+
+*.Container[menu] {
+	Border: $BorderGap, $BorderLifted;
+	Color:  $ColorBackground;
+	Gap:    0;
+}
+
+*.Heading {
+	Align: middle middle;
+}
+
+*.Separator {
+	Border: $BorderEngraved;
+}
+
+*.Slider {
+	Border: $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Color:  $ColorGutter;
+}
+
+*.Slider[focused] {
+	Border: $BorderEngraved, $BorderFocused, $BorderInnerShadow;
+}
+
+*.Slider[hovered] {
+	Color: $ColorGutterHovered;
+}
+
+*.Slider[horizontal] {
+	MinimumSize: 48 0;
+}
+
+*.Slider[vertical] {
+	MinimumSize: 0 48;
+}
+
+*.SliderHandle {
+	Border:      $BorderOuterShadow, $BorderGap, $BorderLifted;
+	Color:       $ColorRaised;
+	MinimumSize: 12;
+}
+
+*.ScrollContainer {
+	Gap: 0;
+}
+
+*.Checkbox {
+	Border:      $BorderEngraved, $BorderGap, $BorderInnerShadow;
+	Color:       $ColorSunken;
+	Padding:     0 1 1 0;
+	MinimumSize: 19;
+}
+
+*.Checkbox[focused] {
+	Border:  $BorderEngraved, $BorderFocused, $BorderInnerShadow;
+	Color:   $ColorSunkenFocused;
+	Padding: 0;
+}
+
+*.MenuItem {
+	Padding: 4;
+	Gap:     4;
+	Color:   #0000;
+}
+
+*.MenuItem[hovered] {
+	Color: $ColorDot;
+}
+
+*.MenuItem[focused] {
+	Color: $ColorDot;
+}
+
+*.File {
+	Color: #0000;
+}
+
+*.File[focused] {
+	Color: $ColorDot;
+}
+
+*.TearLine {
+	Border: $BorderTearPad, $BorderTear;
+}
+
+*.TearLine[hovered] {
+	Border: $BorderTearPadFocused, $BorderTearFocused;
+}
+
+*.TearLine[focused] {
+	Border: $BorderTearPadFocused, $BorderTearFocused;
+}
+
+*.Calendar {
+	Border:  $BorderOuterShadow, $BorderGap;
+	Color:   $ColorRaised;
+	Padding: 2;
+	Gap:     2;
+}
+
+*.CalendarGrid {
+	Gap: 2 2;
+}
+
+*.CalendarWeekdayHeader {
+	Color:   $ColorCalendarWeekdayHeader;
+	Padding: 2;
+}
+
+*.CalendarDay {
+	Color:       $ColorCalendarDay;
+	Padding:     2;
+	MinimumSize: 32;
+}
+
+*.CalendarDay[weekend] {
+	Color: $ColorCalendarWeekend;
+}

internal/style/tss/build.go

@@ -1,20 +1,44 @@
 package tss
 
+import "os"
 import "fmt"
 import "image"
 import "errors"
 import "image/color"
+import "golang.org/x/image/font"
+import "github.com/flopp/go-findfont"
 import "git.tebibyte.media/tomo/tomo"
+import "golang.org/x/image/font/opentype"
 import "git.tebibyte.media/tomo/tomo/event"
 
+type styleBuilder struct {
+	sheet Sheet
+	fonts map[string]  *opentype.Font
+	faces map[faceKey] font.Face
+}
+
+type faceKey struct {
+	name string
+	size int
+}
+
 // BuildStyle builds a Tomo style from the specified sheet. Resources associated
 // with it (such as textures) can be freed by closing the returned cookie.
 func BuildStyle (sheet Sheet) (*tomo.Style, event.Cookie, error) {
-	err := sheet.Flatten()
+	builder := &styleBuilder {
+		sheet: sheet,
+		fonts: make(map[string] *opentype.Font),
+		faces: make(map[faceKey] font.Face),
+	}
+	return builder.build()
+}
+
+func (this *styleBuilder) build () (*tomo.Style, event.Cookie, error) {
+	err := this.sheet.Flatten()
 	if err != nil { return nil, nil, err }
 	
 	getColor := func (name string) color.Color {
-		if list, ok := sheet.Variables[name]; ok {
+		if list, ok := this.sheet.Variables[name]; ok {
 			if len(list) > 0 {
 				if col, ok := list[0].(ValueColor); ok {
 					return col				
@@ -26,7 +50,7 @@ func BuildStyle (sheet Sheet) (*tomo.Style, event.Cookie, error) {
 	
 	cookies := []event.Cookie { }
 	style := &tomo.Style {
-		Rules: make([]tomo.Rule, len(sheet.Rules)),
+		Rules: make([]tomo.Rule, len(this.sheet.Rules)),
 		Colors: map[tomo.Color] color.Color {
 			tomo.ColorBackground: getColor("ColorBackground"),
 			tomo.ColorForeground: getColor("ColorForeground"),
@@ -36,7 +60,7 @@ func BuildStyle (sheet Sheet) (*tomo.Style, event.Cookie, error) {
 		},
 	}
 	
-	for index, rule := range sheet.Rules {
+	for index, rule := range this.sheet.Rules {
 		styleRule := tomo.Rule {
 			Role: tomo.Role {
 				Package: rule.Selector.Package,
@@ -46,7 +70,7 @@ func BuildStyle (sheet Sheet) (*tomo.Style, event.Cookie, error) {
 			Set:  make(tomo.AttrSet),
 		}
 		for name, attr := range rule.Attrs {
-			styleAttr, cookie, err := buildAttr(name, attr)
+			styleAttr, cookie, err := this.buildAttr(name, attr)
 			if err != nil { return nil, nil, err }
 			styleRule.Set.Add(styleAttr)
 			if cookie != nil {
@@ -56,10 +80,16 @@ func BuildStyle (sheet Sheet) (*tomo.Style, event.Cookie, error) {
 		style.Rules[index] = styleRule
 	}
 
+	// TODO include all the faces in this.faces (ONCE EACH) in the
+	// multicookie
+	
 	return style, event.MultiCookie(cookies...), nil
 }
 
-func buildAttr (name string, attr []ValueList) (tomo.Attr, event.Cookie, error) {
+func (this *styleBuilder) buildAttr (name string, attr []ValueList) (tomo.Attr, event.Cookie, error) {
+	errWrongType := func () error {
+		return errors.New(fmt.Sprintf("wrong type for %s attribute", name))
+	}
 	expectSingle := func () error {
 		if len(attr) != 1 {
 			return errors.New(fmt.Sprintf (
@@ -81,9 +111,7 @@ func buildAttr (name string, attr []ValueList) (tomo.Attr, event.Cookie, error)
 	expectNumbers := func (list ValueList) error {
 		for _, value := range list {
 			if _, ok := value.(ValueNumber); ok { continue }
-			return errors.New(fmt.Sprintf (
+			return errWrongType()
-				"wrong type for %s attribute",
-				name))
 		}
 		return nil
 	}
@@ -94,9 +122,7 @@ func buildAttr (name string, attr []ValueList) (tomo.Attr, event.Cookie, error)
 				nums[index] = int(value)
 				continue
 			}
-			return nil, errors.New(fmt.Sprintf (
+			return nil, errWrongType()
-				"wrong type for %s attribute",
-				name))
 		}
 		return nums, nil
 	}
@@ -113,9 +139,7 @@ func buildAttr (name string, attr []ValueList) (tomo.Attr, event.Cookie, error)
 					continue
 				}
 			}
-			return nil, errors.New(fmt.Sprintf (
+			return nil, errWrongType()
-				"wrong type for %s attribute",
-				name))
 		}
 		return bools, nil
 	}
@@ -146,9 +170,7 @@ func buildAttr (name string, attr []ValueList) (tomo.Attr, event.Cookie, error)
 		if col, ok := attr[0][0].(ValueColor); ok {
 			return tomo.AColor(col), nil, nil
 		}
-		return nil, nil, errors.New(fmt.Sprintf (
+		return nil, nil, errWrongType()
-			"wrong type for %s attribute",
-			name))
 		
 	case "Texture":
 		// TODO load image from file
@@ -165,9 +187,7 @@ func buildAttr (name string, attr []ValueList) (tomo.Attr, event.Cookie, error)
 				"unknown texture mode: %s",
 				keyword))
 		}
-		return nil, nil, errors.New(fmt.Sprintf (
+		return nil, nil, errWrongType()
-			"wrong type for %s attribute",
-			name))
 	
 	case "Border":
 		attrBorder, err := buildAttrBorder(attr)
@@ -207,9 +227,7 @@ func buildAttr (name string, attr []ValueList) (tomo.Attr, event.Cookie, error)
 		if col, ok := attr[0][0].(ValueColor); ok {
 			return tomo.ATextColor(col), nil, nil
 		}
-		return nil, nil, errors.New(fmt.Sprintf (
+		return nil, nil, errWrongType()
-			"wrong type for %s attribute",
-			name))
 			
 	case "DotColor":
 		err := expectSingleSingle()
@@ -217,12 +235,24 @@ func buildAttr (name string, attr []ValueList) (tomo.Attr, event.Cookie, error)
 		if col, ok := attr[0][0].(ValueColor); ok {
 			return tomo.ADotColor(col), nil, nil
 		}
-		return nil, nil, errors.New(fmt.Sprintf (
+		return nil, nil, errWrongType()
-			"wrong type for %s attribute",
-			name))
 			
 	case "Face":
-		// TODO: load font from file with some parameters
+		err := expectSingle()
+		if err != nil { return nil, nil, err }
+		list := attr[0]
+		if len(list) != 2 {
+			return nil, nil, errors.New(fmt.Sprintf (
+				"%s attribute requires exactly two values",
+				name))
+		}
+		name, ok := list[0].(ValueString)
+		if !ok { return nil, nil, errWrongType() }
+		size, ok := list[1].(ValueNumber)
+		if !ok { return nil, nil, errWrongType() }
+		face, err := this.face(string(name), int(size))
+		if err != nil { return nil, nil, err }
+		return tomo.AFace(face), nil, nil
 		
 	case "Wrap":
 		err := expectSingleSingle()
@@ -233,9 +263,7 @@ func buildAttr (name string, attr []ValueList) (tomo.Attr, event.Cookie, error)
 			case "false": return tomo.AWrap(false), nil, nil
 			}
 		}
-		return nil, nil, errors.New(fmt.Sprintf (
+		return nil, nil, errWrongType()
-			"wrong type for %s attribute",
-			name))
 		
 	case "Align":
 		err := expectSingle()
@@ -250,18 +278,16 @@ func buildAttr (name string, attr []ValueList) (tomo.Attr, event.Cookie, error)
 		for index, value := range list {
 			if keyword, ok := value.(ValueKeyword); ok {
 				switch keyword {
-				case "start":  aligns[index] = tomo.AlignStart
+				case "start":  aligns[index] = tomo.AlignStart;  continue
-				case "middle": aligns[index] = tomo.AlignMiddle
+				case "middle": aligns[index] = tomo.AlignMiddle; continue
-				case "end":    aligns[index] = tomo.AlignEnd
+				case "end":    aligns[index] = tomo.AlignEnd;    continue
-				case "even":   aligns[index] = tomo.AlignEven
+				case "even":   aligns[index] = tomo.AlignEven;   continue
 				default: return nil, nil, errors.New(fmt.Sprintf (
 					"unknown texture mode: %s",
 					keyword))					
 				}
 			}
-			return nil, nil, errors.New(fmt.Sprintf (
+			return nil, nil, errWrongType()
-				"wrong type for %s attribute",
-				name))
 		}
 		return tomo.AAlign(aligns[0], aligns[1]), nil, nil
 		
@@ -285,6 +311,36 @@ func buildAttr (name string, attr []ValueList) (tomo.Attr, event.Cookie, error)
 	return nil, nil, errors.New(fmt.Sprintf("unimplemented attribute name %s", name))
 }
 
+func (this *styleBuilder) face (name string, size int) (font.Face, error) {
+	key := faceKey { name: name, size: size }
+	face, ok := this.faces[key]
+	if ok { return face, nil }
+
+	font, ok := this.fonts[name]
+	if !ok {
+		path, err := findfont.Find(name)
+		if err != nil { return nil, err }		
+		file, err := os.Open(path)
+		if err != nil { return nil, err }
+		defer file.Close()
+		fnt, err := opentype.ParseReaderAt(file)
+		if err != nil {
+			return nil, errors.New(fmt.Sprintf (
+				"could not load font %s: %v", path, err))
+		}
+		font = fnt
+		this.fonts[name] = font
+	}
+
+	face, err := opentype.NewFace(font, &opentype.FaceOptions {
+		Size: float64(size),
+		DPI:  96, // TODO: replace this with the actual DPI
+	})
+	if err != nil { return nil, err }
+	this.faces[key] = face
+	return face, nil
+}
+
 func buildAttrBorder (attr []ValueList) (tomo.Attr, error) {
 	borders := make([]tomo.Border, len(attr))
 	for index, list := range attr {
@@ -349,3 +405,4 @@ func copyBorderValue[T any, U ~[]T] (destination, source U) bool {
 		return false
 	}
 }
+

internal/style/tss/parse.go

@@ -135,13 +135,15 @@ func (this *parser) parseSelector () (Selector, error) {
 	if err == nil {
 		this.Next()
 		for {
-			err := this.Expect(Ident, String, RBrace)
+			err := this.Expect(Ident, String, RBracket)
 			if err != nil { return Selector { }, err }
-			if this.Is(RBrace) { break }
+			if this.Is(RBracket) { break       }
+			if this.Is(Comma)    { this.Next() }
 			selector.Tags = append(selector.Tags, this.Value())
 			err = this.ExpectNext(Comma, RBracket)
 			if err != nil { return Selector { }, err }
 		}
+		this.Next()
 	}
 	
 	return selector, nil
@@ -163,7 +165,8 @@ func (this *parser) parseAttr () (string, []ValueList, error) {
 			Number, Color, String, Ident, Dollar, Slash,
 			Comma, Semicolon)
 		if err != nil { return "", nil, err }
-		if this.Is(Semicolon) { break }
+		if this.Is(Semicolon) { break       }
+		if this.Is(Comma)     { this.Next() }
 		valueList, err := this.parseValueList()
 		if err != nil { return "", nil, err }
 		attr = append(attr, valueList)