Update registrar code

Progress on #4

application.go

@@ -1,10 +1,13 @@
 package nasin
 
+import "fmt"
 import "log"
+import "flag"
 import "image"
 import "strings"
 import "net/url"
 import "git.tebibyte.media/tomo/tomo"
+import "git.tebibyte.media/tomo/objects"
 import "git.tebibyte.media/tomo/tomo/canvas"
 import "git.tebibyte.media/tomo/nasin/internal/registrar"
 
@@ -23,12 +26,27 @@ type ApplicationURLOpener interface {
 
 	// OpenURL opens a new window with the contents of the given URL. If the
 	// given URL is unsupported, it returns an error (for example, an image
-	// viewer is not expected to open a text file). If the URL scheme is
+	// viewer is not expected to open a text file).
-	// empty, file:// is assumed.
 	//
 	// Applications should support the file:// scheme at the very least, and
 	// should also support others like http:// and https:// if possible.
 	OpenURL (*url.URL) error
+
+	// OpenNone is called when the application is launched without any URLs
+	// to open. The application may create some sort of default starting
+	// window, or call tomo.Stop().
+	OpenNone ()
+}
+
+// ApplicationFlagAdder is an application that supports reading command line
+// flags.
+type ApplicationFlagAdder interface {
+	Application
+
+	// AddFlags is called before Init and given the default flag set that
+	// Nasin uses to parse command line arguments. Note that when this
+	// method is called, Tomo will not yet be initialized.
+	AddFlags (*flag.FlagSet)
 }
 
 // ApplicationDescription describes the name and type of an application.
@@ -105,15 +123,26 @@ func (role ApplicationRole) Icon () tomo.Icon {
 // RunApplication is like tomo.Run, but runs an application. If something fails
 // to initialize, an error is written to the standard logger.
 func RunApplication (application Application) {
+	// TODO: see #4
+
+	if application, ok := application.(ApplicationFlagAdder); ok {
+		application.AddFlags(flag.CommandLine)
+	}
+	flag.Parse()
+
 	err := registrar.RegisterBackend()
-	if err != nil { log.Fatal("nasin: could not register backend:", err) }
+	if err != nil { log.Fatalln("nasin: could not register backend:", err) }
 	err = tomo.Run(func () {
 		err := registrar.SetTheme()
-		if err != nil { log.Fatal("nasin: could not set theme:", err) }
+		if err != nil { log.Fatalln("nasin: could not set theme:", err) }
 		err = application.Init()
-		if err != nil { log.Fatal("nasin: could not run application:", err) }
+		if err != nil { log.Fatalln("nasin: could not run application:", err) }
+
+		// open URLs
+		args := flag.Args()
+		applicationOpenUrls(application, args...)
 	})
-	if err != nil { log.Fatal("nasin: could not run application:", err) }
+	if err != nil { log.Fatalln("nasin: could not run application:", err) }
 }
 
 // NewApplicationWindow creates a window for an application. It will
@@ -126,10 +155,52 @@ func NewApplicationWindow (application Application, bounds image.Rectangle) (tom
 	if err != nil { return nil, err }
 	description := application.Describe()
 	window.SetTitle(description.Name)
+
 	setApplicationWindowIcon(window, description)
 	return window, nil
 }
 
+func applicationOpenUrls (application Application, args ...string) {
+	if application, ok := application.(ApplicationURLOpener); ok {
+		if len(args) <= 0 {
+			application.OpenNone()
+		}
+
+		openedAny := false
+		for _, arg := range flag.Args() {
+			ur, err := url.Parse(arg)
+			if err != nil {
+				log.Fatalf (
+					"nasin: invalid URL %v: %v",
+					arg, err)
+			}
+			if ur.Scheme == "" {
+				ur.Scheme = "file"
+			}
+			err = application.OpenURL(ur)
+			if err != nil {
+				dialog, err := objects.NewDialogOk (
+					objects.DialogError, nil,
+					"Could Not Open URL",
+					fmt.Sprintf (
+						"Could not open %v: %v",
+						arg, err),
+					func () {
+						if !openedAny {
+							application.OpenNone()
+						}
+					})
+				if err != nil { log.Fatal(err) }
+				dialog.SetVisible(true)
+			}
+		}
+	} else {
+		if len(args) > 0 {
+			log.Fatal("nasin: this application cannot open URLs")
+		}
+	}
+}
+
 func setApplicationWindowIcon (window tomo.Window, description ApplicationDescription) {
 	allSizes := func (icon tomo.Icon) (sizes []canvas.Texture) {
 		small  := icon.Texture(tomo.IconSizeSmall)

examples/clock/main.go

@@ -1,125 +0,0 @@
-// Example clock demonstrates the use of goroutines and tomo.Do() to provide
-// live-updating information.
-package main
-
-import "time"
-import "math"
-import "image"
-import "image/color"
-import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/nasin"
-import "git.tebibyte.media/tomo/objects"
-import "git.tebibyte.media/tomo/tomo/canvas"
-import "git.tebibyte.media/tomo/objects/layouts"
-
-type Application struct {
-	clockFace *ClockFace
-	timeLabel *objects.Label
-}
-
-func (this *Application) Describe () nasin.ApplicationDescription {
-	return nasin.ApplicationDescription {
-		Name: "Clock",
-		ID:   "xyz.holanet.TomoClockExample",
-	}
-}
-
-func (this *Application) Init () error {
-	window, err := nasin.NewApplicationWindow(this, image.Rect(0, 0, 128, 160))
-	if err != nil { return err }
-
-	this.clockFace = NewClockFace()
-	this.timeLabel = objects.NewLabel("")
-	this.timeLabel.SetAlign(tomo.AlignMiddle, tomo.AlignMiddle)
-	container := objects.NewOuterContainer (
-		layouts.NewGrid([]bool { true }, []bool { true, false }),
-		this.clockFace,
-		this.timeLabel)
-	window.SetRoot(container)
-
-	go func () {
-		for {
-			tomo.Do(this.updateTime)
-			time.Sleep(time.Second)
-		}
-	} ()
-
-	window.OnClose(tomo.Stop)
-	window.SetVisible(true)
-	return nil
-}
-
-func (this *Application) updateTime () {
-	now := time.Now()
-	this.clockFace.SetTime(now)
-	this.timeLabel.SetText(now.Format(time.DateTime))
-}
-
-func main () {
-	nasin.RunApplication(&Application { })
-}
-
-type ClockFace struct {
-	tomo.CanvasBox
-	time time.Time
-}
-
-func NewClockFace () *ClockFace {
-	box := &ClockFace {
-		CanvasBox: tomo.NewCanvasBox(),
-	}
-	box.SetRole(tomo.R("nasin", "ClockFace", ""))
-	box.SetDrawer(box)
-	return box
-}
-
-// TODO move ClockFace to objects
-
-func (this *ClockFace) SetTime (when time.Time) {
-	this.time = when
-	this.Invalidate()
-}
-
-func (this *ClockFace) Draw (destination canvas.Canvas) {
-	pen := destination.Pen()
-	pen.Fill(color.Transparent)
-	pen.Rectangle(destination.Bounds())
-
-	for hour := 0; hour < 12; hour ++ {
-		radialLine (
-			destination,
-			tomo.ColorForeground,
-			0.8, 0.9, float64(hour) / 6 * math.Pi)
-	}
-
-	second := float64(this.time.Second())
-	minute := float64(this.time.Minute()) + second / 60
-	hour   := float64(this.time.Hour())   + minute / 60
-
-	radialLine(destination, tomo.ColorForeground, 0, 0.5, (hour   - 3)  / 6  * math.Pi)
-	radialLine(destination, tomo.ColorForeground, 0, 0.7, (minute - 15) / 30 * math.Pi)
-	radialLine(destination, tomo.ColorAccent,     0, 0.7, (second - 15) / 30 * math.Pi)
-}
-
-func radialLine (
-	destination canvas.Canvas,
-	source color.Color,
-	inner  float64,
-	outer  float64,
-	theta  float64,
-) {
-	pen := destination.Pen()
-	bounds := destination.Bounds()
-	width  := float64(bounds.Dx()) / 2
-	height := float64(bounds.Dy()) / 2
-	min := bounds.Min.Add(image.Pt (
-		int(math.Cos(theta) * inner * width + width),
-		int(math.Sin(theta) * inner * height + height)))
-	max := bounds.Min.Add(image.Pt (
-		int(math.Cos(theta) * outer * width + width),
-		int(math.Sin(theta) * outer * height + height)))
-	
-	pen.Stroke(source)
-	pen.StrokeWeight(1)
-	pen.Path(min, max)
-}

examples/icons/main.go

@@ -1,423 +0,0 @@
-// Example icons demonstrates the use of icons, and buttons with icons.
-package main
-
-import "image"
-import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/nasin"
-import "git.tebibyte.media/tomo/objects"
-import "git.tebibyte.media/tomo/tomo/input"
-import "git.tebibyte.media/tomo/objects/layouts"
-import "git.tebibyte.media/tomo/nasin/internal/icons/xdg"
-
-const scrollIcons = true
-
-type Application struct {
-	window tomo.Window
-	size   tomo.IconSize
-	grid   tomo.ContainerBox
-}
-
-func (this *Application) Describe () nasin.ApplicationDescription {
-	return nasin.ApplicationDescription {
-		Name: "Tomo Icon Example",
-		ID:   "xyz.holanet.TomoIconExample",
-	}
-}
-
-func (this *Application) Init () error {
-	window, err := nasin.NewApplicationWindow(this, image.Rect(0, 0, 128, 256))
-	if err != nil { return err }
-	this.window = window
-
-	this.grid = objects.NewSunkenContainer(layouts.FlowVertical)
-	this.resizeIcons(tomo.IconSizeSmall)
-	
-	iconButtons := objects.NewInnerContainer(layouts.NewGrid([]bool { true, true, true}, []bool { false }))
-
-	button := objects.NewButton("small")
-	button.SetIcon(tomo.IconZoomOut)
-	button.OnClick(func () { this.resizeIcons(tomo.IconSizeSmall) })
-	iconButtons.Add(button)
-	
-	button = objects.NewButton("medium")
-	button.SetIcon(tomo.IconZoomOriginal)
-	button.OnClick(func () { this.resizeIcons(tomo.IconSizeMedium) })
-	iconButtons.Add(button)
-	
-	button = objects.NewButton("large")
-	button.SetIcon(tomo.IconZoomIn)
-	button.OnClick(func () { this.resizeIcons(tomo.IconSizeLarge) })
-	iconButtons.Add(button)
-	
-	container := objects.NewOuterContainer (
-		layouts.NewGrid([]bool { true }, []bool { false, true, false }),
-		objects.NewLabel("A smorgasbord of icons:"))
-	if scrollIcons {
-		iconScroller := objects.NewScrollContainer(objects.ScrollVertical)
-		this.grid.SetOverflow(false, true)
-		iconScroller.SetRoot(this.grid)
-		container.Add(iconScroller)
-	} else {
-		container.Add(this.grid)
-	}
-	container.Add(iconButtons)
-	window.SetRoot(container)
-
-	window.OnClose(tomo.Stop)
-	window.SetVisible(true)
-	return nil
-}
-
-func (this *Application) resizeIcons (size tomo.IconSize) {
-	this.size = size
-	this.grid.Clear()
-	icons := []tomo.Icon {
-		tomo.IconUnknown,
-		tomo.IconAddressBookNew,
-		tomo.IconApplicationExit,
-		tomo.IconAppointmentNew,
-		tomo.IconCallStart,
-		tomo.IconCallStop,
-		tomo.IconContactNew,
-		tomo.IconDialogOkay,
-		tomo.IconDialogCancel,
-		tomo.IconEditClear,
-		tomo.IconEditCopy,
-		tomo.IconEditCut,
-		tomo.IconEditDelete,
-		tomo.IconEditFind,
-		tomo.IconEditFindReplace,
-		tomo.IconEditPaste,
-		tomo.IconEditRedo,
-		tomo.IconEditSelectAll,
-		tomo.IconEditUndo,
-		tomo.IconFileNew,
-		tomo.IconDirectoryNew,
-		tomo.IconFileOpen,
-		tomo.IconFileOpenRecent,
-		tomo.IconFilePageSetup,
-		tomo.IconFilePrint,
-		tomo.IconFilePrintPreview,
-		tomo.IconFilePermissions,
-		tomo.IconFileProperties,
-		tomo.IconFileRename,
-		tomo.IconFileRevert,
-		tomo.IconFileSave,
-		tomo.IconFileSaveAs,
-		tomo.IconFileSend,
-		tomo.IconFormatIndentLess,
-		tomo.IconFormatIndentMore,
-		tomo.IconFormatAlignCenter,
-		tomo.IconFormatAlignEven,
-		tomo.IconFormatAlignLeft,
-		tomo.IconFormatAlignRight,
-		tomo.IconFormatTextDirectionLtr,
-		tomo.IconFormatTextDirectionRtl,
-		tomo.IconFormatTextBold,
-		tomo.IconFormatTextItalic,
-		tomo.IconFormatTextUnderline,
-		tomo.IconFormatTextStrikethrough,
-		tomo.IconGoBottom,
-		tomo.IconGoDown,
-		tomo.IconGoFirst,
-		tomo.IconGoHome,
-		tomo.IconGoJump,
-		tomo.IconGoLast,
-		tomo.IconGoNext,
-		tomo.IconGoPrevious,
-		tomo.IconGoTop,
-		tomo.IconGoUp,
-		tomo.IconHelpAbout,
-		tomo.IconHelpContents,
-		tomo.IconHelpFaq,
-		tomo.IconInsertImage,
-		tomo.IconInsertLink,
-		tomo.IconInsertObject,
-		tomo.IconInsertText,
-		tomo.IconListAdd,
-		tomo.IconListRemove,
-		tomo.IconMailForward,
-		tomo.IconMailMarkImportant,
-		tomo.IconMailMarkJunk,
-		tomo.IconMailMarkNotJunk,
-		tomo.IconMailMarkRead,
-		tomo.IconMailMarkUnread,
-		tomo.IconMailMessageNew,
-		tomo.IconMailReplyAll,
-		tomo.IconMailReplySender,
-		tomo.IconMailSend,
-		tomo.IconMailReceive,
-		tomo.IconMediaEject,
-		tomo.IconMediaPlaybackPause,
-		tomo.IconMediaPlaybackStart,
-		tomo.IconMediaPlaybackStop,
-		tomo.IconMediaRecord,
-		tomo.IconMediaSeekBackward,
-		tomo.IconMediaSeekForward,
-		tomo.IconMediaSkipBackward,
-		tomo.IconMediaSkipForward,
-		tomo.IconObjectFlipHorizontal,
-		tomo.IconObjectFlipVertical,
-		tomo.IconObjectRotateLeft,
-		tomo.IconObjectRotateRight,
-		tomo.IconProcessStop,
-		tomo.IconSystemLockScreen,
-		tomo.IconSystemLogOut,
-		tomo.IconSystemRun,
-		tomo.IconSystemSearch,
-		tomo.IconSystemReboot,
-		tomo.IconSystemShutdown,
-		tomo.IconToolsCheckSpelling,
-		tomo.IconValueIncrement,
-		tomo.IconValueDecrement,
-		tomo.IconValueReset,
-		tomo.IconViewFullscreen,
-		tomo.IconViewRefresh,
-		tomo.IconViewRestore,
-		tomo.IconViewSortAscending,
-		tomo.IconViewSortDescending,
-		tomo.IconWindowClose,
-		tomo.IconWindowNew,
-		tomo.IconZoomFitBest,
-		tomo.IconZoomIn,
-		tomo.IconZoomOriginal,
-		tomo.IconZoomOut,
-		tomo.IconApplication,
-		tomo.IconApplicationWebBrowser,
-		tomo.IconApplicationMesssanger,
-		tomo.IconApplicationPhone,
-		tomo.IconApplicationMail,
-		tomo.IconApplicationTerminalEmulator,
-		tomo.IconApplicationFileBrowser,
-		tomo.IconApplicationTextEditor,
-		tomo.IconApplicationDocumentViewer,
-		tomo.IconApplicationWordProcessor,
-		tomo.IconApplicationSpreadsheet,
-		tomo.IconApplicationSlideshow,
-		tomo.IconApplicationCalculator,
-		tomo.IconApplicationPreferences,
-		tomo.IconApplicationProcessManager,
-		tomo.IconApplicationSystemInformation,
-		tomo.IconApplicationManual,
-		tomo.IconApplicationCamera,
-		tomo.IconApplicationImageViewer,
-		tomo.IconApplicationMediaPlayer,
-		tomo.IconApplicationImageEditor,
-		tomo.IconApplicationAudioEditor,
-		tomo.IconApplicationVideoEditor,
-		tomo.IconApplicationClock,
-		tomo.IconApplicationCalendar,
-		tomo.IconApplicationChecklist,
-		tomo.IconApplications,
-		tomo.IconApplicationsAccessories,
-		tomo.IconApplicationsDevelopment,
-		tomo.IconApplicationsEngineering,
-		tomo.IconApplicationsGames,
-		tomo.IconApplicationsGraphics,
-		tomo.IconApplicationsInternet,
-		tomo.IconApplicationsMultimedia,
-		tomo.IconApplicationsOffice,
-		tomo.IconApplicationsScience,
-		tomo.IconApplicationsSystem,
-		tomo.IconApplicationsUtilities,
-		tomo.IconPreferences,
-		tomo.IconPreferencesDesktop,
-		tomo.IconPreferencesPeripherals,
-		tomo.IconPreferencesPersonal,
-		tomo.IconPreferencesSystem,
-		tomo.IconPreferencesNetwork,
-		tomo.IconDevice,
-		tomo.IconDeviceCamera,
-		tomo.IconDeviceWebCamera,
-		tomo.IconDeviceComputer,
-		tomo.IconDevicePda,
-		tomo.IconDevicePhone,
-		tomo.IconDevicePrinter,
-		tomo.IconDeviceScanner,
-		tomo.IconDeviceMultimediaPlayer,
-		tomo.IconDeviceVideoDisplay,
-		tomo.IconDeviceAudioInput,
-		tomo.IconDeviceAudioOutput,
-		tomo.IconHardware,
-		tomo.IconHardwareCPU,
-		tomo.IconHardwareGPU,
-		tomo.IconHardwareRAM,
-		tomo.IconHardwareSoundCard,
-		tomo.IconHardwareNetworkAdapter,
-		tomo.IconPowerBattery,
-		tomo.IconStorageHardDisk,
-		tomo.IconStorageFloppyDisk,
-		tomo.IconStorageSolidState,
-		tomo.IconStorageOptical,
-		tomo.IconStorageFlashStick,
-		tomo.IconStorageFlashCard,
-		tomo.IconStorageMagneticTape,
-		tomo.IconInputGaming,
-		tomo.IconInputKeyboard,
-		tomo.IconInputMouse,
-		tomo.IconInputTablet,
-		tomo.IconNetworkWired,
-		tomo.IconNetworkWireless,
-		tomo.IconNetworkCellular,
-		tomo.IconNetworkLocal,
-		tomo.IconNetworkInternet,
-		tomo.IconNetworkVPN,
-		tomo.IconNetworkServer,
-		tomo.IconNetworkWorkgroup,
-		tomo.IconEmblemDefault,
-		tomo.IconEmblemEncrypted,
-		tomo.IconEmblemFavorite,
-		tomo.IconEmblemImportant,
-		tomo.IconEmblemReadOnly,
-		tomo.IconEmblemShared,
-		tomo.IconEmblemSymbolicLink,
-		tomo.IconEmblemSynchronized,
-		tomo.IconEmblemSystem,
-		tomo.IconEmblemUnreadable,
-		tomo.IconPlaceDirectory,
-		tomo.IconPlaceRemote,
-		tomo.IconPlaceHome,
-		tomo.IconPlaceDownloads,
-		tomo.IconPlaceDesktop,
-		tomo.IconPlacePhotos,
-		tomo.IconPlaceBooks,
-		tomo.IconPlaceBookmarks,
-		tomo.IconPlaceTrash,
-		tomo.IconPlaceDocuments,
-		tomo.IconPlaceRepositories,
-		tomo.IconPlaceMusic,
-		tomo.IconPlaceArchives,
-		tomo.IconPlaceFonts,
-		tomo.IconPlaceBinaries,
-		tomo.IconPlaceVideos,
-		tomo.IconPlace3DObjects,
-		tomo.IconPlaceHistory,
-		tomo.IconPlacePreferences,
-		tomo.IconCheckboxChecked,
-		tomo.IconCheckboxUnchecked,
-		tomo.IconAppointmentMissed,
-		tomo.IconAppointmentSoon,
-		tomo.IconDialogError,
-		tomo.IconDialogInformation,
-		tomo.IconDialogPassword,
-		tomo.IconDialogQuestion,
-		tomo.IconDialogWarning,
-		tomo.IconDirectoryDragAccept,
-		tomo.IconDirectoryFull,
-		tomo.IconDirectoryOpen,
-		tomo.IconDirectoryVisiting,
-		tomo.IconTrashFull,
-		tomo.IconResourceLoading,
-		tomo.IconResourceMissing,
-		tomo.IconMailAttachment,
-		tomo.IconMailUnread,
-		tomo.IconMailReplied,
-		tomo.IconMailSigned,
-		tomo.IconMailSignedVerified,
-		tomo.IconCellularSignal0,
-		tomo.IconCellularSignal1,
-		tomo.IconCellularSignal2,
-		tomo.IconCellularSignal3,
-		tomo.IconWirelessSignal0,
-		tomo.IconWirelessSignal1,
-		tomo.IconWirelessSignal2,
-		tomo.IconWirelessSignal3,
-		tomo.IconNetworkError,
-		tomo.IconNetworkIdle,
-		tomo.IconNetworkOffline,
-		tomo.IconNetworkReceive,
-		tomo.IconNetworkTransmit,
-		tomo.IconNetworkTransmitReceive,
-		tomo.IconPrintError,
-		tomo.IconPrintPrinting,
-		tomo.IconSecurityHigh,
-		tomo.IconSecurityMedium,
-		tomo.IconSecurityLow,
-		tomo.IconSoftwareUpdateAvailable,
-		tomo.IconSoftwareUpdateUrgent,
-		tomo.IconSoftwareInstalling,
-		tomo.IconSyncError,
-		tomo.IconSyncSynchronizing,
-		tomo.IconTaskDue,
-		tomo.IconTaskPastDue,
-		tomo.IconUserAvailable,
-		tomo.IconUserAway,
-		tomo.IconUserIdle,
-		tomo.IconUserOffline,
-		tomo.IconBattery0,
-		tomo.IconBattery1,
-		tomo.IconBattery2,
-		tomo.IconBattery3,
-		tomo.IconBrightness0,
-		tomo.IconBrightness1,
-		tomo.IconBrightness2,
-		tomo.IconBrightness3,
-		tomo.IconVolume0,
-		tomo.IconVolume1,
-		tomo.IconVolume2,
-		tomo.IconVolume3,
-		tomo.IconPlaylistRepeat,
-		tomo.IconPlaylistShuffle,
-		tomo.IconWeatherClear,
-		tomo.IconWeatherClearNight,
-		tomo.IconWeatherFewClouds,
-		tomo.IconWeatherFewCloudsNight,
-		tomo.IconWeatherFog,
-		tomo.IconWeatherOvercast,
-		tomo.IconWeatherSevereAlert,
-		tomo.IconWeatherShowers,
-		tomo.IconWeatherShowersScattered,
-		tomo.IconWeatherSnow,
-		tomo.IconWeatherStorm,
-	}
-
-	for _, icon := range icons {
-		iconObject := objects.NewIcon(icon, size)
-		this.grid.Add(iconObject)
-		icon := icon
-		iconObject.OnMouseDown(func (button input.Button) {
-			if button != input.ButtonLeft { return }
-			this.iconPopup(icon)
-		})
-	}
-}
-
-func (this *Application) iconPopup (icon tomo.Icon) error {
-	popup, err := this.window.NewModal(image.Rectangle { })
-	if err != nil { return err }
-
-	if icon == "" {
-		icon = "<UNKNOWN>"
-	}
-
-	sizesRow := objects.NewSunkenContainer (
-		layouts.ContractHorizontal,
-		objects.NewIcon(icon, tomo.IconSizeSmall),
-		objects.NewIcon(icon, tomo.IconSizeMedium),
-		objects.NewIcon(icon, tomo.IconSizeLarge))
-	sizesRow.SetAlign(tomo.AlignMiddle, tomo.AlignMiddle)
-
-	okButton := objects.NewButton("OK")
-	okButton.SetFocused(true)
-	okButton.OnClick(popup.Close)
-	okButton.SetIcon(tomo.IconDialogOkay)
-	controlRow := objects.NewInnerContainer (
-		layouts.ContractHorizontal,
-		okButton)
-	controlRow.SetAlign(tomo.AlignEnd, tomo.AlignMiddle)
-	
-	popup.SetRoot(objects.NewOuterContainer (
-		layouts.NewGrid([]bool { true }, []bool { false, false, true, false }),
-		objects.NewLabel("Icon ID: " + string(icon)),
-		objects.NewLabel("XDG Name: " + xdgIcons.XdgIconName(icon)),
-		sizesRow,
-		controlRow,
-	))
-	popup.SetTitle(string(icon) + ": Properties")
-	popup.SetVisible(true)
-	return nil
-}
-
-func main () {
-	nasin.RunApplication(&Application { })
-}

examples/inputs/main.go

@@ -1,37 +0,0 @@
-// Example inputs demonstrates the use of various user input methods.
-package main
-
-import "image"
-import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/nasin"
-import "git.tebibyte.media/tomo/objects"
-import "git.tebibyte.media/tomo/objects/layouts"
-
-type Application struct { }
-
-func (this *Application) Describe () nasin.ApplicationDescription {
-	return nasin.ApplicationDescription {
-		Name: "Tomo Input Example",
-		ID:   "xyz.holanet.TomoInputExample",
-	}
-}
-
-func (this *Application) Init () error {
-	window, err := nasin.NewApplicationWindow(this, image.Rect(0, 0, 128, 128))
-	if err != nil { return err }
-
-	window.SetRoot(objects.NewOuterContainer(layouts.ContractVertical,
-		objects.NewTextInput(""),
-		objects.NewHorizontalSlider(0.5),
-		objects.NewLabelCheckbox(false, "checkbox"),
-		objects.NewNumberInput(5),
-	))
-
-	window.OnClose(tomo.Stop)
-	window.SetVisible(true)
-	return nil
-}
-
-func main () {
-	nasin.RunApplication(&Application { })
-}

examples/license/LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

examples/license/main.go

@@ -1,62 +0,0 @@
-// Example license demonstrates the use of a TextView to display licensing 
-// information.
-package main
-
-import "image"
-import _ "embed"
-import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/nasin"
-import "git.tebibyte.media/tomo/objects"
-import "git.tebibyte.media/tomo/objects/layouts"
-
-//go:embed LICENSE
-var license []byte
-
-type Application struct { }
-
-func (this *Application) Describe () nasin.ApplicationDescription {
-	return nasin.ApplicationDescription {
-		Name: "Tomo License Example",
-		ID:   "xyz.holanet.TomoLicenseExample",
-	}
-}
-
-func (this *Application) Init () error {
-	window, err := nasin.NewApplicationWindow(this, image.Rect(0, 0, 600, 600))
-	if err != nil { return err }
-
-	checkbox := objects.NewLabelCheckbox(false, "I accept these terms")
-	checkbox.SetFocused(true)
-
-	okButtok := objects.NewButton("OK")
-	okButtok.SetIcon(tomo.IconDialogOkay)
-	okButtok.OnClick(func () {
-		if checkbox.Value() {
-			window.Close()
-		} else {
-			dialog, _ := objects.NewDialogOk (
-				objects.DialogInformation, window,
-				"", "You must read and agree to the license terms", nil)
-			dialog.SetVisible(true)
-		}
-	})
-
-	scroller := objects.NewScrollContainer(objects.ScrollVertical)
-	scroller.SetRoot(objects.NewTextView(string(license)))
-	
-	window.SetRoot(objects.NewOuterContainer (
-		layouts.NewGrid([]bool { true }, []bool { true, false }),
-		scroller,
-		objects.NewInnerContainer (
-			layouts.NewGrid([]bool { true, false }, []bool { true }),
-			checkbox,
-			okButtok)))
-	
-	window.OnClose(tomo.Stop)
-	window.SetVisible(true)
-	return nil
-}
-
-func main () {
-	nasin.RunApplication(&Application { })
-}

go.mod

@@ -3,9 +3,9 @@ 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.19.0
+	git.tebibyte.media/tomo/objects v0.20.0
-	git.tebibyte.media/tomo/tomo v0.38.0
+	git.tebibyte.media/tomo/tomo v0.41.0
 	git.tebibyte.media/tomo/xdg v0.1.0
 	golang.org/x/image v0.11.0
 )

go.sum

@@ -1,10 +1,10 @@
 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.19.0 h1:ibnAoPvkPTiuJGlqQDnoGVZBQiUT/GZo1qqvDDUCK4w=
+git.tebibyte.media/tomo/objects v0.20.0 h1:HK6aWxBfRe0sgqvfIZnvfW0c8jSYP7F5Od/rWvi5DAM=
-git.tebibyte.media/tomo/objects v0.19.0/go.mod h1:GP5BZ6lc2F2D0OxERfr9r46PIk7jFlpq2/BWOpoQDqc=
+git.tebibyte.media/tomo/objects v0.20.0/go.mod h1:DNTKSU9u126XF4usZG0ax9b20So4UpBZ+wAwRiA7XOQ=
-git.tebibyte.media/tomo/tomo v0.38.0 h1:K5TP67RxnszudeNfmGZiU5cFTRjFueXiI3NCsgw+05U=
+git.tebibyte.media/tomo/tomo v0.41.0 h1:Z+7FHhbGiKjs+kQNvuJOfz47xIct5qxvSJqyDuoNIOs=
-git.tebibyte.media/tomo/tomo v0.38.0/go.mod h1:C9EzepS9wjkTJjnZaPBh22YvVPyA4hbBAJVU20Rdmps=
+git.tebibyte.media/tomo/tomo v0.41.0/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=

internal/icons/fallback/icon.go

@@ -417,7 +417,7 @@ type iconTheme struct {
 }
 
 // New creates a new fallback icon theme.
-func New () tomo.Icons {
+func New () tomo.IconSet {
 	return new(iconTheme)
 }
 

internal/icons/xdg/icon.go

@@ -14,13 +14,13 @@ import "git.tebibyte.media/tomo/tomo/canvas"
 
 type iconTheme struct {
 	xdg xdgIconTheme.Theme
-	fallback       tomo.Icons
+	fallback       tomo.IconSet
 	texturesSmall  map[tomo.Icon] canvas.Texture
 	texturesMedium map[tomo.Icon] canvas.Texture
 	texturesLarge  map[tomo.Icon] canvas.Texture
 }
 
-func FindThemeWarn (name string, fallback tomo.Icons, path ...string) (tomo.Icons, error) {
+func FindThemeWarn (name string, fallback tomo.IconSet, path ...string) (tomo.IconSet, error) {
 	this := &iconTheme {
 		fallback:       fallback,
 		texturesLarge:  make(map[tomo.Icon] canvas.Texture),

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/attribute.go

@@ -1,41 +0,0 @@
-package style
-
-import "image"
-import "image/color"
-import "golang.org/x/image/font"
-import "git.tebibyte.media/tomo/tomo"
-
-// Attr modifies one thing about an Objects's style.
-type Attr interface { attr () int }
-
-// AttrColor sets the background color of an Objects.
-type AttrColor struct { color.Color }
-// AttrTexture sets the texture of an Objects to a named texture.
-type AttrTexture string
-// AttrBorder sets the border of an Objects.
-type AttrBorder []tomo.Border
-// AttrMinimumSize sets the minimum size of an Objects.
-type AttrMinimumSize image.Point
-// AttrPadding sets the inner padding of an Objects.
-type AttrPadding tomo.Inset
-// AttrGap sets the gap between child Objects, if the Object is a ContainerBox.
-type AttrGap image.Point
-// AttrTextColor sets the text color, if the Object is a TextBox.
-type AttrTextColor struct { color.Color }
-// AttrDotColor sets the text selection color, if the Object is a TextBox.
-type AttrDotColor struct { color.Color }
-// AttrFace sets the font face, if the Object is a TextBox.
-type AttrFace struct { font.Face }
-// AttrAlign sets the alignment, if the Object is a ContentBox.
-type AttrAlign struct { X, Y tomo.Align }
-
-func (AttrColor)       attr () int { return 0 }
-func (AttrTexture)     attr () int { return 1 }
-func (AttrBorder)      attr () int { return 2 }
-func (AttrMinimumSize) attr () int { return 3 }
-func (AttrPadding)     attr () int { return 4 }
-func (AttrGap)         attr () int { return 5 }
-func (AttrTextColor)   attr () int { return 6 }
-func (AttrDotColor)    attr () int { return 7 }
-func (AttrFace)        attr () int { return 8 }
-func (AttrAlign)       attr () int { return 9 }

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[*]
-	style.Rule {
-		Role: tomo.R("", "TextView", ""),
-		Default: style.AS (
-			style.AttrBorder {
-				outline,
-				tomo.Border {
-					Width: tomo.I(1, 0, 0, 1),
-					Color: borderColorEngraved,
-				},
-			},
-			style.AttrColor { Color: tomo.ColorSunken },
-			style.AttrPadding(tomo.I(8)),
-		),
-	},
 	
-	// *.NumberInput[*]
+	// *.Button[pressed]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "NumberInput", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			outline,
-			style.AttrGap { },
+			tomo.Border {
-		),
+				Width: tomo.I(1, 0, 0, 1),
-	},
+				Color: borderColorEngraved,
+			},
+		},
+		tomo.AttrPadding(tomo.I(5, 8, 4, 9)),
+		tomo.AttrColor { Color: colorCarvedPressed },
+	), tomo.R("", "Button"), "pressed"),
+
+	// *.TextInput
+	tomo.Ru(tomo.AS (
+		tomo.ABorder (
+			outline,
+			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,
-				},
 			},
-			style.AttrColor { Color: tomo.ColorRaised },
+		},
-			style.AttrMinimumSize { X: 12, Y: 12, },
+		tomo.AttrColor { Color: tomo.ColorRaised },
-		),
+		tomo.AttrMinimumSize { X: 12, Y: 12, },
-	},
+	), tomo.R("", "SliderHandle")),
 
-	// *.Checkbox[*]
+	// *.Checkbox
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Checkbox", ""),
+		tomo.ABorder (
-		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,
+		tomo.AColor(tomo.ColorSunken),
-				},
+		tomo.APadding(0, 1, 1, 0),
-			},
+		tomo.AMinimumSize(19, 19),
-			style.AttrColor { Color: tomo.ColorSunken },
+		tomo.ATexture(nil),
-			style.AttrPadding(tomo.I(0, 1, 1, 0)),
+		tomo.ATextureMode(tomo.TextureModeCenter),
-			style.AttrMinimumSize { X: 19, Y: 19 },
+	), tomo.R("", "Checkbox")),
-		),
-		Focused: style.AS (
-			style.AttrBorder {
-				outline,
-				tomo.Border {
-					Width: tomo.I(1),
-					Color: borderColorFocused,
-				},
-			},
-			style.AttrPadding(tomo.I(0)),
-		),
-	},
 
-	// *.MenuItem[*]
+	// *.Checkbox[focused]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "MenuItem", ""),
+		tomo.ABorder (
-		Default: style.AS (
+			outline,
-			style.AttrPadding(tomo.I(4)),
+			tomo.Border {
-			style.AttrGap { X: 4, Y: 4 },
+				Width: tomo.I(1),
-			style.AttrColor { Color: color.Transparent },
+				Color: borderColorFocused,
-		),
+			}),
-		Hovered: style.AS (
+		tomo.APadding(0),
-			style.AttrColor { Color: tomo.ColorAccent },
+	), tomo.R("", "Checkbox"), "focused"),
-		),
-		Focused: style.AS (
-			style.AttrColor { Color: tomo.ColorAccent },
-		),
-	},
 
-	// *.File[*]
+	// *.Checkbox[checked]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "File", ""),
+		tomo.ATexture(nil), // TODO: checked texture
-		Default: style.AS (
+	), tomo.R("", "Checkbox"), "checked"),
-			style.AttrColor { Color: color.Transparent },
-		),
-		Focused: style.AS (
-			style.AttrColor { Color: tomo.ColorAccent },
-		),
-	},
 
-	// *.TearLine[*]
+	// *.MenuItem
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "TearLine", ""),
+		tomo.AttrPadding(tomo.I(4)),
-		Default: style.AS (
+		tomo.AttrGap { X: 4, Y: 4 },
-			style.AttrBorder {
+		tomo.AttrColor { Color: color.Transparent },
-				tomo.Border {
+	), tomo.R("", "MenuItem")),
-					Width: tomo.I(3),
+
-					Color: [4]color.Color {
+	// *MenuItem[focused]
-						color.Transparent,
+	tomo.Ru(tomo.AS (
-						color.Transparent,
+		tomo.AttrColor { Color: tomo.ColorAccent },
-						color.Transparent,
+	), tomo.R("", "MenuItem"), "focused"),
-						color.Transparent,
-					},
-				},
-			},
-			style.AttrColor { Color: tomo.ColorForeground },
-			style.AttrPadding(tomo.I(1, 0, 0, 1)),
-		),
-		Hovered: style.AS (
-			style.AttrBorder {
-				tomo.Border {
-					Width: tomo.I(3),
-					Color: borderColorFocused,
-				},
-			},
-		),
-		Focused: style.AS (
-			style.AttrBorder {
-				tomo.Border {
-					Width: tomo.I(3),
-					Color: borderColorFocused,
-				},
-			},
-		),
-	},
 	
-	// *.Calendar[*]
+	// *.MenuItem[hovered]
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "Calendar", ""),
+		tomo.AttrColor { Color: tomo.ColorAccent },
-		Default: style.AS (
+	), tomo.R("", "MenuItem"), "hovered"),
-			style.AttrBorder {
+
-				tomo.Border {
+	// *.File
-					Width: tomo.I(0, 1, 1, 0),
+	tomo.Ru(tomo.AS (
-					Color: borderColorShade,
+		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,
 				},
-				outline,
 			},
-			style.AttrColor { Color: colorInput },
+		},
-			style.AttrPadding(tomo.I(2)),
+		tomo.AttrColor { Color: tomo.ColorForeground },
-			style.AttrGap { X: 2, Y: 2 },
+		tomo.AttrPadding(tomo.I(1, 0, 0, 1)),
-		),
+	), tomo.R("", "TearLine")),
-	},
+
+	// *.TearLine[focused]
+	tomo.Ru(tomo.AS (
+		tomo.AttrBorder {
+			tomo.Border {
+				Width: tomo.I(3),
+				Color: borderColorFocused,
+			},
+		},
+	), tomo.R("", "TearLine"), "focused"),
+
+	// *.TearLine[hovered]
+	tomo.Ru(tomo.AS (
+		tomo.AttrBorder {
+			tomo.Border {
+				Width: tomo.I(3),
+				Color: borderColorFocused,
+			},
+		},
+	), tomo.R("", "TearLine"), "hovered"),
 	
-	// *.CalendarGrid[*]
+	// *.Calendar
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "CalendarGrid", ""),
+		tomo.AttrBorder {
-		Default: style.AS (
+			tomo.Border {
-			style.AttrGap { X: 2, Y: 2 },
+				Width: tomo.I(0, 1, 1, 0),
-		),
+				Color: borderColorShade,
-	},
+			},
+			outline,
+		},
+		tomo.AttrColor { Color: colorInput },
+		tomo.AttrPadding(tomo.I(2)),
+		tomo.AttrGap { X: 2, Y: 2 },
+	), tomo.R("", "Calendar")),
 	
-	// *.CalendarWeekdayHeader[*]
+	// *.CalendarGrid
-	style.Rule {
+	tomo.Ru(tomo.AS (
-		Role: tomo.R("", "CalendarWeekdayHeader", ""),
+		tomo.AttrGap { X: 2, Y: 2 },
-		Default: style.AS (
+	), tomo.R("", "CalendarGrid")),
-			style.AttrPadding(tomo.I(2)),
+	
-			style.AttrColor { Color: colorCalendarWeekdayHeader },
+	// *.CalendarWeekdayHeader
-		),
+	tomo.Ru(tomo.AS (
-	},
+		tomo.AttrPadding(tomo.I(2)),
+		tomo.AttrColor { Color: colorCalendarWeekdayHeader },
+	), tomo.R("", "CalendarWeekdayHeader")),
 	
 	// *.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/missing.go

@@ -1,24 +0,0 @@
-package style
-
-import "image"
-import "image/color"
-
-type missingTexture int
-
-func (texture missingTexture) ColorModel () color.Model {
-	return color.RGBAModel
-}
-
-func (texture missingTexture) Bounds () image.Rectangle {
-	return image.Rect(0, 0, int(texture), int(texture))
-}
-
-func (texture missingTexture) At (x, y int) color.Color {
-	x /= 8
-	y /= 8
-	if (x + y) % 2 == 0 {
-		return color.RGBA { R: 0xFF, B: 0xFF, A: 0xFF }
-	} else {
-		return color.RGBA { A: 0xFF }
-	}
-}

internal/style/style.go

@@ -1,239 +0,0 @@
-// Package style provides a data-driven style implementation.
-package style
-
-import "image"
-import "image/color"
-import "git.tebibyte.media/tomo/tomo"
-import "git.tebibyte.media/tomo/tomo/event"
-import "git.tebibyte.media/tomo/tomo/input"
-import "git.tebibyte.media/tomo/tomo/canvas"
-
-// this is CSS's bastard child
-
-// Style allows the use of data to define a visual style.
-type Style struct {
-	// Textures maps texture names to image textures.
-	Textures map[string] image.Image
-	textures map[string] canvas.TextureCloser // private texture cache
-	missing  canvas.TextureCloser             // cache for "missing" texture
-	
-	// Rules determines which styles get applied to which Objects.
-	Rules []Rule
-
-	// Colors maps tomo.Color values to color.RGBA values.
-	Colors map[tomo.Color] color.Color
-}
-
-// Rule describes under what circumstances should certain style attributes be
-// active.
-type Rule struct {
-	Role tomo.Role
-	Default AttrSet
-	Hovered AttrSet
-	Pressed AttrSet
-	Focused AttrSet
-}
-
-// AttrSet is a set of attributes wherein only one/zero of each attribute type
-// can exist. I deserve to be imprisoned for the way I made this work (look in
-// attribute.go). Its zero value can be used safely, and you can copy it if you
-// want, but it will point to the same set of attributes.
-type AttrSet struct {
-	set map[int] Attr
-}
-
-// AS builds an AttrSet out of a vararg list of Attr values.
-func AS (attrs ...Attr) AttrSet {
-	set := AttrSet { }
-	set.Add(attrs...)
-	return set
-}
-
-// Add adds attributes to the set.
-func (this *AttrSet) Add (attrs ...Attr) {
-	this.ensure()
-	for _, attr := range attrs {
-		this.set[attr.attr()] = attr
-	}
-}
-
-// MergeUnder takes attributes from another set and adds them if they don't
-// already exist in this one.
-func (this *AttrSet) MergeUnder (other AttrSet) {
-	this.ensure()
-	if other.set == nil { return }
-	for _, attr := range other.set {
-		if _, exists := this.set[attr.attr()]; !exists {
-			this.Add(attr)
-		}
-	}
-}
-
-// MergeOver takes attributes from another set and adds them, overriding this
-// one.
-func (this *AttrSet) MergeOver (other AttrSet) {
-	this.ensure()
-	if other.set == nil { return }
-	for _, attr := range other.set {
-		this.Add(attr)
-	}
-}
-
-func (this *AttrSet) ensure () {
-	if this.set == nil { this.set = make(map[int] Attr) }
-}
-
-func (this *Style) execute (object tomo.Object, set AttrSet) {
-	box := object.GetBox()
-	
-	for _, attr := range set.set {
-		switch attr := attr.(type) {
-		case AttrColor:
-			box.SetColor(attr.Color)
-		case AttrTexture:
-			box.SetTextureTile(this.texture(string(attr)))
-		case AttrBorder:
-			box.SetBorder([]tomo.Border(attr)...)
-		case AttrMinimumSize:
-			box.SetMinimumSize(image.Point(attr))
-		case AttrPadding:
-			box.SetPadding(tomo.Inset(attr))
-		case AttrGap:
-			if box, ok := box.(tomo.ContainerBox); ok {
-				box.SetGap(image.Point(attr))
-			}
-		case AttrTextColor:
-			if box, ok := box.(tomo.TextBox); ok {
-				box.SetTextColor(attr.Color)
-			}
-		case AttrDotColor:
-			if box, ok := box.(tomo.TextBox); ok {
-				box.SetDotColor(attr.Color)
-			}
-		case AttrFace:
-			if box, ok := box.(tomo.TextBox); ok {
-				box.SetFace(attr)
-			}
-		case AttrAlign:
-			if box, ok := box.(tomo.ContentBox); ok {
-				box.SetAlign(attr.X, attr.Y)
-			}
-		default:
-			panic("bug: nasin/internal/tomo.Theme: unexpected attribute")
-		}
-	}
-}
-
-func (this *Style) texture (name string) canvas.Texture {
-	this.ensureTextureCache()
-	if texture, ok := this.textures[name]; ok {
-		return texture
-	}
-	if this.Textures == nil {
-		if source, ok := this.Textures[name]; ok {
-			texture := tomo.NewTexture(source)
-			this.textures[name] = texture
-			return texture
-		}
-	}
-	return this.missingTexture()
-}
-
-func (this *Style) missingTexture () canvas.Texture {
-	if this.missing == nil {
-		this.missing = tomo.NewTexture(missingTexture(16))
-	}
-	return this.missing
-}
-
-func (this *Style) ensureTextureCache () {
-	if this.textures == nil { this.textures = make(map[string] canvas.TextureCloser) }
-}
-
-// setsFor builds flattened attr sets for a specific role based on the rules list
-func (this *Style) setsFor (role tomo.Role) (defaul, hovered, pressed, focused AttrSet) {
-	for _, current := range this.Rules {
-		// check for a match
-		packageMatch := current.Role.Package == role.Package || current.Role.Package == ""
-		objectMatch  := current.Role.Object  == role.Object  || current.Role.Object  == ""
-		variantMatch := current.Role.Variant == role.Variant || current.Role.Variant == ""
-		if packageMatch && objectMatch && variantMatch {
-			// if found, merge and override
-			defaul.MergeOver(current.Default)
-			hovered.MergeOver(current.Hovered)
-			pressed.MergeOver(current.Pressed)
-			focused.MergeOver(current.Focused)
-		}
-	}
-
-	// hovered and pressed are mutually exclusive states, so we compress
-	// them with the default state.
-	hovered.MergeUnder(defaul)
-	pressed.MergeUnder(defaul)
-	return defaul, hovered, pressed, focused
-}
-
-func (this *Style) Apply (object tomo.Object) event.Cookie {
-	pressed := false
-	hovered := false
-	box  := object.GetBox()
-	role := box.Role()
-
-	defaultSet, hoveredSet, pressedSet, focusedSet := this.setsFor(role)
-
-	updateStyle := func () {
-		if pressed {
-			this.execute(object, pressedSet)
-		} else if hovered {
-			this.execute(object, hoveredSet)
-		} else {
-			this.execute(object, defaultSet)
-		}
-		if box.Focused() && !pressed {
-			this.execute(object, focusedSet)
-		}
-	}
-	updateStyle()
-	
-	return event.MultiCookie (
-		box.OnFocusEnter(updateStyle),
-		box.OnFocusLeave(updateStyle),
-		box.OnMouseDown(func (button input.Button) {
-			if button != input.ButtonLeft { return }
-			pressed = true
-			updateStyle()
-		}),
-		box.OnMouseUp(func (button input.Button) {
-			if button != input.ButtonLeft { return }
-			pressed = false
-			updateStyle()
-		}),
-		box.OnMouseEnter(func () {
-			hovered = true
-			updateStyle()
-		}),
-		box.OnMouseLeave(func () {
-			hovered = false
-			updateStyle()
-		}))
-
-}
-
-func (this *Style) RGBA (c tomo.Color) (r, g, b, a uint32) {
-	if this.Colors == nil { return 0xFFFF, 0, 0xFFFF, 0xFFFF }
-	color, ok := this.Colors[c]
-	if !ok { return 0xFFFF, 0, 0xFFFF, 0xFFFF }
-	return color.RGBA()
-}
-
-// Close closes all cached textures this style has open. Do not call this while
-// the style is in use.
-func (this *Style) Close () error {
-	this.missing.Close()
-	this.missing = nil
-	for _, texture := range this.textures {
-		texture.Close()
-	}
-	this.textures = nil
-	return nil
-}

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
+}