Merge pull request #344 from bnema/chore/upstream-foundations
chore(deps): integrate approved upstream foundations
921 files · +28709 -25527
M docs/first-presentation.md +5 -2
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||
| 46 | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | |
| 47 | 47 | do not use a device model or other identifier. Publish only the seven reviewed | |
| 48 | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | |
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | |
| 50 | - | invalid run fails collection. | |
| 49 | + | must not be published. `metadata.json` derives the selected | |
| 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git | |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |
| 53 | + | run also fails collection. | |
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||||
| 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | ||
| 47 | do not use a device model or other identifier. Publish only the seven reviewed | 47 | do not use a device model or other identifier. Publish only the seven reviewed | ||
| 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | ||
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | 49 | + | must not be published. `metadata.json` derives the selected |
| 50 | - | invalid run fails collection. | 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |||
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |||
| 53 | + | run also fails collection. | |||
M go.mod +5 -5
| @@ -6,11 +6,11 @@ require ( | |||
| 6 | 6 | github.com/a-h/templ v0.3.1020 | |
| 7 | 7 | github.com/andybalholm/brotli v1.2.2 | |
| 8 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | |
| 9 | - | github.com/bnema/purego-cef v0.13.3 | |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | |
| 13 | - | github.com/bnema/puregotk v0.7.0 | |
| 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e | |
| 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe | |
| 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | 14 | github.com/charmbracelet/bubbles v1.0.0 | |
| 15 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 16 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -6,11 +6,11 @@ require ( | |||||
| 6 | github.com/a-h/templ v0.3.1020 | 6 | github.com/a-h/templ v0.3.1020 | ||
| 7 | github.com/andybalholm/brotli v1.2.2 | 7 | github.com/andybalholm/brotli v1.2.2 | ||
| 8 | github.com/bnema/purego v0.11.0-bnema.4 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | ||
| 9 | - | github.com/bnema/purego-cef v0.13.3 | 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c |
| 13 | - | github.com/bnema/puregotk v0.7.0 | 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 |
| 14 | github.com/charmbracelet/bubbles v1.0.0 | 14 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 15 | github.com/charmbracelet/bubbletea v1.3.10 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 16 | github.com/charmbracelet/lipgloss v1.1.0 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +12 -0 generated file: collapsed
A internal/infrastructure/persistence/sqlite/history_repo_benchmark_test.go +71 -0
| @@ -0,0 +1,71 @@ | |||
| 1 | + | package sqlite_test | |
| 2 | + | ||
| 3 | + | import ( | |
| 4 | + | "fmt" | |
| 5 | + | "path/filepath" | |
| 6 | + | "testing" | |
| 7 | + | ||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |
| 11 | + | ) | |
| 12 | + | ||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |
| 15 | + | // history suggestions use Search. | |
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |
| 17 | + | b.Helper() | |
| 18 | + | ||
| 19 | + | ctx := historyTestCtx() | |
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |
| 21 | + | if err != nil { | |
| 22 | + | b.Fatal(err) | |
| 23 | + | } | |
| 24 | + | ||
| 25 | + | b.Cleanup(func() { | |
| 26 | + | if err := db.Close(); err != nil { | |
| 27 | + | b.Errorf("close benchmark database: %v", err) | |
| 28 | + | } | |
| 29 | + | }) | |
| 30 | + | ||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |
| 32 | + | for i := range 200 { | |
| 33 | + | entry := &entity.HistoryEntry{ | |
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |
| 36 | + | } | |
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |
| 38 | + | b.Fatal(err) | |
| 39 | + | } | |
| 40 | + | } | |
| 41 | + | ||
| 42 | + | return repo, func() {} | |
| 43 | + | } | |
| 44 | + | ||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 47 | + | defer closeDB() | |
| 48 | + | ctx := historyTestCtx() | |
| 49 | + | ||
| 50 | + | b.ReportAllocs() | |
| 51 | + | b.ResetTimer() | |
| 52 | + | for range b.N { | |
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |
| 54 | + | b.Fatal(err) | |
| 55 | + | } | |
| 56 | + | } | |
| 57 | + | } | |
| 58 | + | ||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 61 | + | defer closeDB() | |
| 62 | + | ctx := historyTestCtx() | |
| 63 | + | ||
| 64 | + | b.ReportAllocs() | |
| 65 | + | b.ResetTimer() | |
| 66 | + | for range b.N { | |
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |
| 68 | + | b.Fatal(err) | |
| 69 | + | } | |
| 70 | + | } | |
| 71 | + | } | |
| @@ -0,0 +1,71 @@ | |||||
| 1 | + | package sqlite_test | |||
| 2 | + | ||||
| 3 | + | import ( | |||
| 4 | + | "fmt" | |||
| 5 | + | "path/filepath" | |||
| 6 | + | "testing" | |||
| 7 | + | ||||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |||
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |||
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |||
| 11 | + | ) | |||
| 12 | + | ||||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |||
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |||
| 15 | + | // history suggestions use Search. | |||
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |||
| 17 | + | b.Helper() | |||
| 18 | + | ||||
| 19 | + | ctx := historyTestCtx() | |||
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |||
| 21 | + | if err != nil { | |||
| 22 | + | b.Fatal(err) | |||
| 23 | + | } | |||
| 24 | + | ||||
| 25 | + | b.Cleanup(func() { | |||
| 26 | + | if err := db.Close(); err != nil { | |||
| 27 | + | b.Errorf("close benchmark database: %v", err) | |||
| 28 | + | } | |||
| 29 | + | }) | |||
| 30 | + | ||||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |||
| 32 | + | for i := range 200 { | |||
| 33 | + | entry := &entity.HistoryEntry{ | |||
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |||
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |||
| 36 | + | } | |||
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |||
| 38 | + | b.Fatal(err) | |||
| 39 | + | } | |||
| 40 | + | } | |||
| 41 | + | ||||
| 42 | + | return repo, func() {} | |||
| 43 | + | } | |||
| 44 | + | ||||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |||
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 47 | + | defer closeDB() | |||
| 48 | + | ctx := historyTestCtx() | |||
| 49 | + | ||||
| 50 | + | b.ReportAllocs() | |||
| 51 | + | b.ResetTimer() | |||
| 52 | + | for range b.N { | |||
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |||
| 54 | + | b.Fatal(err) | |||
| 55 | + | } | |||
| 56 | + | } | |||
| 57 | + | } | |||
| 58 | + | ||||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |||
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 61 | + | defer closeDB() | |||
| 62 | + | ctx := historyTestCtx() | |||
| 63 | + | ||||
| 64 | + | b.ReportAllocs() | |||
| 65 | + | b.ResetTimer() | |||
| 66 | + | for range b.N { | |||
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |||
| 68 | + | b.Fatal(err) | |||
| 69 | + | } | |||
| 70 | + | } | |||
| 71 | + | } | |||
M internal/logging/first_presentation_collector_test.go +132 -1
| @@ -2,6 +2,7 @@ package logging | |||
| 2 | 2 | ||
| 3 | 3 | import ( | |
| 4 | 4 | "encoding/json" | |
| 5 | + | "fmt" | |
| 5 | 6 | "os" | |
| 6 | 7 | "os/exec" | |
| 7 | 8 | "path/filepath" | |
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 143 | 144 | } | |
| 144 | 145 | for _, required := range []string{ | |
| 145 | 146 | `"measured_source_revision"`, | |
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |
| 146 | 148 | `"tag": "v0.8.4"`, | |
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | |
| 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, | |
| 148 | 150 | } { | |
| 149 | 151 | require.Contains(t, artifacts.String(), required) | |
| 150 | 152 | } | |
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 166 | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | |
| 167 | 169 | } | |
| 168 | 170 | ||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 173 | + | require.NoError(t, err) | |
| 174 | + | temp := t.TempDir() | |
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 177 | + | binary := filepath.Join(temp, "dumber") | |
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 179 | + | ||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |
| 181 | + | // hardcode; the collector must report what the selected module says. | |
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |
| 185 | + | output := filepath.Join(temp, "artifacts") | |
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 187 | + | cmd.Dir = repoRoot | |
| 188 | + | cmd.Env = append(os.Environ(), | |
| 189 | + | "DISPLAY=:test", | |
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 195 | + | ) | |
| 196 | + | result, err := cmd.CombinedOutput() | |
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |
| 198 | + | ||
| 199 | + | var metadata struct { | |
| 200 | + | Upstream struct { | |
| 201 | + | Module string `json:"module"` | |
| 202 | + | Version string `json:"version"` | |
| 203 | + | Tag string `json:"tag"` | |
| 204 | + | Revision string `json:"revision"` | |
| 205 | + | } `json:"upstream"` | |
| 206 | + | } | |
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |
| 208 | + | require.NoError(t, err) | |
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |
| 214 | + | ||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 216 | + | require.NoError(t, err) | |
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |
| 218 | + | } | |
| 219 | + | ||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 222 | + | require.NoError(t, err) | |
| 223 | + | ||
| 224 | + | for _, test := range []struct { | |
| 225 | + | name, version, revision, ref string | |
| 226 | + | }{ | |
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |
| 230 | + | } { | |
| 231 | + | t.Run(test.name, func(t *testing.T) { | |
| 232 | + | temp := t.TempDir() | |
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 235 | + | binary := filepath.Join(temp, "dumber") | |
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 237 | + | ||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |
| 239 | + | output := filepath.Join(temp, "artifacts") | |
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 241 | + | cmd.Dir = repoRoot | |
| 242 | + | cmd.Env = append(os.Environ(), | |
| 243 | + | "DISPLAY=:test", | |
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 248 | + | ) | |
| 249 | + | result, runErr := cmd.CombinedOutput() | |
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |
| 252 | + | require.NotContains(t, string(result), temp) | |
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |
| 254 | + | for _, name := range runArtifactNames() { | |
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |
| 256 | + | } | |
| 257 | + | }) | |
| 258 | + | } | |
| 259 | + | } | |
| 260 | + | ||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |
| 262 | + | t.Helper() | |
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |
| 264 | + | info := map[string]any{"Version": version} | |
| 265 | + | if revision != "" { | |
| 266 | + | info["Origin"] = map[string]string{ | |
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |
| 268 | + | } | |
| 269 | + | } | |
| 270 | + | infoJSON, err := json.Marshal(info) | |
| 271 | + | require.NoError(t, err) | |
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |
| 273 | + | ||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |
| 276 | + | }) | |
| 277 | + | require.NoError(t, err) | |
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |
| 280 | + | }) | |
| 281 | + | require.NoError(t, err) | |
| 282 | + | binDir := filepath.Join(temp, "bin") | |
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |
| 284 | + | goBin := filepath.Join(binDir, "go") | |
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |
| 287 | + | printf '%%s\n' '%s' | |
| 288 | + | exit 0 | |
| 289 | + | fi | |
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |
| 291 | + | printf '%%s\n' '%s' | |
| 292 | + | exit 0 | |
| 293 | + | fi | |
| 294 | + | exit 1 | |
| 295 | + | `, selectedJSON, version, downloadedJSON) | |
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |
| 297 | + | return goBin | |
| 298 | + | } | |
| 299 | + | ||
| 169 | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | |
| 170 | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 171 | 302 | require.NoError(t, err) | |
| @@ -2,6 +2,7 @@ package logging | |||||
| 2 | 2 | ||||
| 3 | import ( | 3 | import ( | ||
| 4 | "encoding/json" | 4 | "encoding/json" | ||
| 5 | + | "fmt" | |||
| 5 | "os" | 6 | "os" | ||
| 6 | "os/exec" | 7 | "os/exec" | ||
| 7 | "path/filepath" | 8 | "path/filepath" | ||
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 143 | } | 144 | } | ||
| 144 | for _, required := range []string{ | 145 | for _, required := range []string{ | ||
| 145 | `"measured_source_revision"`, | 146 | `"measured_source_revision"`, | ||
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |||
| 146 | `"tag": "v0.8.4"`, | 148 | `"tag": "v0.8.4"`, | ||
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, |
| 148 | } { | 150 | } { | ||
| 149 | require.Contains(t, artifacts.String(), required) | 151 | require.Contains(t, artifacts.String(), required) | ||
| 150 | } | 152 | } | ||
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 166 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | ||
| 167 | } | 169 | } | ||
| 168 | 170 | ||||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |||
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 173 | + | require.NoError(t, err) | |||
| 174 | + | temp := t.TempDir() | |||
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 177 | + | binary := filepath.Join(temp, "dumber") | |||
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 179 | + | ||||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |||
| 181 | + | // hardcode; the collector must report what the selected module says. | |||
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |||
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |||
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |||
| 185 | + | output := filepath.Join(temp, "artifacts") | |||
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 187 | + | cmd.Dir = repoRoot | |||
| 188 | + | cmd.Env = append(os.Environ(), | |||
| 189 | + | "DISPLAY=:test", | |||
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |||
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 195 | + | ) | |||
| 196 | + | result, err := cmd.CombinedOutput() | |||
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |||
| 198 | + | ||||
| 199 | + | var metadata struct { | |||
| 200 | + | Upstream struct { | |||
| 201 | + | Module string `json:"module"` | |||
| 202 | + | Version string `json:"version"` | |||
| 203 | + | Tag string `json:"tag"` | |||
| 204 | + | Revision string `json:"revision"` | |||
| 205 | + | } `json:"upstream"` | |||
| 206 | + | } | |||
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |||
| 208 | + | require.NoError(t, err) | |||
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |||
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |||
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |||
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |||
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |||
| 214 | + | ||||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 216 | + | require.NoError(t, err) | |||
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |||
| 218 | + | } | |||
| 219 | + | ||||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |||
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 222 | + | require.NoError(t, err) | |||
| 223 | + | ||||
| 224 | + | for _, test := range []struct { | |||
| 225 | + | name, version, revision, ref string | |||
| 226 | + | }{ | |||
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |||
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |||
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |||
| 230 | + | } { | |||
| 231 | + | t.Run(test.name, func(t *testing.T) { | |||
| 232 | + | temp := t.TempDir() | |||
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 235 | + | binary := filepath.Join(temp, "dumber") | |||
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 237 | + | ||||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |||
| 239 | + | output := filepath.Join(temp, "artifacts") | |||
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 241 | + | cmd.Dir = repoRoot | |||
| 242 | + | cmd.Env = append(os.Environ(), | |||
| 243 | + | "DISPLAY=:test", | |||
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 248 | + | ) | |||
| 249 | + | result, runErr := cmd.CombinedOutput() | |||
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |||
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |||
| 252 | + | require.NotContains(t, string(result), temp) | |||
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |||
| 254 | + | for _, name := range runArtifactNames() { | |||
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |||
| 256 | + | } | |||
| 257 | + | }) | |||
| 258 | + | } | |||
| 259 | + | } | |||
| 260 | + | ||||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |||
| 262 | + | t.Helper() | |||
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |||
| 264 | + | info := map[string]any{"Version": version} | |||
| 265 | + | if revision != "" { | |||
| 266 | + | info["Origin"] = map[string]string{ | |||
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |||
| 268 | + | } | |||
| 269 | + | } | |||
| 270 | + | infoJSON, err := json.Marshal(info) | |||
| 271 | + | require.NoError(t, err) | |||
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |||
| 273 | + | ||||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |||
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |||
| 276 | + | }) | |||
| 277 | + | require.NoError(t, err) | |||
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |||
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |||
| 280 | + | }) | |||
| 281 | + | require.NoError(t, err) | |||
| 282 | + | binDir := filepath.Join(temp, "bin") | |||
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |||
| 284 | + | goBin := filepath.Join(binDir, "go") | |||
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |||
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |||
| 287 | + | printf '%%s\n' '%s' | |||
| 288 | + | exit 0 | |||
| 289 | + | fi | |||
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |||
| 291 | + | printf '%%s\n' '%s' | |||
| 292 | + | exit 0 | |||
| 293 | + | fi | |||
| 294 | + | exit 1 | |||
| 295 | + | `, selectedJSON, version, downloadedJSON) | |||
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |||
| 297 | + | return goBin | |||
| 298 | + | } | |||
| 299 | + | ||||
| 169 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | ||
| 170 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | ||
| 171 | require.NoError(t, err) | 302 | require.NoError(t, err) | ||
M scripts/collect_first_presentation.sh +78 -9
| @@ -31,8 +31,78 @@ else | |||
| 31 | 31 | fi | |
| 32 | 32 | readonly output | |
| 33 | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | |
| 34 | - | readonly upstream_tag="v0.8.4" | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | |
| 34 | + | ||
| 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS | |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |
| 38 | + | resolve_upstream_provenance() { | |
| 39 | + | local selected_metadata selected_version downloaded_metadata | |
| 40 | + | ||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 43 | + | exit 2 | |
| 44 | + | } | |
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |
| 46 | + | import json, sys | |
| 47 | + | try: | |
| 48 | + | metadata = json.loads(sys.argv[2]) | |
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |
| 50 | + | raise ValueError | |
| 51 | + | print(metadata["Version"]) | |
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 54 | + | PY | |
| 55 | + | )" || exit $? | |
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 58 | + | exit 2 | |
| 59 | + | } | |
| 60 | + | ||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |
| 62 | + | import json, re, sys | |
| 63 | + | ||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |
| 65 | + | ||
| 66 | + | def fail(): | |
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 69 | + | ||
| 70 | + | try: | |
| 71 | + | selected = json.loads(selected_raw) | |
| 72 | + | downloaded = json.loads(downloaded_raw) | |
| 73 | + | version = selected["Version"] | |
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |
| 75 | + | fail() | |
| 76 | + | if downloaded.get("Version") != version: | |
| 77 | + | fail() | |
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |
| 80 | + | if not match: | |
| 81 | + | fail() | |
| 82 | + | info_path = downloaded.get("Info") | |
| 83 | + | if not isinstance(info_path, str) or not info_path: | |
| 84 | + | fail() | |
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |
| 86 | + | info = json.load(info_file) | |
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |
| 89 | + | fail() | |
| 90 | + | revision = origin.get("Hash") | |
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |
| 92 | + | fail() | |
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |
| 94 | + | fail() | |
| 95 | + | if not revision.startswith(match.group(2)): | |
| 96 | + | fail() | |
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |
| 99 | + | fail() | |
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |
| 101 | + | fail() | |
| 102 | + | ||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |
| 104 | + | PY | |
| 105 | + | } | |
| 36 | 106 | ||
| 37 | 107 | # The artifact destination is caller-controlled. Never empty or recursively | |
| 38 | 108 | # clear it: collection only writes to a newly-created directory whose parent is | |
| @@ -66,10 +136,9 @@ prepare_output | |||
| 66 | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | |
| 67 | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | |
| 68 | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | |
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | |
| 71 | - | exit 2 | |
| 72 | - | } | |
| 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? | |
| 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" | |
| 141 | + | readonly upstream_version upstream_tag upstream_revision | |
| 73 | 142 | ||
| 74 | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | |
| 75 | 144 | # outside the committed artifact directory and always remove them. | |
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||
| 80 | 149 | rm -rf -- "$work_root" | |
| 81 | 150 | } | |
| 82 | 151 | trap cleanup_work_root EXIT | |
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 84 | 153 | import hashlib, json, os, platform, subprocess, sys | |
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | |
| 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] | |
| 86 | 155 | with open(binary, "rb") as candidate: | |
| 87 | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | |
| 88 | 157 | ||
| @@ -102,7 +171,7 @@ json.dump({ | |||
| 102 | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | |
| 103 | 172 | "timeout_seconds": int(timeout), | |
| 104 | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | |
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | |
| 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, | |
| 106 | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | |
| 107 | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | |
| 108 | 177 | }, open(path, "w"), indent=2, sort_keys=True) | |
| @@ -31,8 +31,78 @@ else | |||||
| 31 | fi | 31 | fi | ||
| 32 | readonly output | 32 | readonly output | ||
| 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | ||
| 34 | - | readonly upstream_tag="v0.8.4" | 34 | + | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |||
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |||
| 38 | + | resolve_upstream_provenance() { | |||
| 39 | + | local selected_metadata selected_version downloaded_metadata | |||
| 40 | + | ||||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |||
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 43 | + | exit 2 | |||
| 44 | + | } | |||
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |||
| 46 | + | import json, sys | |||
| 47 | + | try: | |||
| 48 | + | metadata = json.loads(sys.argv[2]) | |||
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |||
| 50 | + | raise ValueError | |||
| 51 | + | print(metadata["Version"]) | |||
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |||
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 54 | + | PY | |||
| 55 | + | )" || exit $? | |||
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |||
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 58 | + | exit 2 | |||
| 59 | + | } | |||
| 60 | + | ||||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |||
| 62 | + | import json, re, sys | |||
| 63 | + | ||||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |||
| 65 | + | ||||
| 66 | + | def fail(): | |||
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |||
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 69 | + | ||||
| 70 | + | try: | |||
| 71 | + | selected = json.loads(selected_raw) | |||
| 72 | + | downloaded = json.loads(downloaded_raw) | |||
| 73 | + | version = selected["Version"] | |||
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |||
| 75 | + | fail() | |||
| 76 | + | if downloaded.get("Version") != version: | |||
| 77 | + | fail() | |||
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |||
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |||
| 80 | + | if not match: | |||
| 81 | + | fail() | |||
| 82 | + | info_path = downloaded.get("Info") | |||
| 83 | + | if not isinstance(info_path, str) or not info_path: | |||
| 84 | + | fail() | |||
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |||
| 86 | + | info = json.load(info_file) | |||
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |||
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |||
| 89 | + | fail() | |||
| 90 | + | revision = origin.get("Hash") | |||
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |||
| 92 | + | fail() | |||
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |||
| 94 | + | fail() | |||
| 95 | + | if not revision.startswith(match.group(2)): | |||
| 96 | + | fail() | |||
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |||
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |||
| 99 | + | fail() | |||
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |||
| 101 | + | fail() | |||
| 102 | + | ||||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |||
| 104 | + | PY | |||
| 105 | + | } | |||
| 36 | 106 | ||||
| 37 | # The artifact destination is caller-controlled. Never empty or recursively | 107 | # The artifact destination is caller-controlled. Never empty or recursively | ||
| 38 | # clear it: collection only writes to a newly-created directory whose parent is | 108 | # clear it: collection only writes to a newly-created directory whose parent is | ||
| @@ -66,10 +136,9 @@ prepare_output | |||||
| 66 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | ||
| 67 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | ||
| 68 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | ||
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" |
| 71 | - | exit 2 | 141 | + | readonly upstream_version upstream_tag upstream_revision |
| 72 | - | } | |||
| 73 | 142 | ||||
| 74 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | ||
| 75 | # outside the committed artifact directory and always remove them. | 144 | # outside the committed artifact directory and always remove them. | ||
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||||
| 80 | rm -rf -- "$work_root" | 149 | rm -rf -- "$work_root" | ||
| 81 | } | 150 | } | ||
| 82 | trap cleanup_work_root EXIT | 151 | trap cleanup_work_root EXIT | ||
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' |
| 84 | import hashlib, json, os, platform, subprocess, sys | 153 | import hashlib, json, os, platform, subprocess, sys | ||
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] |
| 86 | with open(binary, "rb") as candidate: | 155 | with open(binary, "rb") as candidate: | ||
| 87 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | ||
| 88 | 157 | ||||
| @@ -102,7 +171,7 @@ json.dump({ | |||||
| 102 | "binary": {"label": "dumber", "sha256": binary_sha256}, | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | ||
| 103 | "timeout_seconds": int(timeout), | 172 | "timeout_seconds": int(timeout), | ||
| 104 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | ||
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, |
| 106 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | ||
| 107 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | ||
| 108 | }, open(path, "w"), indent=2, sort_keys=True) | 177 | }, open(path, "w"), indent=2, sort_keys=True) | ||
M vendor/github.com/bnema/purego-cef/cef/bridge.go +8 -13 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/cefadapter/accelerated_paint.go +34 -37 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/dmabuf/frame.go +38 -19 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/gtkgdk/renderer.go +89 -69 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player.go +5 -0 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player_rt.go +10 -6 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/pwbuffer.go +66 -32 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/driver/driver.go +268 -63 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/db.go +8 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/core/rows.go +13 -0 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/loader/loader.go +23 -5 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/internal/ports/in/ports_gen.go +3 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +197 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +10 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +99 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +95 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +33 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +66 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +10 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +22 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +23 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +47 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +33 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +47 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +34 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +45 -38
| @@ -93,6 +93,7 @@ type DialogPresentationMode int | |||
| 93 | 93 | var xDialogPresentationModeGLibType func() types.GType | |
| 94 | 94 | ||
| 95 | 95 | func DialogPresentationModeGLibType() types.GType { | |
| 96 | + | core.LazyRegister(&xDialogPresentationModeGLibType, "ADW", "adw_dialog_presentation_mode_get_type", false) | |
| 96 | 97 | return xDialogPresentationModeGLibType() | |
| 97 | 98 | } | |
| 98 | 99 | ||
| @@ -176,6 +177,7 @@ type Dialog struct { | |||
| 176 | 177 | var xDialogGLibType func() types.GType | |
| 177 | 178 | ||
| 178 | 179 | func DialogGLibType() types.GType { | |
| 180 | + | core.LazyRegister(&xDialogGLibType, "ADW", "adw_dialog_get_type", false) | |
| 179 | 181 | return xDialogGLibType() | |
| 180 | 182 | } | |
| 181 | 183 | ||
| @@ -189,6 +191,7 @@ var xNewDialog func() uintptr | |||
| 189 | 191 | ||
| 190 | 192 | // Creates a new `AdwDialog`. | |
| 191 | 193 | func NewDialog() *Dialog { | |
| 194 | + | core.LazyRegister(&xNewDialog, "ADW", "adw_dialog_new", false) | |
| 192 | 195 | var cls *Dialog | |
| 193 | 196 | ||
| 194 | 197 | cret := xNewDialog() | |
| @@ -206,6 +209,8 @@ var xDialogAddBreakpoint func(uintptr, uintptr) | |||
| 206 | 209 | ||
| 207 | 210 | // Adds @breakpoint to @self. | |
| 208 | 211 | func (x *Dialog) AddBreakpoint(BreakpointVar *Breakpoint) { | |
| 212 | + | core.LazyRegister(&xDialogAddBreakpoint, "ADW", "adw_dialog_add_breakpoint", false) | |
| 213 | + | ||
| 209 | 214 | xDialogAddBreakpoint(x.GoPointer(), BreakpointVar.GoPointer()) | |
| 210 | 215 | } | |
| 211 | 216 | ||
| @@ -218,6 +223,8 @@ var xDialogClose func(uintptr) bool | |||
| 218 | 223 | // | |
| 219 | 224 | // See also: [method@Dialog.force_close]. | |
| 220 | 225 | func (x *Dialog) Close() bool { | |
| 226 | + | core.LazyRegister(&xDialogClose, "ADW", "adw_dialog_close", false) | |
| 227 | + | ||
| 221 | 228 | cret := xDialogClose(x.GoPointer()) | |
| 222 | 229 | return cret | |
| 223 | 230 | } | |
| @@ -229,6 +236,8 @@ var xDialogForceClose func(uintptr) | |||
| 229 | 236 | // Unlike [method@Dialog.close], it succeeds even if [property@Dialog:can-close] | |
| 230 | 237 | // is set to `FALSE`. | |
| 231 | 238 | func (x *Dialog) ForceClose() { | |
| 239 | + | core.LazyRegister(&xDialogForceClose, "ADW", "adw_dialog_force_close", false) | |
| 240 | + | ||
| 232 | 241 | xDialogForceClose(x.GoPointer()) | |
| 233 | 242 | } | |
| 234 | 243 | ||
| @@ -236,6 +245,8 @@ var xDialogGetCanClose func(uintptr) bool | |||
| 236 | 245 | ||
| 237 | 246 | // Gets whether @self can be closed. | |
| 238 | 247 | func (x *Dialog) GetCanClose() bool { | |
| 248 | + | core.LazyRegister(&xDialogGetCanClose, "ADW", "adw_dialog_get_can_close", false) | |
| 249 | + | ||
| 239 | 250 | cret := xDialogGetCanClose(x.GoPointer()) | |
| 240 | 251 | return cret | |
| 241 | 252 | } | |
| @@ -244,6 +255,7 @@ var xDialogGetChild func(uintptr) uintptr | |||
| 244 | 255 | ||
| 245 | 256 | // Gets the child widget of @self. | |
| 246 | 257 | func (x *Dialog) GetChild() *gtk.Widget { | |
| 258 | + | core.LazyRegister(&xDialogGetChild, "ADW", "adw_dialog_get_child", false) | |
| 247 | 259 | var cls *gtk.Widget | |
| 248 | 260 | ||
| 249 | 261 | cret := xDialogGetChild(x.GoPointer()) | |
| @@ -261,6 +273,8 @@ var xDialogGetContentHeight func(uintptr) int | |||
| 261 | 273 | ||
| 262 | 274 | // Gets the height of the dialog's contents. | |
| 263 | 275 | func (x *Dialog) GetContentHeight() int { | |
| 276 | + | core.LazyRegister(&xDialogGetContentHeight, "ADW", "adw_dialog_get_content_height", false) | |
| 277 | + | ||
| 264 | 278 | cret := xDialogGetContentHeight(x.GoPointer()) | |
| 265 | 279 | return cret | |
| 266 | 280 | } | |
| @@ -269,6 +283,8 @@ var xDialogGetContentWidth func(uintptr) int | |||
| 269 | 283 | ||
| 270 | 284 | // Gets the width of the dialog's contents. | |
| 271 | 285 | func (x *Dialog) GetContentWidth() int { | |
| 286 | + | core.LazyRegister(&xDialogGetContentWidth, "ADW", "adw_dialog_get_content_width", false) | |
| 287 | + | ||
| 272 | 288 | cret := xDialogGetContentWidth(x.GoPointer()) | |
| 273 | 289 | return cret | |
| 274 | 290 | } | |
| @@ -277,6 +293,7 @@ var xDialogGetCurrentBreakpoint func(uintptr) uintptr | |||
| 277 | 293 | ||
| 278 | 294 | // Gets the current breakpoint. | |
| 279 | 295 | func (x *Dialog) GetCurrentBreakpoint() *Breakpoint { | |
| 296 | + | core.LazyRegister(&xDialogGetCurrentBreakpoint, "ADW", "adw_dialog_get_current_breakpoint", false) | |
| 280 | 297 | var cls *Breakpoint | |
| 281 | 298 | ||
| 282 | 299 | cret := xDialogGetCurrentBreakpoint(x.GoPointer()) | |
| @@ -294,6 +311,7 @@ var xDialogGetDefaultWidget func(uintptr) uintptr | |||
| 294 | 311 | ||
| 295 | 312 | // Gets the default widget for @self. | |
| 296 | 313 | func (x *Dialog) GetDefaultWidget() *gtk.Widget { | |
| 314 | + | core.LazyRegister(&xDialogGetDefaultWidget, "ADW", "adw_dialog_get_default_widget", false) | |
| 297 | 315 | var cls *gtk.Widget | |
| 298 | 316 | ||
| 299 | 317 | cret := xDialogGetDefaultWidget(x.GoPointer()) | |
| @@ -311,6 +329,7 @@ var xDialogGetFocus func(uintptr) uintptr | |||
| 311 | 329 | ||
| 312 | 330 | // Gets the focus widget for @self. | |
| 313 | 331 | func (x *Dialog) GetFocus() *gtk.Widget { | |
| 332 | + | core.LazyRegister(&xDialogGetFocus, "ADW", "adw_dialog_get_focus", false) | |
| 314 | 333 | var cls *gtk.Widget | |
| 315 | 334 | ||
| 316 | 335 | cret := xDialogGetFocus(x.GoPointer()) | |
| @@ -328,6 +347,8 @@ var xDialogGetFollowsContentSize func(uintptr) bool | |||
| 328 | 347 | ||
| 329 | 348 | // Gets whether to size content of @self automatically. | |
| 330 | 349 | func (x *Dialog) GetFollowsContentSize() bool { | |
| 350 | + | core.LazyRegister(&xDialogGetFollowsContentSize, "ADW", "adw_dialog_get_follows_content_size", false) | |
| 351 | + | ||
| 331 | 352 | cret := xDialogGetFollowsContentSize(x.GoPointer()) | |
| 332 | 353 | return cret | |
| 333 | 354 | } | |
| @@ -336,6 +357,8 @@ var xDialogGetPresentationMode func(uintptr) DialogPresentationMode | |||
| 336 | 357 | ||
| 337 | 358 | // Gets presentation mode for @self. | |
| 338 | 359 | func (x *Dialog) GetPresentationMode() DialogPresentationMode { | |
| 360 | + | core.LazyRegister(&xDialogGetPresentationMode, "ADW", "adw_dialog_get_presentation_mode", false) | |
| 361 | + | ||
| 339 | 362 | cret := xDialogGetPresentationMode(x.GoPointer()) | |
| 340 | 363 | return cret | |
| 341 | 364 | } | |
| @@ -344,6 +367,8 @@ var xDialogGetTitle func(uintptr) string | |||
| 344 | 367 | ||
| 345 | 368 | // Gets the title of @self. | |
| 346 | 369 | func (x *Dialog) GetTitle() string { | |
| 370 | + | core.LazyRegister(&xDialogGetTitle, "ADW", "adw_dialog_get_title", false) | |
| 371 | + | ||
| 347 | 372 | cret := xDialogGetTitle(x.GoPointer()) | |
| 348 | 373 | return cret | |
| 349 | 374 | } | |
| @@ -357,6 +382,8 @@ var xDialogPresent func(uintptr, uintptr) | |||
| 357 | 382 | // If the window is an [class@Window] or [class@ApplicationWindow], the dialog | |
| 358 | 383 | // will be shown within it. Otherwise, it will be a separate window. | |
| 359 | 384 | func (x *Dialog) Present(ParentVar *gtk.Widget) { | |
| 385 | + | core.LazyRegister(&xDialogPresent, "ADW", "adw_dialog_present", false) | |
| 386 | + | ||
| 360 | 387 | xDialogPresent(x.GoPointer(), ParentVar.GoPointer()) | |
| 361 | 388 | } | |
| 362 | 389 | ||
| @@ -369,6 +396,8 @@ var xDialogSetCanClose func(uintptr, bool) | |||
| 369 | 396 | // emitted instead, and bottom sheet close swipe will be disabled. | |
| 370 | 397 | // [method@Dialog.force_close] still works. | |
| 371 | 398 | func (x *Dialog) SetCanClose(CanCloseVar bool) { | |
| 399 | + | core.LazyRegister(&xDialogSetCanClose, "ADW", "adw_dialog_set_can_close", false) | |
| 400 | + | ||
| 372 | 401 | xDialogSetCanClose(x.GoPointer(), CanCloseVar) | |
| 373 | 402 | } | |
| 374 | 403 | ||
| @@ -376,6 +405,8 @@ var xDialogSetChild func(uintptr, uintptr) | |||
| 376 | 405 | ||
| 377 | 406 | // Sets the child widget of @self. | |
| 378 | 407 | func (x *Dialog) SetChild(ChildVar *gtk.Widget) { | |
| 408 | + | core.LazyRegister(&xDialogSetChild, "ADW", "adw_dialog_set_child", false) | |
| 409 | + | ||
| 379 | 410 | xDialogSetChild(x.GoPointer(), ChildVar.GoPointer()) | |
| 380 | 411 | } | |
| 381 | 412 | ||
| @@ -387,6 +418,8 @@ var xDialogSetContentHeight func(uintptr, int) | |||
| 387 | 418 | // | |
| 388 | 419 | // See also: [property@Gtk.Window:default-height] | |
| 389 | 420 | func (x *Dialog) SetContentHeight(ContentHeightVar int) { | |
| 421 | + | core.LazyRegister(&xDialogSetContentHeight, "ADW", "adw_dialog_set_content_height", false) | |
| 422 | + | ||
| 390 | 423 | xDialogSetContentHeight(x.GoPointer(), ContentHeightVar) | |
| 391 | 424 | } | |
| 392 | 425 | ||
| @@ -398,6 +431,8 @@ var xDialogSetContentWidth func(uintptr, int) | |||
| 398 | 431 | // | |
| 399 | 432 | // See also: [property@Gtk.Window:default-width] | |
| 400 | 433 | func (x *Dialog) SetContentWidth(ContentWidthVar int) { | |
| 434 | + | core.LazyRegister(&xDialogSetContentWidth, "ADW", "adw_dialog_set_content_width", false) | |
| 435 | + | ||
| 401 | 436 | xDialogSetContentWidth(x.GoPointer(), ContentWidthVar) | |
| 402 | 437 | } | |
| 403 | 438 | ||
| @@ -407,6 +442,8 @@ var xDialogSetDefaultWidget func(uintptr, uintptr) | |||
| 407 | 442 | // | |
| 408 | 443 | // It's activated when the user presses Enter. | |
| 409 | 444 | func (x *Dialog) SetDefaultWidget(DefaultWidgetVar *gtk.Widget) { | |
| 445 | + | core.LazyRegister(&xDialogSetDefaultWidget, "ADW", "adw_dialog_set_default_widget", false) | |
| 446 | + | ||
| 410 | 447 | xDialogSetDefaultWidget(x.GoPointer(), DefaultWidgetVar.GoPointer()) | |
| 411 | 448 | } | |
| 412 | 449 | ||
| @@ -421,6 +458,8 @@ var xDialogSetFocus func(uintptr, uintptr) | |||
| 421 | 458 | // to a particular widget in the dialog, it is usually more convenient to use | |
| 422 | 459 | // [method@Gtk.Widget.grab_focus] instead of this function. | |
| 423 | 460 | func (x *Dialog) SetFocus(FocusVar *gtk.Widget) { | |
| 461 | + | core.LazyRegister(&xDialogSetFocus, "ADW", "adw_dialog_set_focus", false) | |
| 462 | + | ||
| 424 | 463 | xDialogSetFocus(x.GoPointer(), FocusVar.GoPointer()) | |
| 425 | 464 | } | |
| 426 | 465 | ||
| @@ -434,6 +473,8 @@ var xDialogSetFollowsContentSize func(uintptr, bool) | |||
| 434 | 473 | // | |
| 435 | 474 | // See also: [property@Gtk.Window:resizable] | |
| 436 | 475 | func (x *Dialog) SetFollowsContentSize(FollowsContentSizeVar bool) { | |
| 476 | + | core.LazyRegister(&xDialogSetFollowsContentSize, "ADW", "adw_dialog_set_follows_content_size", false) | |
| 477 | + | ||
| 437 | 478 | xDialogSetFollowsContentSize(x.GoPointer(), FollowsContentSizeVar) | |
| 438 | 479 | } | |
| 439 | 480 | ||
| @@ -451,6 +492,8 @@ var xDialogSetPresentationMode func(uintptr, DialogPresentationMode) | |||
| 451 | 492 | // | |
| 452 | 493 | // Presentation mode does nothing for dialogs presented as a window. | |
| 453 | 494 | func (x *Dialog) SetPresentationMode(PresentationModeVar DialogPresentationMode) { | |
| 495 | + | core.LazyRegister(&xDialogSetPresentationMode, "ADW", "adw_dialog_set_presentation_mode", false) | |
| 496 | + | ||
| 454 | 497 | xDialogSetPresentationMode(x.GoPointer(), PresentationModeVar) | |
| 455 | 498 | } | |
| 456 | 499 | ||
| @@ -458,6 +501,8 @@ var xDialogSetTitle func(uintptr, string) | |||
| 458 | 501 | ||
| 459 | 502 | // Sets the title of @self. | |
| 460 | 503 | func (x *Dialog) SetTitle(TitleVar string) { | |
| 504 | + | core.LazyRegister(&xDialogSetTitle, "ADW", "adw_dialog_set_title", false) | |
| 505 | + | ||
| 461 | 506 | xDialogSetTitle(x.GoPointer(), TitleVar) | |
| 462 | 507 | } | |
| 463 | 508 | ||
| @@ -906,42 +951,4 @@ func (x *Dialog) GetBuildableId() string { | |||
| 906 | 951 | func init() { | |
| 907 | 952 | core.SetPackageName("ADW", "libadwaita-1") | |
| 908 | 953 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 909 | - | var libs []uintptr | |
| 910 | - | for _, libPath := range core.GetPaths("ADW") { | |
| 911 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 912 | - | if err != nil { | |
| 913 | - | panic(err) | |
| 914 | - | } | |
| 915 | - | libs = append(libs, lib) | |
| 916 | - | } | |
| 917 | - | ||
| 918 | - | core.PuregoSafeRegister(&xDialogPresentationModeGLibType, libs, "adw_dialog_presentation_mode_get_type") | |
| 919 | - | ||
| 920 | - | core.PuregoSafeRegister(&xDialogGLibType, libs, "adw_dialog_get_type") | |
| 921 | - | ||
| 922 | - | core.PuregoSafeRegister(&xNewDialog, libs, "adw_dialog_new") | |
| 923 | - | ||
| 924 | - | core.PuregoSafeRegister(&xDialogAddBreakpoint, libs, "adw_dialog_add_breakpoint") | |
| 925 | - | core.PuregoSafeRegister(&xDialogClose, libs, "adw_dialog_close") | |
| 926 | - | core.PuregoSafeRegister(&xDialogForceClose, libs, "adw_dialog_force_close") | |
| 927 | - | core.PuregoSafeRegister(&xDialogGetCanClose, libs, "adw_dialog_get_can_close") | |
| 928 | - | core.PuregoSafeRegister(&xDialogGetChild, libs, "adw_dialog_get_child") | |
| 929 | - | core.PuregoSafeRegister(&xDialogGetContentHeight, libs, "adw_dialog_get_content_height") | |
| 930 | - | core.PuregoSafeRegister(&xDialogGetContentWidth, libs, "adw_dialog_get_content_width") | |
| 931 | - | core.PuregoSafeRegister(&xDialogGetCurrentBreakpoint, libs, "adw_dialog_get_current_breakpoint") | |
| 932 | - | core.PuregoSafeRegister(&xDialogGetDefaultWidget, libs, "adw_dialog_get_default_widget") | |
| 933 | - | core.PuregoSafeRegister(&xDialogGetFocus, libs, "adw_dialog_get_focus") | |
| 934 | - | core.PuregoSafeRegister(&xDialogGetFollowsContentSize, libs, "adw_dialog_get_follows_content_size") | |
| 935 | - | core.PuregoSafeRegister(&xDialogGetPresentationMode, libs, "adw_dialog_get_presentation_mode") | |
| 936 | - | core.PuregoSafeRegister(&xDialogGetTitle, libs, "adw_dialog_get_title") | |
| 937 | - | core.PuregoSafeRegister(&xDialogPresent, libs, "adw_dialog_present") | |
| 938 | - | core.PuregoSafeRegister(&xDialogSetCanClose, libs, "adw_dialog_set_can_close") | |
| 939 | - | core.PuregoSafeRegister(&xDialogSetChild, libs, "adw_dialog_set_child") | |
| 940 | - | core.PuregoSafeRegister(&xDialogSetContentHeight, libs, "adw_dialog_set_content_height") | |
| 941 | - | core.PuregoSafeRegister(&xDialogSetContentWidth, libs, "adw_dialog_set_content_width") | |
| 942 | - | core.PuregoSafeRegister(&xDialogSetDefaultWidget, libs, "adw_dialog_set_default_widget") | |
| 943 | - | core.PuregoSafeRegister(&xDialogSetFocus, libs, "adw_dialog_set_focus") | |
| 944 | - | core.PuregoSafeRegister(&xDialogSetFollowsContentSize, libs, "adw_dialog_set_follows_content_size") | |
| 945 | - | core.PuregoSafeRegister(&xDialogSetPresentationMode, libs, "adw_dialog_set_presentation_mode") | |
| 946 | - | core.PuregoSafeRegister(&xDialogSetTitle, libs, "adw_dialog_set_title") | |
| 947 | 954 | } | |
| @@ -93,6 +93,7 @@ type DialogPresentationMode int | |||||
| 93 | var xDialogPresentationModeGLibType func() types.GType | 93 | var xDialogPresentationModeGLibType func() types.GType | ||
| 94 | 94 | ||||
| 95 | func DialogPresentationModeGLibType() types.GType { | 95 | func DialogPresentationModeGLibType() types.GType { | ||
| 96 | + | core.LazyRegister(&xDialogPresentationModeGLibType, "ADW", "adw_dialog_presentation_mode_get_type", false) | |||
| 96 | return xDialogPresentationModeGLibType() | 97 | return xDialogPresentationModeGLibType() | ||
| 97 | } | 98 | } | ||
| 98 | 99 | ||||
| @@ -176,6 +177,7 @@ type Dialog struct { | |||||
| 176 | var xDialogGLibType func() types.GType | 177 | var xDialogGLibType func() types.GType | ||
| 177 | 178 | ||||
| 178 | func DialogGLibType() types.GType { | 179 | func DialogGLibType() types.GType { | ||
| 180 | + | core.LazyRegister(&xDialogGLibType, "ADW", "adw_dialog_get_type", false) | |||
| 179 | return xDialogGLibType() | 181 | return xDialogGLibType() | ||
| 180 | } | 182 | } | ||
| 181 | 183 | ||||
| @@ -189,6 +191,7 @@ var xNewDialog func() uintptr | |||||
| 189 | 191 | ||||
| 190 | // Creates a new `AdwDialog`. | 192 | // Creates a new `AdwDialog`. | ||
| 191 | func NewDialog() *Dialog { | 193 | func NewDialog() *Dialog { | ||
| 194 | + | core.LazyRegister(&xNewDialog, "ADW", "adw_dialog_new", false) | |||
| 192 | var cls *Dialog | 195 | var cls *Dialog | ||
| 193 | 196 | ||||
| 194 | cret := xNewDialog() | 197 | cret := xNewDialog() | ||
| @@ -206,6 +209,8 @@ var xDialogAddBreakpoint func(uintptr, uintptr) | |||||
| 206 | 209 | ||||
| 207 | // Adds @breakpoint to @self. | 210 | // Adds @breakpoint to @self. | ||
| 208 | func (x *Dialog) AddBreakpoint(BreakpointVar *Breakpoint) { | 211 | func (x *Dialog) AddBreakpoint(BreakpointVar *Breakpoint) { | ||
| 212 | + | core.LazyRegister(&xDialogAddBreakpoint, "ADW", "adw_dialog_add_breakpoint", false) | |||
| 213 | + | ||||
| 209 | xDialogAddBreakpoint(x.GoPointer(), BreakpointVar.GoPointer()) | 214 | xDialogAddBreakpoint(x.GoPointer(), BreakpointVar.GoPointer()) | ||
| 210 | } | 215 | } | ||
| 211 | 216 | ||||
| @@ -218,6 +223,8 @@ var xDialogClose func(uintptr) bool | |||||
| 218 | // | 223 | // | ||
| 219 | // See also: [method@Dialog.force_close]. | 224 | // See also: [method@Dialog.force_close]. | ||
| 220 | func (x *Dialog) Close() bool { | 225 | func (x *Dialog) Close() bool { | ||
| 226 | + | core.LazyRegister(&xDialogClose, "ADW", "adw_dialog_close", false) | |||
| 227 | + | ||||
| 221 | cret := xDialogClose(x.GoPointer()) | 228 | cret := xDialogClose(x.GoPointer()) | ||
| 222 | return cret | 229 | return cret | ||
| 223 | } | 230 | } | ||
| @@ -229,6 +236,8 @@ var xDialogForceClose func(uintptr) | |||||
| 229 | // Unlike [method@Dialog.close], it succeeds even if [property@Dialog:can-close] | 236 | // Unlike [method@Dialog.close], it succeeds even if [property@Dialog:can-close] | ||
| 230 | // is set to `FALSE`. | 237 | // is set to `FALSE`. | ||
| 231 | func (x *Dialog) ForceClose() { | 238 | func (x *Dialog) ForceClose() { | ||
| 239 | + | core.LazyRegister(&xDialogForceClose, "ADW", "adw_dialog_force_close", false) | |||
| 240 | + | ||||
| 232 | xDialogForceClose(x.GoPointer()) | 241 | xDialogForceClose(x.GoPointer()) | ||
| 233 | } | 242 | } | ||
| 234 | 243 | ||||
| @@ -236,6 +245,8 @@ var xDialogGetCanClose func(uintptr) bool | |||||
| 236 | 245 | ||||
| 237 | // Gets whether @self can be closed. | 246 | // Gets whether @self can be closed. | ||
| 238 | func (x *Dialog) GetCanClose() bool { | 247 | func (x *Dialog) GetCanClose() bool { | ||
| 248 | + | core.LazyRegister(&xDialogGetCanClose, "ADW", "adw_dialog_get_can_close", false) | |||
| 249 | + | ||||
| 239 | cret := xDialogGetCanClose(x.GoPointer()) | 250 | cret := xDialogGetCanClose(x.GoPointer()) | ||
| 240 | return cret | 251 | return cret | ||
| 241 | } | 252 | } | ||
| @@ -244,6 +255,7 @@ var xDialogGetChild func(uintptr) uintptr | |||||
| 244 | 255 | ||||
| 245 | // Gets the child widget of @self. | 256 | // Gets the child widget of @self. | ||
| 246 | func (x *Dialog) GetChild() *gtk.Widget { | 257 | func (x *Dialog) GetChild() *gtk.Widget { | ||
| 258 | + | core.LazyRegister(&xDialogGetChild, "ADW", "adw_dialog_get_child", false) | |||
| 247 | var cls *gtk.Widget | 259 | var cls *gtk.Widget | ||
| 248 | 260 | ||||
| 249 | cret := xDialogGetChild(x.GoPointer()) | 261 | cret := xDialogGetChild(x.GoPointer()) | ||
| @@ -261,6 +273,8 @@ var xDialogGetContentHeight func(uintptr) int | |||||
| 261 | 273 | ||||
| 262 | // Gets the height of the dialog's contents. | 274 | // Gets the height of the dialog's contents. | ||
| 263 | func (x *Dialog) GetContentHeight() int { | 275 | func (x *Dialog) GetContentHeight() int { | ||
| 276 | + | core.LazyRegister(&xDialogGetContentHeight, "ADW", "adw_dialog_get_content_height", false) | |||
| 277 | + | ||||
| 264 | cret := xDialogGetContentHeight(x.GoPointer()) | 278 | cret := xDialogGetContentHeight(x.GoPointer()) | ||
| 265 | return cret | 279 | return cret | ||
| 266 | } | 280 | } | ||
| @@ -269,6 +283,8 @@ var xDialogGetContentWidth func(uintptr) int | |||||
| 269 | 283 | ||||
| 270 | // Gets the width of the dialog's contents. | 284 | // Gets the width of the dialog's contents. | ||
| 271 | func (x *Dialog) GetContentWidth() int { | 285 | func (x *Dialog) GetContentWidth() int { | ||
| 286 | + | core.LazyRegister(&xDialogGetContentWidth, "ADW", "adw_dialog_get_content_width", false) | |||
| 287 | + | ||||
| 272 | cret := xDialogGetContentWidth(x.GoPointer()) | 288 | cret := xDialogGetContentWidth(x.GoPointer()) | ||
| 273 | return cret | 289 | return cret | ||
| 274 | } | 290 | } | ||
| @@ -277,6 +293,7 @@ var xDialogGetCurrentBreakpoint func(uintptr) uintptr | |||||
| 277 | 293 | ||||
| 278 | // Gets the current breakpoint. | 294 | // Gets the current breakpoint. | ||
| 279 | func (x *Dialog) GetCurrentBreakpoint() *Breakpoint { | 295 | func (x *Dialog) GetCurrentBreakpoint() *Breakpoint { | ||
| 296 | + | core.LazyRegister(&xDialogGetCurrentBreakpoint, "ADW", "adw_dialog_get_current_breakpoint", false) | |||
| 280 | var cls *Breakpoint | 297 | var cls *Breakpoint | ||
| 281 | 298 | ||||
| 282 | cret := xDialogGetCurrentBreakpoint(x.GoPointer()) | 299 | cret := xDialogGetCurrentBreakpoint(x.GoPointer()) | ||
| @@ -294,6 +311,7 @@ var xDialogGetDefaultWidget func(uintptr) uintptr | |||||
| 294 | 311 | ||||
| 295 | // Gets the default widget for @self. | 312 | // Gets the default widget for @self. | ||
| 296 | func (x *Dialog) GetDefaultWidget() *gtk.Widget { | 313 | func (x *Dialog) GetDefaultWidget() *gtk.Widget { | ||
| 314 | + | core.LazyRegister(&xDialogGetDefaultWidget, "ADW", "adw_dialog_get_default_widget", false) | |||
| 297 | var cls *gtk.Widget | 315 | var cls *gtk.Widget | ||
| 298 | 316 | ||||
| 299 | cret := xDialogGetDefaultWidget(x.GoPointer()) | 317 | cret := xDialogGetDefaultWidget(x.GoPointer()) | ||
| @@ -311,6 +329,7 @@ var xDialogGetFocus func(uintptr) uintptr | |||||
| 311 | 329 | ||||
| 312 | // Gets the focus widget for @self. | 330 | // Gets the focus widget for @self. | ||
| 313 | func (x *Dialog) GetFocus() *gtk.Widget { | 331 | func (x *Dialog) GetFocus() *gtk.Widget { | ||
| 332 | + | core.LazyRegister(&xDialogGetFocus, "ADW", "adw_dialog_get_focus", false) | |||
| 314 | var cls *gtk.Widget | 333 | var cls *gtk.Widget | ||
| 315 | 334 | ||||
| 316 | cret := xDialogGetFocus(x.GoPointer()) | 335 | cret := xDialogGetFocus(x.GoPointer()) | ||
| @@ -328,6 +347,8 @@ var xDialogGetFollowsContentSize func(uintptr) bool | |||||
| 328 | 347 | ||||
| 329 | // Gets whether to size content of @self automatically. | 348 | // Gets whether to size content of @self automatically. | ||
| 330 | func (x *Dialog) GetFollowsContentSize() bool { | 349 | func (x *Dialog) GetFollowsContentSize() bool { | ||
| 350 | + | core.LazyRegister(&xDialogGetFollowsContentSize, "ADW", "adw_dialog_get_follows_content_size", false) | |||
| 351 | + | ||||
| 331 | cret := xDialogGetFollowsContentSize(x.GoPointer()) | 352 | cret := xDialogGetFollowsContentSize(x.GoPointer()) | ||
| 332 | return cret | 353 | return cret | ||
| 333 | } | 354 | } | ||
| @@ -336,6 +357,8 @@ var xDialogGetPresentationMode func(uintptr) DialogPresentationMode | |||||
| 336 | 357 | ||||
| 337 | // Gets presentation mode for @self. | 358 | // Gets presentation mode for @self. | ||
| 338 | func (x *Dialog) GetPresentationMode() DialogPresentationMode { | 359 | func (x *Dialog) GetPresentationMode() DialogPresentationMode { | ||
| 360 | + | core.LazyRegister(&xDialogGetPresentationMode, "ADW", "adw_dialog_get_presentation_mode", false) | |||
| 361 | + | ||||
| 339 | cret := xDialogGetPresentationMode(x.GoPointer()) | 362 | cret := xDialogGetPresentationMode(x.GoPointer()) | ||
| 340 | return cret | 363 | return cret | ||
| 341 | } | 364 | } | ||
| @@ -344,6 +367,8 @@ var xDialogGetTitle func(uintptr) string | |||||
| 344 | 367 | ||||
| 345 | // Gets the title of @self. | 368 | // Gets the title of @self. | ||
| 346 | func (x *Dialog) GetTitle() string { | 369 | func (x *Dialog) GetTitle() string { | ||
| 370 | + | core.LazyRegister(&xDialogGetTitle, "ADW", "adw_dialog_get_title", false) | |||
| 371 | + | ||||
| 347 | cret := xDialogGetTitle(x.GoPointer()) | 372 | cret := xDialogGetTitle(x.GoPointer()) | ||
| 348 | return cret | 373 | return cret | ||
| 349 | } | 374 | } | ||
| @@ -357,6 +382,8 @@ var xDialogPresent func(uintptr, uintptr) | |||||
| 357 | // If the window is an [class@Window] or [class@ApplicationWindow], the dialog | 382 | // If the window is an [class@Window] or [class@ApplicationWindow], the dialog | ||
| 358 | // will be shown within it. Otherwise, it will be a separate window. | 383 | // will be shown within it. Otherwise, it will be a separate window. | ||
| 359 | func (x *Dialog) Present(ParentVar *gtk.Widget) { | 384 | func (x *Dialog) Present(ParentVar *gtk.Widget) { | ||
| 385 | + | core.LazyRegister(&xDialogPresent, "ADW", "adw_dialog_present", false) | |||
| 386 | + | ||||
| 360 | xDialogPresent(x.GoPointer(), ParentVar.GoPointer()) | 387 | xDialogPresent(x.GoPointer(), ParentVar.GoPointer()) | ||
| 361 | } | 388 | } | ||
| 362 | 389 | ||||
| @@ -369,6 +396,8 @@ var xDialogSetCanClose func(uintptr, bool) | |||||
| 369 | // emitted instead, and bottom sheet close swipe will be disabled. | 396 | // emitted instead, and bottom sheet close swipe will be disabled. | ||
| 370 | // [method@Dialog.force_close] still works. | 397 | // [method@Dialog.force_close] still works. | ||
| 371 | func (x *Dialog) SetCanClose(CanCloseVar bool) { | 398 | func (x *Dialog) SetCanClose(CanCloseVar bool) { | ||
| 399 | + | core.LazyRegister(&xDialogSetCanClose, "ADW", "adw_dialog_set_can_close", false) | |||
| 400 | + | ||||
| 372 | xDialogSetCanClose(x.GoPointer(), CanCloseVar) | 401 | xDialogSetCanClose(x.GoPointer(), CanCloseVar) | ||
| 373 | } | 402 | } | ||
| 374 | 403 | ||||
| @@ -376,6 +405,8 @@ var xDialogSetChild func(uintptr, uintptr) | |||||
| 376 | 405 | ||||
| 377 | // Sets the child widget of @self. | 406 | // Sets the child widget of @self. | ||
| 378 | func (x *Dialog) SetChild(ChildVar *gtk.Widget) { | 407 | func (x *Dialog) SetChild(ChildVar *gtk.Widget) { | ||
| 408 | + | core.LazyRegister(&xDialogSetChild, "ADW", "adw_dialog_set_child", false) | |||
| 409 | + | ||||
| 379 | xDialogSetChild(x.GoPointer(), ChildVar.GoPointer()) | 410 | xDialogSetChild(x.GoPointer(), ChildVar.GoPointer()) | ||
| 380 | } | 411 | } | ||
| 381 | 412 | ||||
| @@ -387,6 +418,8 @@ var xDialogSetContentHeight func(uintptr, int) | |||||
| 387 | // | 418 | // | ||
| 388 | // See also: [property@Gtk.Window:default-height] | 419 | // See also: [property@Gtk.Window:default-height] | ||
| 389 | func (x *Dialog) SetContentHeight(ContentHeightVar int) { | 420 | func (x *Dialog) SetContentHeight(ContentHeightVar int) { | ||
| 421 | + | core.LazyRegister(&xDialogSetContentHeight, "ADW", "adw_dialog_set_content_height", false) | |||
| 422 | + | ||||
| 390 | xDialogSetContentHeight(x.GoPointer(), ContentHeightVar) | 423 | xDialogSetContentHeight(x.GoPointer(), ContentHeightVar) | ||
| 391 | } | 424 | } | ||
| 392 | 425 | ||||
| @@ -398,6 +431,8 @@ var xDialogSetContentWidth func(uintptr, int) | |||||
| 398 | // | 431 | // | ||
| 399 | // See also: [property@Gtk.Window:default-width] | 432 | // See also: [property@Gtk.Window:default-width] | ||
| 400 | func (x *Dialog) SetContentWidth(ContentWidthVar int) { | 433 | func (x *Dialog) SetContentWidth(ContentWidthVar int) { | ||
| 434 | + | core.LazyRegister(&xDialogSetContentWidth, "ADW", "adw_dialog_set_content_width", false) | |||
| 435 | + | ||||
| 401 | xDialogSetContentWidth(x.GoPointer(), ContentWidthVar) | 436 | xDialogSetContentWidth(x.GoPointer(), ContentWidthVar) | ||
| 402 | } | 437 | } | ||
| 403 | 438 | ||||
| @@ -407,6 +442,8 @@ var xDialogSetDefaultWidget func(uintptr, uintptr) | |||||
| 407 | // | 442 | // | ||
| 408 | // It's activated when the user presses Enter. | 443 | // It's activated when the user presses Enter. | ||
| 409 | func (x *Dialog) SetDefaultWidget(DefaultWidgetVar *gtk.Widget) { | 444 | func (x *Dialog) SetDefaultWidget(DefaultWidgetVar *gtk.Widget) { | ||
| 445 | + | core.LazyRegister(&xDialogSetDefaultWidget, "ADW", "adw_dialog_set_default_widget", false) | |||
| 446 | + | ||||
| 410 | xDialogSetDefaultWidget(x.GoPointer(), DefaultWidgetVar.GoPointer()) | 447 | xDialogSetDefaultWidget(x.GoPointer(), DefaultWidgetVar.GoPointer()) | ||
| 411 | } | 448 | } | ||
| 412 | 449 | ||||
| @@ -421,6 +458,8 @@ var xDialogSetFocus func(uintptr, uintptr) | |||||
| 421 | // to a particular widget in the dialog, it is usually more convenient to use | 458 | // to a particular widget in the dialog, it is usually more convenient to use | ||
| 422 | // [method@Gtk.Widget.grab_focus] instead of this function. | 459 | // [method@Gtk.Widget.grab_focus] instead of this function. | ||
| 423 | func (x *Dialog) SetFocus(FocusVar *gtk.Widget) { | 460 | func (x *Dialog) SetFocus(FocusVar *gtk.Widget) { | ||
| 461 | + | core.LazyRegister(&xDialogSetFocus, "ADW", "adw_dialog_set_focus", false) | |||
| 462 | + | ||||
| 424 | xDialogSetFocus(x.GoPointer(), FocusVar.GoPointer()) | 463 | xDialogSetFocus(x.GoPointer(), FocusVar.GoPointer()) | ||
| 425 | } | 464 | } | ||
| 426 | 465 | ||||
| @@ -434,6 +473,8 @@ var xDialogSetFollowsContentSize func(uintptr, bool) | |||||
| 434 | // | 473 | // | ||
| 435 | // See also: [property@Gtk.Window:resizable] | 474 | // See also: [property@Gtk.Window:resizable] | ||
| 436 | func (x *Dialog) SetFollowsContentSize(FollowsContentSizeVar bool) { | 475 | func (x *Dialog) SetFollowsContentSize(FollowsContentSizeVar bool) { | ||
| 476 | + | core.LazyRegister(&xDialogSetFollowsContentSize, "ADW", "adw_dialog_set_follows_content_size", false) | |||
| 477 | + | ||||
| 437 | xDialogSetFollowsContentSize(x.GoPointer(), FollowsContentSizeVar) | 478 | xDialogSetFollowsContentSize(x.GoPointer(), FollowsContentSizeVar) | ||
| 438 | } | 479 | } | ||
| 439 | 480 | ||||
| @@ -451,6 +492,8 @@ var xDialogSetPresentationMode func(uintptr, DialogPresentationMode) | |||||
| 451 | // | 492 | // | ||
| 452 | // Presentation mode does nothing for dialogs presented as a window. | 493 | // Presentation mode does nothing for dialogs presented as a window. | ||
| 453 | func (x *Dialog) SetPresentationMode(PresentationModeVar DialogPresentationMode) { | 494 | func (x *Dialog) SetPresentationMode(PresentationModeVar DialogPresentationMode) { | ||
| 495 | + | core.LazyRegister(&xDialogSetPresentationMode, "ADW", "adw_dialog_set_presentation_mode", false) | |||
| 496 | + | ||||
| 454 | xDialogSetPresentationMode(x.GoPointer(), PresentationModeVar) | 497 | xDialogSetPresentationMode(x.GoPointer(), PresentationModeVar) | ||
| 455 | } | 498 | } | ||
| 456 | 499 | ||||
| @@ -458,6 +501,8 @@ var xDialogSetTitle func(uintptr, string) | |||||
| 458 | 501 | ||||
| 459 | // Sets the title of @self. | 502 | // Sets the title of @self. | ||
| 460 | func (x *Dialog) SetTitle(TitleVar string) { | 503 | func (x *Dialog) SetTitle(TitleVar string) { | ||
| 504 | + | core.LazyRegister(&xDialogSetTitle, "ADW", "adw_dialog_set_title", false) | |||
| 505 | + | ||||
| 461 | xDialogSetTitle(x.GoPointer(), TitleVar) | 506 | xDialogSetTitle(x.GoPointer(), TitleVar) | ||
| 462 | } | 507 | } | ||
| 463 | 508 | ||||
| @@ -906,42 +951,4 @@ func (x *Dialog) GetBuildableId() string { | |||||
| 906 | func init() { | 951 | func init() { | ||
| 907 | core.SetPackageName("ADW", "libadwaita-1") | 952 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 908 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 953 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 909 | - | var libs []uintptr | |||
| 910 | - | for _, libPath := range core.GetPaths("ADW") { | |||
| 911 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 912 | - | if err != nil { | |||
| 913 | - | panic(err) | |||
| 914 | - | } | |||
| 915 | - | libs = append(libs, lib) | |||
| 916 | - | } | |||
| 917 | - | ||||
| 918 | - | core.PuregoSafeRegister(&xDialogPresentationModeGLibType, libs, "adw_dialog_presentation_mode_get_type") | |||
| 919 | - | ||||
| 920 | - | core.PuregoSafeRegister(&xDialogGLibType, libs, "adw_dialog_get_type") | |||
| 921 | - | ||||
| 922 | - | core.PuregoSafeRegister(&xNewDialog, libs, "adw_dialog_new") | |||
| 923 | - | ||||
| 924 | - | core.PuregoSafeRegister(&xDialogAddBreakpoint, libs, "adw_dialog_add_breakpoint") | |||
| 925 | - | core.PuregoSafeRegister(&xDialogClose, libs, "adw_dialog_close") | |||
| 926 | - | core.PuregoSafeRegister(&xDialogForceClose, libs, "adw_dialog_force_close") | |||
| 927 | - | core.PuregoSafeRegister(&xDialogGetCanClose, libs, "adw_dialog_get_can_close") | |||
| 928 | - | core.PuregoSafeRegister(&xDialogGetChild, libs, "adw_dialog_get_child") | |||
| 929 | - | core.PuregoSafeRegister(&xDialogGetContentHeight, libs, "adw_dialog_get_content_height") | |||
| 930 | - | core.PuregoSafeRegister(&xDialogGetContentWidth, libs, "adw_dialog_get_content_width") | |||
| 931 | - | core.PuregoSafeRegister(&xDialogGetCurrentBreakpoint, libs, "adw_dialog_get_current_breakpoint") | |||
| 932 | - | core.PuregoSafeRegister(&xDialogGetDefaultWidget, libs, "adw_dialog_get_default_widget") | |||
| 933 | - | core.PuregoSafeRegister(&xDialogGetFocus, libs, "adw_dialog_get_focus") | |||
| 934 | - | core.PuregoSafeRegister(&xDialogGetFollowsContentSize, libs, "adw_dialog_get_follows_content_size") | |||
| 935 | - | core.PuregoSafeRegister(&xDialogGetPresentationMode, libs, "adw_dialog_get_presentation_mode") | |||
| 936 | - | core.PuregoSafeRegister(&xDialogGetTitle, libs, "adw_dialog_get_title") | |||
| 937 | - | core.PuregoSafeRegister(&xDialogPresent, libs, "adw_dialog_present") | |||
| 938 | - | core.PuregoSafeRegister(&xDialogSetCanClose, libs, "adw_dialog_set_can_close") | |||
| 939 | - | core.PuregoSafeRegister(&xDialogSetChild, libs, "adw_dialog_set_child") | |||
| 940 | - | core.PuregoSafeRegister(&xDialogSetContentHeight, libs, "adw_dialog_set_content_height") | |||
| 941 | - | core.PuregoSafeRegister(&xDialogSetContentWidth, libs, "adw_dialog_set_content_width") | |||
| 942 | - | core.PuregoSafeRegister(&xDialogSetDefaultWidget, libs, "adw_dialog_set_default_widget") | |||
| 943 | - | core.PuregoSafeRegister(&xDialogSetFocus, libs, "adw_dialog_set_focus") | |||
| 944 | - | core.PuregoSafeRegister(&xDialogSetFollowsContentSize, libs, "adw_dialog_set_follows_content_size") | |||
| 945 | - | core.PuregoSafeRegister(&xDialogSetPresentationMode, libs, "adw_dialog_set_presentation_mode") | |||
| 946 | - | core.PuregoSafeRegister(&xDialogSetTitle, libs, "adw_dialog_set_title") | |||
| 947 | } | 954 | } | ||