Update registrar code

go.mod

@@ -3,7 +3,7 @@ module git.tebibyte.media/tomo/nasin
 go 1.20
 
 require (
-	git.tebibyte.media/tomo/backend v0.4.1
+	git.tebibyte.media/tomo/backend v0.5.0
 	git.tebibyte.media/tomo/objects v0.20.0
 	git.tebibyte.media/tomo/tomo v0.41.0
 	git.tebibyte.media/tomo/xdg v0.1.0

go.sum

@@ -1,6 +1,6 @@
 git.tebibyte.media/sashakoshka/xgbkb v1.0.0/go.mod h1:pNcE6TRO93vHd6q42SdwLSTTj25L0Yzggz7yLe0JV6Q=
-git.tebibyte.media/tomo/backend v0.4.1 h1:rpkyTAfp/PE56aSqKNxtSN+D/aBSW8wjJ/vTtSgqQhE=
+git.tebibyte.media/tomo/backend v0.5.0 h1:Byrz1yjhYKnMXljIHgEdwW5/41gWtRm3xHYZ18lBUbg=
-git.tebibyte.media/tomo/backend v0.4.1/go.mod h1:2G04zmKbzf5fA/xzsjoQRrN55BWZkB+vknFxd3ialZ0=
+git.tebibyte.media/tomo/backend v0.5.0/go.mod h1:1Ne0h4nsRYy8GudBia7um+qaqzME0wDrOAjpHvySqRA=
 git.tebibyte.media/tomo/objects v0.20.0 h1:HK6aWxBfRe0sgqvfIZnvfW0c8jSYP7F5Od/rWvi5DAM=
 git.tebibyte.media/tomo/objects v0.20.0/go.mod h1:DNTKSU9u126XF4usZG0ax9b20So4UpBZ+wAwRiA7XOQ=
 git.tebibyte.media/tomo/tomo v0.41.0 h1:Z+7FHhbGiKjs+kQNvuJOfz47xIct5qxvSJqyDuoNIOs=

internal/registrar/registrar_unix.go

@@ -5,11 +5,10 @@ import "os"
 import "log"
 import "git.tebibyte.media/tomo/tomo"
 import "git.tebibyte.media/tomo/backend/x"
-import "git.tebibyte.media/tomo/nasin/internal/style"
 import "git.tebibyte.media/tomo/nasin/internal/icons/xdg"
 import "git.tebibyte.media/tomo/nasin/internal/icons/fallback"
 import "git.tebibyte.media/tomo/nasin/internal/style/fallback"
-import "git.tebibyte.media/tomo/nasin/internal/style/aluminum"
+// import "git.tebibyte.media/tomo/nasin/internal/style/aluminum"
 
 func RegisterBackend () error {
 	tomo.Register(1, x.New)
@@ -17,14 +16,15 @@ func RegisterBackend () error {
 }
 
 func SetTheme () error {
-	var styl *style.Style
+	var styl *tomo.Style
 	// TODO eventually get rid of this when we make a file format for
 	// storing visual styles
-	if os.Getenv("TOMO_USE_ALUMINUM_STYLE") != "" {
+	// TODO migrate aluminum
-		styl = aluminumStyle.New()
+	// if os.Getenv("TOMO_USE_ALUMINUM_STYLE") != "" {
-	} else {
+		// styl = aluminumStyle.New()
+	// } else {
 		styl = fallbackStyle.New()
-	}
+	// }
 	icons := fallbackIcons.New()
 	
 	iconThemeName := os.Getenv("TOMO_XDG_ICON_THEME")
@@ -38,6 +38,6 @@ func SetTheme () error {
 	}
 	
 	tomo.SetStyle(styl)
-	tomo.SetIcons(icons)
+	tomo.SetIconSet(icons)
 	return nil	
 }

internal/style/aluminum/aluminum.go

@@ -2,7 +2,6 @@ package aluminumStyle
 
 import "image/color"
 import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/nasin/internal/style"
 
 // New returns Aluminum, a futuristic, bluish-white style.
 func New () *style.Style {

internal/style/aluminum/style.go

@@ -3,7 +3,6 @@ package aluminumStyle
 import "image/color"
 import "git.tebibyte.media/tomo/tomo"
 import "golang.org/x/image/font/basicfont"
-import "git.tebibyte.media/tomo/nasin/internal/style"
 
 func hex (color uint32) (c color.RGBA) {
 	c.A = uint8(color)

internal/style/fallback/style.go

@@ -3,7 +3,6 @@ package fallbackStyle
 import "image/color"
 import "git.tebibyte.media/tomo/tomo"
 import "golang.org/x/image/font/basicfont"
-import "git.tebibyte.media/tomo/nasin/internal/style"
 
 var colorFocus                 = color.RGBA { R:  61, G: 128, B: 143, A: 255 }
 var colorInput                 = color.RGBA { R: 208, G: 203, B: 150, A: 255 }
@@ -39,520 +38,456 @@ var borderColorInput    = [4]color.Color { colorInputShadow, colorInput,     col
 var borderColorFocused  = [4]color.Color { colorFocus,       colorFocus,     colorFocus,     colorFocus       }
 var borderColorShade    = [4]color.Color { colorShade,       colorShade,     colorShade,     colorShade       }
 
-var rules = []style.Rule {
+var rules = []tomo.Rule {
-	// *.*[*]
+	// *.*
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Default: style.AS (
+		tomo.AFace      (basicfont.Face7x13  ),
-			style.AttrFace      { Face:  basicfont.Face7x13    },
+		tomo.ATextColor (tomo.ColorForeground),
-			style.AttrTextColor { Color: tomo.ColorForeground  },
+		tomo.ADotColor  (tomo.ColorAccent    ),
-			style.AttrDotColor  { Color: tomo.ColorAccent      },
+		tomo.AGap       (8, 8                ),
-			style.AttrGap       { X: 8, Y: 8                   },
+	), tomo.R("", "")),
-		),
-	},
 
-	// *.Button[*]
+	// *.Button
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Button", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			outline,
-			style.AttrBorder {
+			tomo.Border {
-				outline,
+				Width: tomo.I(1),
-				tomo.Border {
+				Color: borderColorLifted,
-					Width: tomo.I(1),
-					Color: borderColorLifted,
-				},
 			},
-			style.AttrPadding(tomo.I(4, 8)),
+		},
-			style.AttrColor { Color: tomo.ColorRaised },
+		tomo.AttrPadding(tomo.I(4, 8)),
-		),
+		tomo.AttrColor { Color: tomo.ColorRaised },
-		Pressed: style.AS (
+	), tomo.R("", "Button")),
-			style.AttrBorder {
-				outline,
-				tomo.Border {
-					Width: tomo.I(1, 0, 0, 1),
-					Color: borderColorEngraved,
-				},
-			},
-			style.AttrPadding(tomo.I(5, 8, 4, 9)),
-			style.AttrColor { Color: colorCarvedPressed },
-		),
-		Focused: style.AS (
-			style.AttrBorder {
-				outline,
-				tomo.Border {
-					Width: tomo.I(1),
-					Color: borderColorFocused,
-				},
-			},
-			style.AttrPadding(tomo.I(4, 8)),
-		),
-	},
 
-	// *.TextInput[*]
+	// *.Button[focused]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "TextInput", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			outline,
-			style.AttrBorder {
+			tomo.Border {
-				outline,
+				Width: tomo.I(1),
-				tomo.Border {
+				Color: borderColorFocused,
-					Width: tomo.I(1),
-					Color: borderColorInput,
-				},
 			},
-			style.AttrColor { Color: colorInput },
+		},
-			style.AttrPadding(tomo.I(5, 4, 4, 5)),
+		tomo.AttrPadding(tomo.I(4, 8)),
-		),
+	), tomo.R("", "Button"), "focused"),
-		Focused: style.AS (
-			style.AttrBorder {
-				outline,
-				tomo.Border {
-					Width: tomo.I(1),
-					Color: borderColorFocused,
-				},
-			},
-		),
-	},
 	
-	// *.TextView[*]
+	// *.Button[pressed]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "TextView", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			outline,
-			style.AttrBorder {
+			tomo.Border {
-				outline,
+				Width: tomo.I(1, 0, 0, 1),
-				tomo.Border {
+				Color: borderColorEngraved,
-					Width: tomo.I(1, 0, 0, 1),
-					Color: borderColorEngraved,
-				},
 			},
-			style.AttrColor { Color: tomo.ColorSunken },
+		},
-			style.AttrPadding(tomo.I(8)),
+		tomo.AttrPadding(tomo.I(5, 8, 4, 9)),
-		),
+		tomo.AttrColor { Color: colorCarvedPressed },
-	},
+	), tomo.R("", "Button"), "pressed"),
 
-	// *.NumberInput[*]
+	// *.TextInput
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "NumberInput", ""),
+		tomo.ABorder (
-		Default: style.AS (
+			outline,
-			style.AttrGap { },
+			tomo.Border {
-		),
+				Width: tomo.I(1),
-	},
+				Color: borderColorInput,
+			}),
+		tomo.AColor(colorInput),
+		tomo.APadding(5, 4, 4, 5),
+	), tomo.R("", "TextInput")),
+
+	// *.TextInput[focused]
+	tomo.Ru(tomo.AS (
+		tomo.ABorder (
+			outline,
+			tomo.Border {
+				Width: tomo.I(1),
+				Color: borderColorFocused,
+			}),
+	), tomo.R("", "TextInput"), "focused"),
+	
+	// *.TextView
+	tomo.Ru(tomo.AS (
+		tomo.ABorder (
+			outline,
+			tomo.Border {
+				Width: tomo.I(1, 0, 0, 1),
+				Color: borderColorEngraved,
+			}),
+		tomo.AColor(tomo.ColorSunken),
+		tomo.APadding(8),
+	), tomo.R("", "TextView")),
+	
+	// *.NumberInput
+	tomo.Ru(tomo.AS (
+		tomo.AGap(0, 0),
+	), tomo.R("", "NumberInput")),
 
 	// *.Container[sunken]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Container", "sunken"),
+		tomo.AttrBorder {
-		Default: style.AS (
+			outline,
-			style.AttrBorder {
+			tomo.Border {
-				outline,
+				Width: tomo.I(1, 0, 0, 1),
-				tomo.Border {
+				Color: borderColorEngraved,
-					Width: tomo.I(1, 0, 0, 1),
-					Color: borderColorEngraved,
-				},
 			},
-			style.AttrColor { Color: tomo.ColorSunken },
+		},
-			style.AttrPadding(tomo.I(8)),
+		tomo.AttrColor { Color: tomo.ColorSunken },
-		),
+		tomo.AttrPadding(tomo.I(8)),
-	},
+	), tomo.R("", "Container"), "sunken"),
 
 	// *.Container[outer]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Container", "outer"),
+		tomo.AttrColor { Color: tomo.ColorBackground },
-		Default: style.AS (
+		tomo.AttrPadding(tomo.I(8)),
-			style.AttrColor { Color: tomo.ColorBackground },
+	), tomo.R("", "Container"), "outer"),
-			style.AttrPadding(tomo.I(8)),
-		),
-	},
 
 	// *.Container[menu]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Container", "menu"),
+		tomo.AttrBorder {
-		Default: style.AS (
+			outline,
-			style.AttrBorder {
+			tomo.Border {
-				outline,
+				Width: tomo.I(1),
-				tomo.Border {
+				Color: borderColorLifted,
-					Width: tomo.I(1),
-					Color: borderColorLifted,
-				},
 			},
-			style.AttrColor { Color: tomo.ColorBackground },
+		},
-			style.AttrGap { },
+		tomo.AttrColor { Color: tomo.ColorBackground },
-		),
+		tomo.AttrGap { },
-	},
+	), tomo.R("", "Container"), "menu"),
 
-	// *.Heading[*]
+	// *.Heading
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Heading", ""),
+		tomo.AAlign(tomo.AlignMiddle, tomo.AlignMiddle),
-		Default: style.AS (
+	), tomo.R("", "Heading")),
-			style.AttrAlign { X: tomo.AlignMiddle, Y: tomo.AlignMiddle },
-		),
-	},
 
-	// *.Separator[*]
+	// *.Separator
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Separator", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			tomo.Border {
-			style.AttrBorder {
+				Width: tomo.I(1),
-				tomo.Border {
+				Color: borderColorEngraved,
-					Width: tomo.I(1),
-					Color: borderColorEngraved,
-				},
 			},
-		),
+		},
-	},
+	), tomo.R("", "Separator")),
 
-	// *.Slider[*]
+	// *.Slider
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Slider", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			outline,
-			style.AttrBorder {
+			tomo.Border {
-				outline,
+				Width: tomo.I(1, 0, 0, 1),
-				tomo.Border {
+				Color: borderColorEngraved,
-					Width: tomo.I(1, 0, 0, 1),
-					Color: borderColorEngraved,
-				},
 			},
-			style.AttrColor { Color: colorGutter },
+		},
-			style.AttrPadding(tomo.I(0, 1, 1, 0)),
+		tomo.AttrColor { Color: colorGutter },
-		),
+		tomo.AttrPadding(tomo.I(0, 1, 1, 0)),
-		Focused: style.AS (
+	), tomo.R("", "Slider")),
-			style.AttrBorder {
+	
+	// *.Slider[focused]
+	tomo.Ru(tomo.AS (
+			tomo.AttrBorder {
 				outline,
 				tomo.Border {
 					Width: tomo.I(1),
 					Color: borderColorFocused,
 				},
 			},
-			style.AttrPadding(tomo.I(0)),
+			tomo.AttrPadding(tomo.I(0)),
-		),
+	), tomo.R("", "Slider"), "focused"),
-	},
 	
 	// *.Slider[horizontal]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Slider", "horizontal"),
+		tomo.AMinimumSize(48, 0),
-		Default: style.AS(style.AttrMinimumSize { X: 48 }),
+	), tomo.R("", "Slider"), "horizontal"),
-	},
 	
 	// *.Slider[vertical]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Slider", "vertical"),
+		tomo.AMinimumSize(0, 48),
-		Default: style.AS(style.AttrMinimumSize { Y: 48 }),
+	), tomo.R("", "Slider"), "vertical"),
-	},
 
-	// *.SliderHandle[*]
+	// *.SliderHandle
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "SliderHandle", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			outline,
-			style.AttrBorder {
+			tomo.Border {
-				outline,
+				Width: tomo.I(1),
-				tomo.Border {
+				Color: borderColorLifted,
-					Width: tomo.I(1),
+			},
-					Color: borderColorLifted,
+		},
+		tomo.AttrColor { Color: tomo.ColorRaised },
+		tomo.AttrMinimumSize { X: 12, Y: 12, },
+	), tomo.R("", "SliderHandle")),
+
+	// *.Checkbox
+	tomo.Ru(tomo.AS (
+		tomo.ABorder (
+			outline,
+			tomo.Border {
+				Width: tomo.I(1, 0, 0, 1),
+				Color: borderColorEngraved,
+			}),
+		tomo.AColor(tomo.ColorSunken),
+		tomo.APadding(0, 1, 1, 0),
+		tomo.AMinimumSize(19, 19),
+		tomo.ATexture(nil),
+		tomo.ATextureMode(tomo.TextureModeCenter),
+	), tomo.R("", "Checkbox")),
+
+	// *.Checkbox[focused]
+	tomo.Ru(tomo.AS (
+		tomo.ABorder (
+			outline,
+			tomo.Border {
+				Width: tomo.I(1),
+				Color: borderColorFocused,
+			}),
+		tomo.APadding(0),
+	), tomo.R("", "Checkbox"), "focused"),
+
+	// *.Checkbox[checked]
+	tomo.Ru(tomo.AS (
+		tomo.ATexture(nil), // TODO: checked texture
+	), tomo.R("", "Checkbox"), "checked"),
+
+	// *.MenuItem
+	tomo.Ru(tomo.AS (
+		tomo.AttrPadding(tomo.I(4)),
+		tomo.AttrGap { X: 4, Y: 4 },
+		tomo.AttrColor { Color: color.Transparent },
+	), tomo.R("", "MenuItem")),
+
+	// *MenuItem[focused]
+	tomo.Ru(tomo.AS (
+		tomo.AttrColor { Color: tomo.ColorAccent },
+	), tomo.R("", "MenuItem"), "focused"),
+	
+	// *.MenuItem[hovered]
+	tomo.Ru(tomo.AS (
+		tomo.AttrColor { Color: tomo.ColorAccent },
+	), tomo.R("", "MenuItem"), "hovered"),
+
+	// *.File
+	tomo.Ru(tomo.AS (
+		tomo.AttrColor { Color: color.Transparent },
+	), tomo.R("", "File")),
+
+	// *.File[focused]
+	tomo.Ru(tomo.AS (
+		tomo.AttrColor { Color: tomo.ColorAccent },
+	), tomo.R("", "File"), "focused"),
+
+	// *.TearLine
+	tomo.Ru(tomo.AS (
+		tomo.AttrBorder {
+			tomo.Border {
+				Width: tomo.I(3),
+				Color: [4]color.Color {
+					color.Transparent,
+					color.Transparent,
+					color.Transparent,
+					color.Transparent,
 				},
 			},
-			style.AttrColor { Color: tomo.ColorRaised },
+		},
-			style.AttrMinimumSize { X: 12, Y: 12, },
+		tomo.AttrColor { Color: tomo.ColorForeground },
-		),
+		tomo.AttrPadding(tomo.I(1, 0, 0, 1)),
-	},
+	), tomo.R("", "TearLine")),
 
-	// *.Checkbox[*]
+	// *.TearLine[focused]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Checkbox", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			tomo.Border {
-			style.AttrBorder {
+				Width: tomo.I(3),
-				outline,
+				Color: borderColorFocused,
-				tomo.Border {
-					Width: tomo.I(1, 0, 0, 1),
-					Color: borderColorEngraved,
-				},
 			},
-			style.AttrColor { Color: tomo.ColorSunken },
+		},
-			style.AttrPadding(tomo.I(0, 1, 1, 0)),
+	), tomo.R("", "TearLine"), "focused"),
-			style.AttrMinimumSize { X: 19, Y: 19 },
+
-		),
+	// *.TearLine[hovered]
-		Focused: style.AS (
+	tomo.Ru(tomo.AS (
-			style.AttrBorder {
+		tomo.AttrBorder {
-				outline,
+			tomo.Border {
-				tomo.Border {
+				Width: tomo.I(3),
-					Width: tomo.I(1),
+				Color: borderColorFocused,
-					Color: borderColorFocused,
-				},
 			},
-			style.AttrPadding(tomo.I(0)),
+		},
-		),
+	), tomo.R("", "TearLine"), "hovered"),
-	},
 	
-	// *.MenuItem[*]
+	// *.Calendar
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "MenuItem", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			tomo.Border {
-			style.AttrPadding(tomo.I(4)),
+				Width: tomo.I(0, 1, 1, 0),
-			style.AttrGap { X: 4, Y: 4 },
+				Color: borderColorShade,
-			style.AttrColor { Color: color.Transparent },
-		),
-		Hovered: style.AS (
-			style.AttrColor { Color: tomo.ColorAccent },
-		),
-		Focused: style.AS (
-			style.AttrColor { Color: tomo.ColorAccent },
-		),
-	},
-
-	// *.File[*]
-	style.Rule {
-		Role: tomo.R("", "File", ""),
-		Default: style.AS (
-			style.AttrColor { Color: color.Transparent },
-		),
-		Focused: style.AS (
-			style.AttrColor { Color: tomo.ColorAccent },
-		),
-	},
-
-	// *.TearLine[*]
-	style.Rule {
-		Role: tomo.R("", "TearLine", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				tomo.Border {
-					Width: tomo.I(3),
-					Color: [4]color.Color {
-						color.Transparent,
-						color.Transparent,
-						color.Transparent,
-						color.Transparent,
-					},
-				},
 			},
-			style.AttrColor { Color: tomo.ColorForeground },
+			outline,
-			style.AttrPadding(tomo.I(1, 0, 0, 1)),
+		},
-		),
+		tomo.AttrColor { Color: colorInput },
-		Hovered: style.AS (
+		tomo.AttrPadding(tomo.I(2)),
-			style.AttrBorder {
+		tomo.AttrGap { X: 2, Y: 2 },
-				tomo.Border {
+	), tomo.R("", "Calendar")),
-					Width: tomo.I(3),
-					Color: borderColorFocused,
-				},
-			},
-		),
-		Focused: style.AS (
-			style.AttrBorder {
-				tomo.Border {
-					Width: tomo.I(3),
-					Color: borderColorFocused,
-				},
-			},
-		),
-	},
 	
-	// *.Calendar[*]
+	// *.CalendarGrid
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Calendar", ""),
+		tomo.AttrGap { X: 2, Y: 2 },
-		Default: style.AS (
+	), tomo.R("", "CalendarGrid")),
-			style.AttrBorder {
-				tomo.Border {
-					Width: tomo.I(0, 1, 1, 0),
-					Color: borderColorShade,
-				},
-				outline,
-			},
-			style.AttrColor { Color: colorInput },
-			style.AttrPadding(tomo.I(2)),
-			style.AttrGap { X: 2, Y: 2 },
-		),
-	},
 	
-	// *.CalendarGrid[*]
+	// *.CalendarWeekdayHeader
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "CalendarGrid", ""),
+		tomo.AttrPadding(tomo.I(2)),
-		Default: style.AS (
+		tomo.AttrColor { Color: colorCalendarWeekdayHeader },
-			style.AttrGap { X: 2, Y: 2 },
+	), tomo.R("", "CalendarWeekdayHeader")),
-		),
-	},
-	
-	// *.CalendarWeekdayHeader[*]
-	style.Rule {
-		Role: tomo.R("", "CalendarWeekdayHeader", ""),
-		Default: style.AS (
-			style.AttrPadding(tomo.I(2)),
-			style.AttrColor { Color: colorCalendarWeekdayHeader },
-		),
-	},
 	
 	// *.CalendarDay[weekday]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "CalendarDay", "weekday"),
+		tomo.AttrPadding(tomo.I(2)),
-		Default: style.AS (
+		tomo.AttrMinimumSize { X: 32, Y: 32 },
-			style.AttrPadding(tomo.I(2)),
+		tomo.AttrColor { Color: colorCalendarDay },
-			style.AttrMinimumSize { X: 32, Y: 32 },
+	), tomo.R("", "CalendarDay"), "weekday"),
-			style.AttrColor { Color: colorCalendarDay },
-		),
-	},
 
 	// *.CalendarDay[weekend]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "CalendarDay", "weekend"),
+		tomo.AttrPadding(tomo.I(2)),
-		Default: style.AS (
+		tomo.AttrMinimumSize { X: 32, Y: 32 },
-			style.AttrPadding(tomo.I(2)),
+		tomo.AttrColor { Color: colorCalendarWeekend },
-			style.AttrMinimumSize { X: 32, Y: 32 },
+	), tomo.R("", "CalendarDay"), "weekend"),
-			style.AttrColor { Color: colorCalendarWeekend },
-		),
-	},
 	
-	// *.TabbedContainer[*]
+	// *.TabbedContainer
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "TabbedContainer", ""),
+		tomo.AGap(0, 0),
-		Default: style.AS (
+	), tomo.R("", "TabbedContainer")),
-			style.AttrGap { },
-		),
-	},
 	
-	// *.TabRow[*]
+	// *.TabRow
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "TabRow", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			tomo.Border {
-			style.AttrBorder {
+				Width: tomo.I(1, 1, 0, 1),
-				tomo.Border {
+				Color: borderColorOutline,
-					Width: tomo.I(1, 1, 0, 1),
-					Color: borderColorOutline,
-				},
-				tomo.Border {
-					Width: tomo.I(1, 0, 0, 1),
-					Color: borderColorEngraved,
-				},
 			},
-			style.AttrGap { X: 0, Y: 0 },
+			tomo.Border {
-			style.AttrColor { Color: colorGutter },
+				Width: tomo.I(1, 0, 0, 1),
-			style.AttrPadding(tomo.I(1, 0, 0, 0)),
+				Color: borderColorEngraved,
-		),
+			},
-	},
+		},
+		tomo.AttrGap { X: 0, Y: 0 },
+		tomo.AttrColor { Color: colorGutter },
+		tomo.AttrPadding(tomo.I(1, 0, 0, 0)),
+	), tomo.R("", "TabRow")),
 	
 	// *.TabSpacer[left]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "TabSpacer", "left"),
+		tomo.AttrBorder {
-		Default: style.AS (
+			tomo.Border {
-			style.AttrBorder {
+				Width: tomo.I(0, 0, 1, 0),
-				tomo.Border {
+				Color: borderColorEngraved,
-					Width: tomo.I(0, 0, 1, 0),
-					Color: borderColorEngraved,
-				},
-				tomo.Border {
-					Width: tomo.I(0, 0, 1, 0),
-					Color: borderColorOutline,
-				},
 			},
-			style.AttrMinimumSize { X: 1 },
+			tomo.Border {
-		),
+				Width: tomo.I(0, 0, 1, 0),
-	},
+				Color: borderColorOutline,
+			},
+		},
+		tomo.AttrMinimumSize { X: 1 },
+	), tomo.R("", "TabSpacer")),
 	
 	// *.TabSpacer[right]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "TabSpacer", "right"),
+		tomo.AttrBorder {
-		Default: style.AS (
+			tomo.Border {
-			style.AttrBorder {
+				Width: tomo.I(1, 0, 0, 0),
-				tomo.Border {
+				Color: [4]color.Color {
-					Width: tomo.I(1, 0, 0, 0),
+					colorGutter, colorGutter,
-					Color: [4]color.Color {
+					colorGutter, colorGutter,
-						colorGutter, colorGutter,
-						colorGutter, colorGutter,
-					},
-				},
-				tomo.Border {
-					Width: tomo.I(0, 0, 1, 0),
-					Color: borderColorEngraved,
-				},
-				tomo.Border {
-					Width: tomo.I(0, 0, 1, 1),
-					Color: borderColorOutline,
-				},
-				tomo.Border {
-					Width: tomo.I(0, 0, 0, 1),
-					Color: borderColorShade,
 				},
 			},
-			style.AttrMinimumSize { X: 3 },
+			tomo.Border {
-		),
+				Width: tomo.I(0, 0, 1, 0),
-	},
+				Color: borderColorEngraved,
+			},
+			tomo.Border {
+				Width: tomo.I(0, 0, 1, 1),
+				Color: borderColorOutline,
+			},
+			tomo.Border {
+				Width: tomo.I(0, 0, 0, 1),
+				Color: borderColorShade,
+			},
+		},
+		tomo.AttrMinimumSize { X: 3 },
+	), tomo.R("", "TabSpacer"), "right"),
 	
-	// *.Tab[*]
+	// *.Tab
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Tab", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			tomo.Border {
-			style.AttrBorder {
+				Width: tomo.I(1, 0, 0, 0),
-				tomo.Border {
+				Color: [4]color.Color {
-					Width: tomo.I(1, 0, 0, 0),
+					colorGutter, colorGutter,
-					Color: [4]color.Color {
+					colorGutter, colorGutter,
-						colorGutter, colorGutter,
-						colorGutter, colorGutter,
-					},
-				},
-				tomo.Border {
-					Width: tomo.I(0, 0, 1, 0),
-					Color: borderColorEngraved,
-				},
-				tomo.Border {
-					Width: tomo.I(1, 0, 1, 1),
-					Color: borderColorOutline,
-				},
-				tomo.Border {
-					Width: tomo.I(1, 1, 0, 1),
-					Color: borderColorLifted,
 				},
 			},
-			style.AttrPadding(tomo.I(4, 8, 4, 8)),
+			tomo.Border {
-			style.AttrColor { Color: tomo.ColorRaised },
+				Width: tomo.I(0, 0, 1, 0),
-		),
+				Color: borderColorEngraved,
-	},
+			},
+			tomo.Border {
+				Width: tomo.I(1, 0, 1, 1),
+				Color: borderColorOutline,
+			},
+			tomo.Border {
+				Width: tomo.I(1, 1, 0, 1),
+				Color: borderColorLifted,
+			},
+		},
+		tomo.AttrPadding(tomo.I(4, 8, 4, 8)),
+		tomo.AttrColor { Color: tomo.ColorRaised },
+	), tomo.R("", "Tab")),
 	
 	// *.Tab[active]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Tab", "active"),
+		tomo.AttrBorder {
-		Default: style.AS (
+			tomo.Border {
-			style.AttrBorder {
+				Width: tomo.I(1, 0, 0, 1),
-				tomo.Border {
+				Color: borderColorOutline,
-					Width: tomo.I(1, 0, 0, 1),
-					Color: borderColorOutline,
-				},
-				tomo.Border {
-					Width: tomo.I(1, 1, 0, 1),
-					Color: borderColorLifted,
-				},
 			},
-			style.AttrPadding(tomo.I(4, 8, 4, 8)),
+			tomo.Border {
-			style.AttrColor { Color: tomo.ColorBackground },
+				Width: tomo.I(1, 1, 0, 1),
-		),
+				Color: borderColorLifted,
-	},
+			},
+		},
+		tomo.AttrPadding(tomo.I(4, 8, 4, 8)),
+		tomo.AttrColor { Color: tomo.ColorBackground },
+	), tomo.R("", "Tab"), "active"),
 
-	// *.Swatch[*]
+	// *.Swatch
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Swatch", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			outline,
-			style.AttrBorder {
+		},
-				outline,
+		tomo.AttrMinimumSize { X: 19, Y: 19 },
-			},
+	), tomo.R("", "Swatch")),
-			style.AttrMinimumSize { X: 19, Y: 19 },
-		),
-		Focused: style.AS (
-			style.AttrBorder {
-				outline,
-				tomo.Border {
-					Width: tomo.I(1),
-					Color: borderColorFocused,
-				},
-			},
-		),
-	},
 
-	// *.ColorPickerMap[*]
+	// *.Swatch[focused]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "ColorPickerMap", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			outline,
-			style.AttrBorder {
+			tomo.Border {
-				outline,
+				Width: tomo.I(1),
-				tomo.Border {
+				Color: borderColorFocused,
-					Width: tomo.I(1, 0, 0, 1),
-					Color: borderColorEngraved,
-				},
 			},
-			style.AttrColor { Color: tomo.ColorSunken },
+		},
-			style.AttrMinimumSize { X: 128, Y: 128 },
+	), tomo.R("", "Swatch"), "focused"),
-		),
+
-	},
+	// *.ColorPickerMap
+	tomo.Ru(tomo.AS (
+		tomo.AttrBorder {
+			outline,
+			tomo.Border {
+				Width: tomo.I(1, 0, 0, 1),
+				Color: borderColorEngraved,
+			},
+		},
+		tomo.AttrColor { Color: tomo.ColorSunken },
+		tomo.AttrMinimumSize { X: 128, Y: 128 },
+	), tomo.R("", "ColorPickerMap")),
 }

internal/style/fallback/wintergreen.go

@@ -2,12 +2,12 @@ package fallbackStyle
 
 import "image/color"
 import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/nasin/internal/style"
 
 // New returns Wintergreen, the default Tomo style. It is neutral-gray with
 // green and turquoise accents.
-func New () *style.Style {
+func New () *tomo.Style {
-	return &style.Style {
+	return &tomo.Style {
+		Rules: rules,
 		Colors: map[tomo.Color] color.Color {
 			tomo.ColorBackground: colorBackground,
 			tomo.ColorForeground: colorForeground,
@@ -15,6 +15,5 @@ func New () *style.Style {
 			tomo.ColorSunken:     colorCarved,
 			tomo.ColorAccent:     colorFocus,
 		},
-		Rules: rules,
 	}
 }

internal/style/styleconcept.tss

@@ -0,0 +1,21 @@
+$colorBlack    = #000000FF
+$borderOutline = $black / 1
+
+*.Slider {
+	Border:  $borderOutline, $borderColorFocused / 1
+	Color:   $colorGutter
+	Padding: 0 1 1 0
+}
+
+*.Slider[focused] {
+	Border:  $borderOutline
+	Padding: 0
+}
+
+*.Slider[horizontal] {
+	MinimumSize: 48 0
+}
+
+*.Slider[vertical] {
+	MinimumSize: 0 48
+}