merge: bring upstream main (b63e4a0, delta updates) onto main

.github/workflows/ci.yml

@@ -284,7 +284,7 @@ jobs:
       # native structure ABI tests are here for the same reason: they build only
       # on Windows.
       - name: Material contracts and controls (WARP)
-        run: go test ./internal/platform/windows ./ui ./components ./headless ./app -run 'Test(Backdrop|WindowBackdrop|Notification|TaskbarCreated|CompositionClear|CompositionFallback|CompositionCreation|CustomBackdrop|AcrylicAccent|LegacyAcrylic|RoundedOutline|Translucent|MonospaceFamilies|AlwaysOnTop|SaveDialogCheckbox|FileIcon|NativeStructureABI)' -count=1 -v
+        run: go test ./internal/platform/windows ./ui ./components ./headless ./app -run 'Test(Backdrop|WindowBackdrop|Notification|TaskbarCreated|CompositionClear|CompositionFallback|CompositionCreation|CustomBackdrop|AcrylicAccent|LegacyAcrylic|RoundedOutline|Translucent|MonospaceFamilies|EngineReportsTheFontsUnderline|AlwaysOnTop|SaveDialogCheckbox|FileIcon|NativeStructureABI)' -count=1 -v
       - name: Terminal keyboard routing
         run: go test ./internal/platform/windows -run '^TestATerminalGetsEditingKeysAndChordsAsRawKeys$' -count=1 -v
       - name: Native Windows global shortcut

README.md

@@ -54,7 +54,7 @@ Viva reaches Cocoa and Metal through cgo; on Linux, X11 with the system XCB and
 Vulkan loaders; on Windows, Win32 with Direct3D 11 and DirectWrite. Viva loads
 the system libraries at runtime and bundles none of them.
 
-The current release is `v0.6.1`; name it explicitly (`@v0.6.1`) to pin it. Guides,
+The current release is `v0.6.3`; name it explicitly (`@v0.6.3`) to pin it. Guides,
 the API reference, and a component catalog with live previews live in
 [`website/`](website/); run it with `npm run dev` there, or read them on
 [vivaui.dev](https://vivaui.dev/en/), which is also available in

README.zh-CN.md

@@ -34,7 +34,7 @@ viva dev .        # hot reload: save a file, the window updates and keeps its st
 
 环境要求：Go 1.26 或更新版本（缺失时 viva 会自己下载）。macOS 上需要 Xcode 命令行工具，因为 Viva 通过 cgo 访问 Cocoa 和 Metal；Linux 上需要带系统 XCB 和 Vulkan 加载库的 X11；Windows 上需要 Win32、Direct3D 11 和 DirectWrite。Viva 在运行时加载系统库，自身不捆绑任何一个。
 
-当前版本是 `v0.6.1`；要固定版本就写明（`@v0.6.1`）。指南、API 参考和带实时预览的组件目录在 [`website/`](website/) 里，本地用 `npm run dev` 运行；也已经发布在 [vivaui.dev](https://vivaui.dev/zh/)。
+当前版本是 `v0.6.3`；要固定版本就写明（`@v0.6.3`）。指南、API 参考和带实时预览的组件目录在 [`website/`](website/) 里，本地用 `npm run dev` 运行；也已经发布在 [vivaui.dev](https://vivaui.dev/zh/)。
 
 下面的一切描述的都是这个仓库：它的测量、它自己的程序，以及如何开发框架本身，而不是如何用框架。
 

THIRD_PARTY_NOTICES.md

@@ -260,3 +260,54 @@ The documentation site's JavaScript and CSS dependencies are pinned in
 `website/package-lock.json`. Their license texts are part of the packages
 installed from that lockfile; a deployed build should carry those notices in
 its own license page.
+
+### github.com/gabstv/go-bsdiff
+
+The MIT License (MIT)
+
+Copyright (c) 2019 Gabriel Ochsenhofer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+### github.com/dsnet/compress
+
+Copyright © 2015, Joe Tsai and The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+* Neither the copyright holder nor the names of its contributors may be used
+to endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

app/accessnodes.go

@@ -0,0 +1,136 @@
+package app
+
+import (
+	"github.com/vivaui/viva/gfx"
+	"github.com/vivaui/viva/internal/semantic"
+)
+
+// AccessNode is what assistive technology sees of one control in a frame: the
+// same information the platform adapters send to the system, without the
+// platform. Driver.Accessibility returns the last frame's tree.
+type AccessNode struct {
+	// ID names the control, as the hit it was made from does.
+	ID gfx.ID
+	// Role is the control's role; zero when it is a text without one.
+	Role gfx.Role
+	// Bounds is where the control was drawn, in logical pixels.
+	Bounds gfx.Rect
+
+	// Label is the accessible name, Value the control's value and Hint the
+	// short instruction usually read after the name.
+	Label string
+	Value string
+	Hint  string
+	// Description is a longer explanation than Hint.
+	Description string
+
+	Focused   bool
+	Disabled  bool
+	Checked   bool
+	Mixed     bool
+	Selected  bool
+	Expanded  bool
+	Multiline bool
+	ReadOnly  bool
+	Secure    bool
+	Focusable bool
+	// Expandable marks a control that opens and closes something, whatever its
+	// state now.
+	Expandable bool
+
+	// Level is a heading's level or a tree item's depth; zero when not stated.
+	Level uint8
+	// PosInSet and SetSize place the node among its siblings, counting from 1.
+	PosInSet, SetSize int32
+	// Live marks a region that announces changes to its content.
+	Live gfx.LiveRegion
+	// Range is a slider's or progress bar's number.
+	Range gfx.ValueRange
+	// Selection is the selected span of a focused text field's Value.
+	Selection AccessSelection
+}
+
+// AccessSelection is a span of a text node's Value in Unicode code points:
+// Start and End are the anchor and the caret, so End < Start for a selection
+// made backwards. Valid is false when the node has no caret.
+type AccessSelection struct {
+	Start, End int32
+	Valid      bool
+}
+
+// Accessibility returns the accessibility tree of the last painted frame, in
+// reading order. It is safe to call from the goroutine that drives the Driver
+// (the main thread in a test), as Snapshot is.
+func (driver *Driver) Accessibility() []AccessNode {
+	if driver == nil || driver.painter == nil {
+		return nil
+	}
+	nodes := driver.painter.accessibility
+	if len(nodes) == 0 {
+		return nil
+	}
+	out := make([]AccessNode, len(nodes))
+	for index, node := range nodes {
+		out[index] = AccessNode{
+			ID: node.ID, Role: accessRole(semantic.Role(node.Role)),
+			Bounds: gfx.Rect{X: node.X, Y: node.Y, Width: node.Width, Height: node.Height},
+			Label:  node.Label, Value: node.Value, Hint: node.Hint, Description: node.Description,
+			Focused: node.Focused, Disabled: node.Disabled, Checked: node.Checked, Mixed: node.Mixed,
+			Selected: node.Selected, Expanded: node.Expanded, Multiline: node.Multiline,
+			ReadOnly: node.ReadOnly, Secure: node.Secure, Focusable: node.Focusable,
+			Expandable: node.Expandable, Level: node.Level, PosInSet: node.PosInSet, SetSize: node.SetSize,
+			Live: node.Live, Range: node.Range,
+			Selection: AccessSelection{Start: node.Selection.Start, End: node.Selection.End, Valid: node.Selection.Valid},
+		}
+	}
+	return out
+}
+
+// accessRole maps the semantic role the platform adapters receive back to the
+// gfx.Role the application declared. Roles that have no gfx counterpart (a
+// text, an image, the application itself) are zero.
+func accessRole(role semantic.Role) gfx.Role {
+	switch role {
+	case semantic.RoleButton:
+		return gfx.RoleButton
+	case semantic.RoleLink:
+		return gfx.RoleLink
+	case semantic.RoleCheckbox:
+		return gfx.RoleCheckbox
+	case semantic.RoleRadio:
+		return gfx.RoleRadio
+	case semantic.RoleTab:
+		return gfx.RoleTab
+	case semantic.RoleMenuItem:
+		return gfx.RoleMenuItem
+	case semantic.RoleCombobox:
+		return gfx.RoleCombobox
+	case semantic.RoleSwitch:
+		return gfx.RoleSwitch
+	case semantic.RoleTextField:
+		return gfx.RoleTextField
+	case semantic.RoleSlider:
+		return gfx.RoleSlider
+	case semantic.RoleGroup:
+		return gfx.RoleGroup
+	case semantic.RoleMenu:
+		return gfx.RoleMenu
+	case semantic.RoleMenubar:
+		return gfx.RoleMenubar
+	case semantic.RoleListBox:
+		return gfx.RoleListBox
+	case semantic.RoleOption:
+		return gfx.RoleOption
+	case semantic.RoleGrid:
+		return gfx.RoleGrid
+	case semantic.RoleGridCell:
+		return gfx.RoleGridCell
+	case semantic.RoleHeading:
+		return gfx.RoleHeading
+	case semantic.RoleStatus:
+		return gfx.RoleStatus
+	case semantic.RoleSeparator:
+		return gfx.RoleSeparator
+	}
+	return 0
+}

app/app.go

@@ -81,6 +81,10 @@ type Config struct {
 	// that. Zero means 28,
 	// the system titlebar's own height. It only applies to WindowCustomTitlebar.
 	TitlebarHeight float32
+	// TrafficLightScale scales native macOS traffic lights in a custom titlebar.
+	// Values in (0, 1] shrink the controls around their original centers; zero
+	// preserves the system size. Other platforms ignore this setting.
+	TrafficLightScale float32
 	// WindowControls styles the minimize, maximize and close buttons Viva draws at
 	// the trailing end of a WindowCustomTitlebar's strip on Windows and Linux,
 	// where the system draws none for a window without a titlebar; macOS has its

app/application.go

@@ -20,6 +20,7 @@ var ErrNoWindows = errors.New("app: application opened no windows")
 // and Fullscreen() bool. It reports transitions through Config.OnFullscreen
 // before resize/frame callbacks and repaints afterward.
 // An always-on-top host additionally implements SetAlwaysOnTop(bool) error.
+// A size-capable host additionally implements SetSize(int, int) error.
 type WindowControl interface {
 	Close()
 	Hide()

app/capabilities.go

@@ -14,6 +14,7 @@ const (
 	CapabilityClipboardImage
 	CapabilityClipboardImageAsync
 	CapabilityClipboardFiles
+	CapabilityClipboardHTML
 	CapabilityFileDialogs
 	CapabilityFileDialogsAsync
 	CapabilityDirectoryDialogs

app/capabilities_native.go

@@ -13,6 +13,7 @@ func nativeCapabilities() Capabilities {
 		CapabilityClipboardImage |
 		CapabilityClipboardImageAsync |
 		CapabilityClipboardFiles |
+		CapabilityClipboardHTML |
 		CapabilityFileDialogs |
 		CapabilityFileDialogsAsync |
 		CapabilityDirectoryDialogs |

app/capabilities_web.go

@@ -6,6 +6,7 @@ func nativeCapabilities() Capabilities {
 	return Capabilities(
 		CapabilityFileDrop |
 			CapabilityClipboardTextAsync |
+			CapabilityClipboardHTML |
 			CapabilityClipboardImageAsync |
 			CapabilityFileDialogsAsync |
 			CapabilitySecretStoreAsync |

app/clipboard_html.go

@@ -0,0 +1,37 @@
+package app
+
+import (
+	"fmt"
+	"strings"
+)
+
+// SetClipboardHTML makes the system clipboard hold html as its rich flavour and
+// alt as its plain one, in a single write, for a copy a reader may take either
+// way: a query result that pastes with its colours into a document and as text
+// into an editor. alt is what plain-text readers get — deriving it from html is
+// the caller's job, not the clipboard's.
+//
+// The flavours are what each platform calls rich text: NSPasteboard's
+// public.html beside public.utf8-plain-text, Windows' registered "HTML Format"
+// (CF_HTML) with the plain text as CF_UNICODETEXT, and the CLIPBOARD
+// selection's text/html target beside UTF8_STRING. Nothing is written when
+// either string contains NUL; an empty html writes alt as plain text only, with
+// exactly SetClipboardText's shape, so the degradation is the copy the caller
+// already spelled out. The Web target cannot answer a synchronous write
+// (Clipboard.write resolves a Promise) and returns ErrAsyncRequired;
+// SetClipboardHTMLAsync writes both flavours there.
+func SetClipboardHTML(html, alt string) error {
+	if strings.IndexByte(html, 0) >= 0 {
+		return fmt.Errorf("app: clipboard html contains NUL")
+	}
+	if strings.IndexByte(alt, 0) >= 0 {
+		return fmt.Errorf("app: clipboard text contains NUL")
+	}
+	if html == "" {
+		return SetClipboardText(alt)
+	}
+	if err, handled := driverSetClipboardHTML(html, alt); handled {
+		return err
+	}
+	return nativeSetClipboardHTML(html, alt)
+}

app/clipboard_html_darwin.go

@@ -0,0 +1,9 @@
+//go:build darwin
+
+package app
+
+import darwinplatform "github.com/vivaui/viva/internal/platform/darwin"
+
+func nativeSetClipboardHTML(html, alt string) error {
+	return darwinplatform.SetClipboardHTML(html, alt)
+}

app/clipboard_html_js.go

@@ -0,0 +1,9 @@
+//go:build js && wasm
+
+package app
+
+import webplatform "github.com/vivaui/viva/internal/platform/web"
+
+func nativeSetClipboardHTML(html, alt string) error {
+	return webSystemError("write clipboard html", webplatform.SetClipboardHTML(html, alt))
+}

app/clipboard_html_linux.go

@@ -0,0 +1,9 @@
+//go:build linux
+
+package app
+
+import linuxplatform "github.com/vivaui/viva/internal/platform/linux"
+
+func nativeSetClipboardHTML(html, alt string) error {
+	return linuxSystemError(linuxplatform.SetClipboardHTML(html, alt))
+}