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
| @@ -5,7 +5,6 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | - | "github.com/bnema/purego" | |
| 9 | 8 | "github.com/bnema/puregotk/pkg/core" | |
| 10 | 9 | "github.com/bnema/puregotk/v4/gdk" | |
| 11 | 10 | "github.com/bnema/puregotk/v4/glib" | |
| @@ -57,6 +56,7 @@ type Carousel struct { | |||
| 57 | 56 | var xCarouselGLibType func() types.GType | |
| 58 | 57 | ||
| 59 | 58 | func CarouselGLibType() types.GType { | |
| 59 | + | core.LazyRegister(&xCarouselGLibType, "ADW", "adw_carousel_get_type", false) | |
| 60 | 60 | return xCarouselGLibType() | |
| 61 | 61 | } | |
| 62 | 62 | ||
| @@ -70,6 +70,7 @@ var xNewCarousel func() uintptr | |||
| 70 | 70 | ||
| 71 | 71 | // Creates a new `AdwCarousel`. | |
| 72 | 72 | func NewCarousel() *Carousel { | |
| 73 | + | core.LazyRegister(&xNewCarousel, "ADW", "adw_carousel_new", false) | |
| 73 | 74 | var cls *Carousel | |
| 74 | 75 | ||
| 75 | 76 | cret := xNewCarousel() | |
| @@ -87,6 +88,8 @@ var xCarouselAppend func(uintptr, uintptr) | |||
| 87 | 88 | ||
| 88 | 89 | // Appends @child to @self. | |
| 89 | 90 | func (x *Carousel) Append(ChildVar *gtk.Widget) { | |
| 91 | + | core.LazyRegister(&xCarouselAppend, "ADW", "adw_carousel_append", false) | |
| 92 | + | ||
| 90 | 93 | xCarouselAppend(x.GoPointer(), ChildVar.GoPointer()) | |
| 91 | 94 | } | |
| 92 | 95 | ||
| @@ -94,6 +97,8 @@ var xCarouselGetAllowLongSwipes func(uintptr) bool | |||
| 94 | 97 | ||
| 95 | 98 | // Gets whether to allow swiping for more than one page at a time. | |
| 96 | 99 | func (x *Carousel) GetAllowLongSwipes() bool { | |
| 100 | + | core.LazyRegister(&xCarouselGetAllowLongSwipes, "ADW", "adw_carousel_get_allow_long_swipes", false) | |
| 101 | + | ||
| 97 | 102 | cret := xCarouselGetAllowLongSwipes(x.GoPointer()) | |
| 98 | 103 | return cret | |
| 99 | 104 | } | |
| @@ -102,6 +107,8 @@ var xCarouselGetAllowMouseDrag func(uintptr) bool | |||
| 102 | 107 | ||
| 103 | 108 | // Sets whether @self can be dragged with mouse pointer. | |
| 104 | 109 | func (x *Carousel) GetAllowMouseDrag() bool { | |
| 110 | + | core.LazyRegister(&xCarouselGetAllowMouseDrag, "ADW", "adw_carousel_get_allow_mouse_drag", false) | |
| 111 | + | ||
| 105 | 112 | cret := xCarouselGetAllowMouseDrag(x.GoPointer()) | |
| 106 | 113 | return cret | |
| 107 | 114 | } | |
| @@ -110,6 +117,8 @@ var xCarouselGetAllowScrollWheel func(uintptr) bool | |||
| 110 | 117 | ||
| 111 | 118 | // Gets whether @self will respond to scroll wheel events. | |
| 112 | 119 | func (x *Carousel) GetAllowScrollWheel() bool { | |
| 120 | + | core.LazyRegister(&xCarouselGetAllowScrollWheel, "ADW", "adw_carousel_get_allow_scroll_wheel", false) | |
| 121 | + | ||
| 113 | 122 | cret := xCarouselGetAllowScrollWheel(x.GoPointer()) | |
| 114 | 123 | return cret | |
| 115 | 124 | } | |
| @@ -118,6 +127,8 @@ var xCarouselGetInteractive func(uintptr) bool | |||
| 118 | 127 | ||
| 119 | 128 | // Gets whether @self can be navigated. | |
| 120 | 129 | func (x *Carousel) GetInteractive() bool { | |
| 130 | + | core.LazyRegister(&xCarouselGetInteractive, "ADW", "adw_carousel_get_interactive", false) | |
| 131 | + | ||
| 121 | 132 | cret := xCarouselGetInteractive(x.GoPointer()) | |
| 122 | 133 | return cret | |
| 123 | 134 | } | |
| @@ -126,6 +137,8 @@ var xCarouselGetNPages func(uintptr) uint | |||
| 126 | 137 | ||
| 127 | 138 | // Gets the number of pages in @self. | |
| 128 | 139 | func (x *Carousel) GetNPages() uint { | |
| 140 | + | core.LazyRegister(&xCarouselGetNPages, "ADW", "adw_carousel_get_n_pages", false) | |
| 141 | + | ||
| 129 | 142 | cret := xCarouselGetNPages(x.GoPointer()) | |
| 130 | 143 | return cret | |
| 131 | 144 | } | |
| @@ -134,6 +147,7 @@ var xCarouselGetNthPage func(uintptr, uint) uintptr | |||
| 134 | 147 | ||
| 135 | 148 | // Gets the page at position @n. | |
| 136 | 149 | func (x *Carousel) GetNthPage(NVar uint) *gtk.Widget { | |
| 150 | + | core.LazyRegister(&xCarouselGetNthPage, "ADW", "adw_carousel_get_nth_page", false) | |
| 137 | 151 | var cls *gtk.Widget | |
| 138 | 152 | ||
| 139 | 153 | cret := xCarouselGetNthPage(x.GoPointer(), NVar) | |
| @@ -153,6 +167,8 @@ var xCarouselGetPosition func(uintptr) float64 | |||
| 153 | 167 | // | |
| 154 | 168 | // 1 matches 1 page. Use [method@Carousel.scroll_to] for changing it. | |
| 155 | 169 | func (x *Carousel) GetPosition() float64 { | |
| 170 | + | core.LazyRegister(&xCarouselGetPosition, "ADW", "adw_carousel_get_position", false) | |
| 171 | + | ||
| 156 | 172 | cret := xCarouselGetPosition(x.GoPointer()) | |
| 157 | 173 | return cret | |
| 158 | 174 | } | |
| @@ -161,6 +177,8 @@ var xCarouselGetRevealDuration func(uintptr) uint | |||
| 161 | 177 | ||
| 162 | 178 | // Gets the page reveal duration, in milliseconds. | |
| 163 | 179 | func (x *Carousel) GetRevealDuration() uint { | |
| 180 | + | core.LazyRegister(&xCarouselGetRevealDuration, "ADW", "adw_carousel_get_reveal_duration", false) | |
| 181 | + | ||
| 164 | 182 | cret := xCarouselGetRevealDuration(x.GoPointer()) | |
| 165 | 183 | return cret | |
| 166 | 184 | } | |
| @@ -169,6 +187,8 @@ var xCarouselGetScrollParams func(uintptr) uintptr | |||
| 169 | 187 | ||
| 170 | 188 | // Gets the scroll animation spring parameters for @self. | |
| 171 | 189 | func (x *Carousel) GetScrollParams() *SpringParams { | |
| 190 | + | core.LazyRegister(&xCarouselGetScrollParams, "ADW", "adw_carousel_get_scroll_params", false) | |
| 191 | + | ||
| 172 | 192 | cret := xCarouselGetScrollParams(x.GoPointer()) | |
| 173 | 193 | if cret == 0 { | |
| 174 | 194 | return nil | |
| @@ -180,6 +200,8 @@ var xCarouselGetSpacing func(uintptr) uint | |||
| 180 | 200 | ||
| 181 | 201 | // Gets spacing between pages in pixels. | |
| 182 | 202 | func (x *Carousel) GetSpacing() uint { | |
| 203 | + | core.LazyRegister(&xCarouselGetSpacing, "ADW", "adw_carousel_get_spacing", false) | |
| 204 | + | ||
| 183 | 205 | cret := xCarouselGetSpacing(x.GoPointer()) | |
| 184 | 206 | return cret | |
| 185 | 207 | } | |
| @@ -191,6 +213,8 @@ var xCarouselInsert func(uintptr, uintptr, int) | |||
| 191 | 213 | // If position is -1, or larger than the number of pages, | |
| 192 | 214 | // @child will be appended to the end. | |
| 193 | 215 | func (x *Carousel) Insert(ChildVar *gtk.Widget, PositionVar int) { | |
| 216 | + | core.LazyRegister(&xCarouselInsert, "ADW", "adw_carousel_insert", false) | |
| 217 | + | ||
| 194 | 218 | xCarouselInsert(x.GoPointer(), ChildVar.GoPointer(), PositionVar) | |
| 195 | 219 | } | |
| 196 | 220 | ||
| @@ -198,6 +222,8 @@ var xCarouselPrepend func(uintptr, uintptr) | |||
| 198 | 222 | ||
| 199 | 223 | // Prepends @child to @self. | |
| 200 | 224 | func (x *Carousel) Prepend(ChildVar *gtk.Widget) { | |
| 225 | + | core.LazyRegister(&xCarouselPrepend, "ADW", "adw_carousel_prepend", false) | |
| 226 | + | ||
| 201 | 227 | xCarouselPrepend(x.GoPointer(), ChildVar.GoPointer()) | |
| 202 | 228 | } | |
| 203 | 229 | ||
| @@ -205,6 +231,8 @@ var xCarouselRemove func(uintptr, uintptr) | |||
| 205 | 231 | ||
| 206 | 232 | // Removes @child from @self. | |
| 207 | 233 | func (x *Carousel) Remove(ChildVar *gtk.Widget) { | |
| 234 | + | core.LazyRegister(&xCarouselRemove, "ADW", "adw_carousel_remove", false) | |
| 235 | + | ||
| 208 | 236 | xCarouselRemove(x.GoPointer(), ChildVar.GoPointer()) | |
| 209 | 237 | } | |
| 210 | 238 | ||
| @@ -215,6 +243,8 @@ var xCarouselReorder func(uintptr, uintptr, int) | |||
| 215 | 243 | // If position is -1, or larger than the number of pages, @child will be moved | |
| 216 | 244 | // at the end. | |
| 217 | 245 | func (x *Carousel) Reorder(ChildVar *gtk.Widget, PositionVar int) { | |
| 246 | + | core.LazyRegister(&xCarouselReorder, "ADW", "adw_carousel_reorder", false) | |
| 247 | + | ||
| 218 | 248 | xCarouselReorder(x.GoPointer(), ChildVar.GoPointer(), PositionVar) | |
| 219 | 249 | } | |
| 220 | 250 | ||
| @@ -224,6 +254,8 @@ var xCarouselScrollTo func(uintptr, uintptr, bool) | |||
| 224 | 254 | // | |
| 225 | 255 | // If @animate is `TRUE`, the transition will be animated. | |
| 226 | 256 | func (x *Carousel) ScrollTo(WidgetVar *gtk.Widget, AnimateVar bool) { | |
| 257 | + | core.LazyRegister(&xCarouselScrollTo, "ADW", "adw_carousel_scroll_to", false) | |
| 258 | + | ||
| 227 | 259 | xCarouselScrollTo(x.GoPointer(), WidgetVar.GoPointer(), AnimateVar) | |
| 228 | 260 | } | |
| 229 | 261 | ||
| @@ -234,6 +266,8 @@ var xCarouselSetAllowLongSwipes func(uintptr, bool) | |||
| 234 | 266 | // If @allow_long_swipes is `FALSE`, each swipe can only move to the adjacent | |
| 235 | 267 | // pages. | |
| 236 | 268 | func (x *Carousel) SetAllowLongSwipes(AllowLongSwipesVar bool) { | |
| 269 | + | core.LazyRegister(&xCarouselSetAllowLongSwipes, "ADW", "adw_carousel_set_allow_long_swipes", false) | |
| 270 | + | ||
| 237 | 271 | xCarouselSetAllowLongSwipes(x.GoPointer(), AllowLongSwipesVar) | |
| 238 | 272 | } | |
| 239 | 273 | ||
| @@ -243,6 +277,8 @@ var xCarouselSetAllowMouseDrag func(uintptr, bool) | |||
| 243 | 277 | // | |
| 244 | 278 | // If @allow_mouse_drag is `FALSE`, dragging is only available on touch. | |
| 245 | 279 | func (x *Carousel) SetAllowMouseDrag(AllowMouseDragVar bool) { | |
| 280 | + | core.LazyRegister(&xCarouselSetAllowMouseDrag, "ADW", "adw_carousel_set_allow_mouse_drag", false) | |
| 281 | + | ||
| 246 | 282 | xCarouselSetAllowMouseDrag(x.GoPointer(), AllowMouseDragVar) | |
| 247 | 283 | } | |
| 248 | 284 | ||
| @@ -252,6 +288,8 @@ var xCarouselSetAllowScrollWheel func(uintptr, bool) | |||
| 252 | 288 | // | |
| 253 | 289 | // If @allow_scroll_wheel is `FALSE`, wheel events will be ignored. | |
| 254 | 290 | func (x *Carousel) SetAllowScrollWheel(AllowScrollWheelVar bool) { | |
| 291 | + | core.LazyRegister(&xCarouselSetAllowScrollWheel, "ADW", "adw_carousel_set_allow_scroll_wheel", false) | |
| 292 | + | ||
| 255 | 293 | xCarouselSetAllowScrollWheel(x.GoPointer(), AllowScrollWheelVar) | |
| 256 | 294 | } | |
| 257 | 295 | ||
| @@ -262,6 +300,8 @@ var xCarouselSetInteractive func(uintptr, bool) | |||
| 262 | 300 | // This can be used to temporarily disable the carousel to only allow navigating | |
| 263 | 301 | // it in a certain state. | |
| 264 | 302 | func (x *Carousel) SetInteractive(InteractiveVar bool) { | |
| 303 | + | core.LazyRegister(&xCarouselSetInteractive, "ADW", "adw_carousel_set_interactive", false) | |
| 304 | + | ||
| 265 | 305 | xCarouselSetInteractive(x.GoPointer(), InteractiveVar) | |
| 266 | 306 | } | |
| 267 | 307 | ||
| @@ -271,6 +311,8 @@ var xCarouselSetRevealDuration func(uintptr, uint) | |||
| 271 | 311 | // | |
| 272 | 312 | // Reveal duration is used when animating adding or removing pages. | |
| 273 | 313 | func (x *Carousel) SetRevealDuration(RevealDurationVar uint) { | |
| 314 | + | core.LazyRegister(&xCarouselSetRevealDuration, "ADW", "adw_carousel_set_reveal_duration", false) | |
| 315 | + | ||
| 274 | 316 | xCarouselSetRevealDuration(x.GoPointer(), RevealDurationVar) | |
| 275 | 317 | } | |
| 276 | 318 | ||
| @@ -284,6 +326,8 @@ var xCarouselSetScrollParams func(uintptr, *SpringParams) | |||
| 284 | 326 | // adw_spring_params_new (1, 0.5, 500) | |
| 285 | 327 | // ``` | |
| 286 | 328 | func (x *Carousel) SetScrollParams(ParamsVar *SpringParams) { | |
| 329 | + | core.LazyRegister(&xCarouselSetScrollParams, "ADW", "adw_carousel_set_scroll_params", false) | |
| 330 | + | ||
| 287 | 331 | xCarouselSetScrollParams(x.GoPointer(), ParamsVar) | |
| 288 | 332 | } | |
| 289 | 333 | ||
| @@ -291,6 +335,8 @@ var xCarouselSetSpacing func(uintptr, uint) | |||
| 291 | 335 | ||
| 292 | 336 | // Sets spacing between pages in pixels. | |
| 293 | 337 | func (x *Carousel) SetSpacing(SpacingVar uint) { | |
| 338 | + | core.LazyRegister(&xCarouselSetSpacing, "ADW", "adw_carousel_set_spacing", false) | |
| 339 | + | ||
| 294 | 340 | xCarouselSetSpacing(x.GoPointer(), SpacingVar) | |
| 295 | 341 | } | |
| 296 | 342 | ||
| @@ -822,40 +868,4 @@ func (x *Carousel) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 822 | 868 | func init() { | |
| 823 | 869 | core.SetPackageName("ADW", "libadwaita-1") | |
| 824 | 870 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 825 | - | var libs []uintptr | |
| 826 | - | for _, libPath := range core.GetPaths("ADW") { | |
| 827 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 828 | - | if err != nil { | |
| 829 | - | panic(err) | |
| 830 | - | } | |
| 831 | - | libs = append(libs, lib) | |
| 832 | - | } | |
| 833 | - | ||
| 834 | - | core.PuregoSafeRegister(&xCarouselGLibType, libs, "adw_carousel_get_type") | |
| 835 | - | ||
| 836 | - | core.PuregoSafeRegister(&xNewCarousel, libs, "adw_carousel_new") | |
| 837 | - | ||
| 838 | - | core.PuregoSafeRegister(&xCarouselAppend, libs, "adw_carousel_append") | |
| 839 | - | core.PuregoSafeRegister(&xCarouselGetAllowLongSwipes, libs, "adw_carousel_get_allow_long_swipes") | |
| 840 | - | core.PuregoSafeRegister(&xCarouselGetAllowMouseDrag, libs, "adw_carousel_get_allow_mouse_drag") | |
| 841 | - | core.PuregoSafeRegister(&xCarouselGetAllowScrollWheel, libs, "adw_carousel_get_allow_scroll_wheel") | |
| 842 | - | core.PuregoSafeRegister(&xCarouselGetInteractive, libs, "adw_carousel_get_interactive") | |
| 843 | - | core.PuregoSafeRegister(&xCarouselGetNPages, libs, "adw_carousel_get_n_pages") | |
| 844 | - | core.PuregoSafeRegister(&xCarouselGetNthPage, libs, "adw_carousel_get_nth_page") | |
| 845 | - | core.PuregoSafeRegister(&xCarouselGetPosition, libs, "adw_carousel_get_position") | |
| 846 | - | core.PuregoSafeRegister(&xCarouselGetRevealDuration, libs, "adw_carousel_get_reveal_duration") | |
| 847 | - | core.PuregoSafeRegister(&xCarouselGetScrollParams, libs, "adw_carousel_get_scroll_params") | |
| 848 | - | core.PuregoSafeRegister(&xCarouselGetSpacing, libs, "adw_carousel_get_spacing") | |
| 849 | - | core.PuregoSafeRegister(&xCarouselInsert, libs, "adw_carousel_insert") | |
| 850 | - | core.PuregoSafeRegister(&xCarouselPrepend, libs, "adw_carousel_prepend") | |
| 851 | - | core.PuregoSafeRegister(&xCarouselRemove, libs, "adw_carousel_remove") | |
| 852 | - | core.PuregoSafeRegister(&xCarouselReorder, libs, "adw_carousel_reorder") | |
| 853 | - | core.PuregoSafeRegister(&xCarouselScrollTo, libs, "adw_carousel_scroll_to") | |
| 854 | - | core.PuregoSafeRegister(&xCarouselSetAllowLongSwipes, libs, "adw_carousel_set_allow_long_swipes") | |
| 855 | - | core.PuregoSafeRegister(&xCarouselSetAllowMouseDrag, libs, "adw_carousel_set_allow_mouse_drag") | |
| 856 | - | core.PuregoSafeRegister(&xCarouselSetAllowScrollWheel, libs, "adw_carousel_set_allow_scroll_wheel") | |
| 857 | - | core.PuregoSafeRegister(&xCarouselSetInteractive, libs, "adw_carousel_set_interactive") | |
| 858 | - | core.PuregoSafeRegister(&xCarouselSetRevealDuration, libs, "adw_carousel_set_reveal_duration") | |
| 859 | - | core.PuregoSafeRegister(&xCarouselSetScrollParams, libs, "adw_carousel_set_scroll_params") | |
| 860 | - | core.PuregoSafeRegister(&xCarouselSetSpacing, libs, "adw_carousel_set_spacing") | |
| 861 | 871 | } | |
| @@ -5,7 +5,6 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | - | "github.com/bnema/purego" | |||
| 9 | "github.com/bnema/puregotk/pkg/core" | 8 | "github.com/bnema/puregotk/pkg/core" | ||
| 10 | "github.com/bnema/puregotk/v4/gdk" | 9 | "github.com/bnema/puregotk/v4/gdk" | ||
| 11 | "github.com/bnema/puregotk/v4/glib" | 10 | "github.com/bnema/puregotk/v4/glib" | ||
| @@ -57,6 +56,7 @@ type Carousel struct { | |||||
| 57 | var xCarouselGLibType func() types.GType | 56 | var xCarouselGLibType func() types.GType | ||
| 58 | 57 | ||||
| 59 | func CarouselGLibType() types.GType { | 58 | func CarouselGLibType() types.GType { | ||
| 59 | + | core.LazyRegister(&xCarouselGLibType, "ADW", "adw_carousel_get_type", false) | |||
| 60 | return xCarouselGLibType() | 60 | return xCarouselGLibType() | ||
| 61 | } | 61 | } | ||
| 62 | 62 | ||||
| @@ -70,6 +70,7 @@ var xNewCarousel func() uintptr | |||||
| 70 | 70 | ||||
| 71 | // Creates a new `AdwCarousel`. | 71 | // Creates a new `AdwCarousel`. | ||
| 72 | func NewCarousel() *Carousel { | 72 | func NewCarousel() *Carousel { | ||
| 73 | + | core.LazyRegister(&xNewCarousel, "ADW", "adw_carousel_new", false) | |||
| 73 | var cls *Carousel | 74 | var cls *Carousel | ||
| 74 | 75 | ||||
| 75 | cret := xNewCarousel() | 76 | cret := xNewCarousel() | ||
| @@ -87,6 +88,8 @@ var xCarouselAppend func(uintptr, uintptr) | |||||
| 87 | 88 | ||||
| 88 | // Appends @child to @self. | 89 | // Appends @child to @self. | ||
| 89 | func (x *Carousel) Append(ChildVar *gtk.Widget) { | 90 | func (x *Carousel) Append(ChildVar *gtk.Widget) { | ||
| 91 | + | core.LazyRegister(&xCarouselAppend, "ADW", "adw_carousel_append", false) | |||
| 92 | + | ||||
| 90 | xCarouselAppend(x.GoPointer(), ChildVar.GoPointer()) | 93 | xCarouselAppend(x.GoPointer(), ChildVar.GoPointer()) | ||
| 91 | } | 94 | } | ||
| 92 | 95 | ||||
| @@ -94,6 +97,8 @@ var xCarouselGetAllowLongSwipes func(uintptr) bool | |||||
| 94 | 97 | ||||
| 95 | // Gets whether to allow swiping for more than one page at a time. | 98 | // Gets whether to allow swiping for more than one page at a time. | ||
| 96 | func (x *Carousel) GetAllowLongSwipes() bool { | 99 | func (x *Carousel) GetAllowLongSwipes() bool { | ||
| 100 | + | core.LazyRegister(&xCarouselGetAllowLongSwipes, "ADW", "adw_carousel_get_allow_long_swipes", false) | |||
| 101 | + | ||||
| 97 | cret := xCarouselGetAllowLongSwipes(x.GoPointer()) | 102 | cret := xCarouselGetAllowLongSwipes(x.GoPointer()) | ||
| 98 | return cret | 103 | return cret | ||
| 99 | } | 104 | } | ||
| @@ -102,6 +107,8 @@ var xCarouselGetAllowMouseDrag func(uintptr) bool | |||||
| 102 | 107 | ||||
| 103 | // Sets whether @self can be dragged with mouse pointer. | 108 | // Sets whether @self can be dragged with mouse pointer. | ||
| 104 | func (x *Carousel) GetAllowMouseDrag() bool { | 109 | func (x *Carousel) GetAllowMouseDrag() bool { | ||
| 110 | + | core.LazyRegister(&xCarouselGetAllowMouseDrag, "ADW", "adw_carousel_get_allow_mouse_drag", false) | |||
| 111 | + | ||||
| 105 | cret := xCarouselGetAllowMouseDrag(x.GoPointer()) | 112 | cret := xCarouselGetAllowMouseDrag(x.GoPointer()) | ||
| 106 | return cret | 113 | return cret | ||
| 107 | } | 114 | } | ||
| @@ -110,6 +117,8 @@ var xCarouselGetAllowScrollWheel func(uintptr) bool | |||||
| 110 | 117 | ||||
| 111 | // Gets whether @self will respond to scroll wheel events. | 118 | // Gets whether @self will respond to scroll wheel events. | ||
| 112 | func (x *Carousel) GetAllowScrollWheel() bool { | 119 | func (x *Carousel) GetAllowScrollWheel() bool { | ||
| 120 | + | core.LazyRegister(&xCarouselGetAllowScrollWheel, "ADW", "adw_carousel_get_allow_scroll_wheel", false) | |||
| 121 | + | ||||
| 113 | cret := xCarouselGetAllowScrollWheel(x.GoPointer()) | 122 | cret := xCarouselGetAllowScrollWheel(x.GoPointer()) | ||
| 114 | return cret | 123 | return cret | ||
| 115 | } | 124 | } | ||
| @@ -118,6 +127,8 @@ var xCarouselGetInteractive func(uintptr) bool | |||||
| 118 | 127 | ||||
| 119 | // Gets whether @self can be navigated. | 128 | // Gets whether @self can be navigated. | ||
| 120 | func (x *Carousel) GetInteractive() bool { | 129 | func (x *Carousel) GetInteractive() bool { | ||
| 130 | + | core.LazyRegister(&xCarouselGetInteractive, "ADW", "adw_carousel_get_interactive", false) | |||
| 131 | + | ||||
| 121 | cret := xCarouselGetInteractive(x.GoPointer()) | 132 | cret := xCarouselGetInteractive(x.GoPointer()) | ||
| 122 | return cret | 133 | return cret | ||
| 123 | } | 134 | } | ||
| @@ -126,6 +137,8 @@ var xCarouselGetNPages func(uintptr) uint | |||||
| 126 | 137 | ||||
| 127 | // Gets the number of pages in @self. | 138 | // Gets the number of pages in @self. | ||
| 128 | func (x *Carousel) GetNPages() uint { | 139 | func (x *Carousel) GetNPages() uint { | ||
| 140 | + | core.LazyRegister(&xCarouselGetNPages, "ADW", "adw_carousel_get_n_pages", false) | |||
| 141 | + | ||||
| 129 | cret := xCarouselGetNPages(x.GoPointer()) | 142 | cret := xCarouselGetNPages(x.GoPointer()) | ||
| 130 | return cret | 143 | return cret | ||
| 131 | } | 144 | } | ||
| @@ -134,6 +147,7 @@ var xCarouselGetNthPage func(uintptr, uint) uintptr | |||||
| 134 | 147 | ||||
| 135 | // Gets the page at position @n. | 148 | // Gets the page at position @n. | ||
| 136 | func (x *Carousel) GetNthPage(NVar uint) *gtk.Widget { | 149 | func (x *Carousel) GetNthPage(NVar uint) *gtk.Widget { | ||
| 150 | + | core.LazyRegister(&xCarouselGetNthPage, "ADW", "adw_carousel_get_nth_page", false) | |||
| 137 | var cls *gtk.Widget | 151 | var cls *gtk.Widget | ||
| 138 | 152 | ||||
| 139 | cret := xCarouselGetNthPage(x.GoPointer(), NVar) | 153 | cret := xCarouselGetNthPage(x.GoPointer(), NVar) | ||
| @@ -153,6 +167,8 @@ var xCarouselGetPosition func(uintptr) float64 | |||||
| 153 | // | 167 | // | ||
| 154 | // 1 matches 1 page. Use [method@Carousel.scroll_to] for changing it. | 168 | // 1 matches 1 page. Use [method@Carousel.scroll_to] for changing it. | ||
| 155 | func (x *Carousel) GetPosition() float64 { | 169 | func (x *Carousel) GetPosition() float64 { | ||
| 170 | + | core.LazyRegister(&xCarouselGetPosition, "ADW", "adw_carousel_get_position", false) | |||
| 171 | + | ||||
| 156 | cret := xCarouselGetPosition(x.GoPointer()) | 172 | cret := xCarouselGetPosition(x.GoPointer()) | ||
| 157 | return cret | 173 | return cret | ||
| 158 | } | 174 | } | ||
| @@ -161,6 +177,8 @@ var xCarouselGetRevealDuration func(uintptr) uint | |||||
| 161 | 177 | ||||
| 162 | // Gets the page reveal duration, in milliseconds. | 178 | // Gets the page reveal duration, in milliseconds. | ||
| 163 | func (x *Carousel) GetRevealDuration() uint { | 179 | func (x *Carousel) GetRevealDuration() uint { | ||
| 180 | + | core.LazyRegister(&xCarouselGetRevealDuration, "ADW", "adw_carousel_get_reveal_duration", false) | |||
| 181 | + | ||||
| 164 | cret := xCarouselGetRevealDuration(x.GoPointer()) | 182 | cret := xCarouselGetRevealDuration(x.GoPointer()) | ||
| 165 | return cret | 183 | return cret | ||
| 166 | } | 184 | } | ||
| @@ -169,6 +187,8 @@ var xCarouselGetScrollParams func(uintptr) uintptr | |||||
| 169 | 187 | ||||
| 170 | // Gets the scroll animation spring parameters for @self. | 188 | // Gets the scroll animation spring parameters for @self. | ||
| 171 | func (x *Carousel) GetScrollParams() *SpringParams { | 189 | func (x *Carousel) GetScrollParams() *SpringParams { | ||
| 190 | + | core.LazyRegister(&xCarouselGetScrollParams, "ADW", "adw_carousel_get_scroll_params", false) | |||
| 191 | + | ||||
| 172 | cret := xCarouselGetScrollParams(x.GoPointer()) | 192 | cret := xCarouselGetScrollParams(x.GoPointer()) | ||
| 173 | if cret == 0 { | 193 | if cret == 0 { | ||
| 174 | return nil | 194 | return nil | ||
| @@ -180,6 +200,8 @@ var xCarouselGetSpacing func(uintptr) uint | |||||
| 180 | 200 | ||||
| 181 | // Gets spacing between pages in pixels. | 201 | // Gets spacing between pages in pixels. | ||
| 182 | func (x *Carousel) GetSpacing() uint { | 202 | func (x *Carousel) GetSpacing() uint { | ||
| 203 | + | core.LazyRegister(&xCarouselGetSpacing, "ADW", "adw_carousel_get_spacing", false) | |||
| 204 | + | ||||
| 183 | cret := xCarouselGetSpacing(x.GoPointer()) | 205 | cret := xCarouselGetSpacing(x.GoPointer()) | ||
| 184 | return cret | 206 | return cret | ||
| 185 | } | 207 | } | ||
| @@ -191,6 +213,8 @@ var xCarouselInsert func(uintptr, uintptr, int) | |||||
| 191 | // If position is -1, or larger than the number of pages, | 213 | // If position is -1, or larger than the number of pages, | ||
| 192 | // @child will be appended to the end. | 214 | // @child will be appended to the end. | ||
| 193 | func (x *Carousel) Insert(ChildVar *gtk.Widget, PositionVar int) { | 215 | func (x *Carousel) Insert(ChildVar *gtk.Widget, PositionVar int) { | ||
| 216 | + | core.LazyRegister(&xCarouselInsert, "ADW", "adw_carousel_insert", false) | |||
| 217 | + | ||||
| 194 | xCarouselInsert(x.GoPointer(), ChildVar.GoPointer(), PositionVar) | 218 | xCarouselInsert(x.GoPointer(), ChildVar.GoPointer(), PositionVar) | ||
| 195 | } | 219 | } | ||
| 196 | 220 | ||||
| @@ -198,6 +222,8 @@ var xCarouselPrepend func(uintptr, uintptr) | |||||
| 198 | 222 | ||||
| 199 | // Prepends @child to @self. | 223 | // Prepends @child to @self. | ||
| 200 | func (x *Carousel) Prepend(ChildVar *gtk.Widget) { | 224 | func (x *Carousel) Prepend(ChildVar *gtk.Widget) { | ||
| 225 | + | core.LazyRegister(&xCarouselPrepend, "ADW", "adw_carousel_prepend", false) | |||
| 226 | + | ||||
| 201 | xCarouselPrepend(x.GoPointer(), ChildVar.GoPointer()) | 227 | xCarouselPrepend(x.GoPointer(), ChildVar.GoPointer()) | ||
| 202 | } | 228 | } | ||
| 203 | 229 | ||||
| @@ -205,6 +231,8 @@ var xCarouselRemove func(uintptr, uintptr) | |||||
| 205 | 231 | ||||
| 206 | // Removes @child from @self. | 232 | // Removes @child from @self. | ||
| 207 | func (x *Carousel) Remove(ChildVar *gtk.Widget) { | 233 | func (x *Carousel) Remove(ChildVar *gtk.Widget) { | ||
| 234 | + | core.LazyRegister(&xCarouselRemove, "ADW", "adw_carousel_remove", false) | |||
| 235 | + | ||||
| 208 | xCarouselRemove(x.GoPointer(), ChildVar.GoPointer()) | 236 | xCarouselRemove(x.GoPointer(), ChildVar.GoPointer()) | ||
| 209 | } | 237 | } | ||
| 210 | 238 | ||||
| @@ -215,6 +243,8 @@ var xCarouselReorder func(uintptr, uintptr, int) | |||||
| 215 | // If position is -1, or larger than the number of pages, @child will be moved | 243 | // If position is -1, or larger than the number of pages, @child will be moved | ||
| 216 | // at the end. | 244 | // at the end. | ||
| 217 | func (x *Carousel) Reorder(ChildVar *gtk.Widget, PositionVar int) { | 245 | func (x *Carousel) Reorder(ChildVar *gtk.Widget, PositionVar int) { | ||
| 246 | + | core.LazyRegister(&xCarouselReorder, "ADW", "adw_carousel_reorder", false) | |||
| 247 | + | ||||
| 218 | xCarouselReorder(x.GoPointer(), ChildVar.GoPointer(), PositionVar) | 248 | xCarouselReorder(x.GoPointer(), ChildVar.GoPointer(), PositionVar) | ||
| 219 | } | 249 | } | ||
| 220 | 250 | ||||
| @@ -224,6 +254,8 @@ var xCarouselScrollTo func(uintptr, uintptr, bool) | |||||
| 224 | // | 254 | // | ||
| 225 | // If @animate is `TRUE`, the transition will be animated. | 255 | // If @animate is `TRUE`, the transition will be animated. | ||
| 226 | func (x *Carousel) ScrollTo(WidgetVar *gtk.Widget, AnimateVar bool) { | 256 | func (x *Carousel) ScrollTo(WidgetVar *gtk.Widget, AnimateVar bool) { | ||
| 257 | + | core.LazyRegister(&xCarouselScrollTo, "ADW", "adw_carousel_scroll_to", false) | |||
| 258 | + | ||||
| 227 | xCarouselScrollTo(x.GoPointer(), WidgetVar.GoPointer(), AnimateVar) | 259 | xCarouselScrollTo(x.GoPointer(), WidgetVar.GoPointer(), AnimateVar) | ||
| 228 | } | 260 | } | ||
| 229 | 261 | ||||
| @@ -234,6 +266,8 @@ var xCarouselSetAllowLongSwipes func(uintptr, bool) | |||||
| 234 | // If @allow_long_swipes is `FALSE`, each swipe can only move to the adjacent | 266 | // If @allow_long_swipes is `FALSE`, each swipe can only move to the adjacent | ||
| 235 | // pages. | 267 | // pages. | ||
| 236 | func (x *Carousel) SetAllowLongSwipes(AllowLongSwipesVar bool) { | 268 | func (x *Carousel) SetAllowLongSwipes(AllowLongSwipesVar bool) { | ||
| 269 | + | core.LazyRegister(&xCarouselSetAllowLongSwipes, "ADW", "adw_carousel_set_allow_long_swipes", false) | |||
| 270 | + | ||||
| 237 | xCarouselSetAllowLongSwipes(x.GoPointer(), AllowLongSwipesVar) | 271 | xCarouselSetAllowLongSwipes(x.GoPointer(), AllowLongSwipesVar) | ||
| 238 | } | 272 | } | ||
| 239 | 273 | ||||
| @@ -243,6 +277,8 @@ var xCarouselSetAllowMouseDrag func(uintptr, bool) | |||||
| 243 | // | 277 | // | ||
| 244 | // If @allow_mouse_drag is `FALSE`, dragging is only available on touch. | 278 | // If @allow_mouse_drag is `FALSE`, dragging is only available on touch. | ||
| 245 | func (x *Carousel) SetAllowMouseDrag(AllowMouseDragVar bool) { | 279 | func (x *Carousel) SetAllowMouseDrag(AllowMouseDragVar bool) { | ||
| 280 | + | core.LazyRegister(&xCarouselSetAllowMouseDrag, "ADW", "adw_carousel_set_allow_mouse_drag", false) | |||
| 281 | + | ||||
| 246 | xCarouselSetAllowMouseDrag(x.GoPointer(), AllowMouseDragVar) | 282 | xCarouselSetAllowMouseDrag(x.GoPointer(), AllowMouseDragVar) | ||
| 247 | } | 283 | } | ||
| 248 | 284 | ||||
| @@ -252,6 +288,8 @@ var xCarouselSetAllowScrollWheel func(uintptr, bool) | |||||
| 252 | // | 288 | // | ||
| 253 | // If @allow_scroll_wheel is `FALSE`, wheel events will be ignored. | 289 | // If @allow_scroll_wheel is `FALSE`, wheel events will be ignored. | ||
| 254 | func (x *Carousel) SetAllowScrollWheel(AllowScrollWheelVar bool) { | 290 | func (x *Carousel) SetAllowScrollWheel(AllowScrollWheelVar bool) { | ||
| 291 | + | core.LazyRegister(&xCarouselSetAllowScrollWheel, "ADW", "adw_carousel_set_allow_scroll_wheel", false) | |||
| 292 | + | ||||
| 255 | xCarouselSetAllowScrollWheel(x.GoPointer(), AllowScrollWheelVar) | 293 | xCarouselSetAllowScrollWheel(x.GoPointer(), AllowScrollWheelVar) | ||
| 256 | } | 294 | } | ||
| 257 | 295 | ||||
| @@ -262,6 +300,8 @@ var xCarouselSetInteractive func(uintptr, bool) | |||||
| 262 | // This can be used to temporarily disable the carousel to only allow navigating | 300 | // This can be used to temporarily disable the carousel to only allow navigating | ||
| 263 | // it in a certain state. | 301 | // it in a certain state. | ||
| 264 | func (x *Carousel) SetInteractive(InteractiveVar bool) { | 302 | func (x *Carousel) SetInteractive(InteractiveVar bool) { | ||
| 303 | + | core.LazyRegister(&xCarouselSetInteractive, "ADW", "adw_carousel_set_interactive", false) | |||
| 304 | + | ||||
| 265 | xCarouselSetInteractive(x.GoPointer(), InteractiveVar) | 305 | xCarouselSetInteractive(x.GoPointer(), InteractiveVar) | ||
| 266 | } | 306 | } | ||
| 267 | 307 | ||||
| @@ -271,6 +311,8 @@ var xCarouselSetRevealDuration func(uintptr, uint) | |||||
| 271 | // | 311 | // | ||
| 272 | // Reveal duration is used when animating adding or removing pages. | 312 | // Reveal duration is used when animating adding or removing pages. | ||
| 273 | func (x *Carousel) SetRevealDuration(RevealDurationVar uint) { | 313 | func (x *Carousel) SetRevealDuration(RevealDurationVar uint) { | ||
| 314 | + | core.LazyRegister(&xCarouselSetRevealDuration, "ADW", "adw_carousel_set_reveal_duration", false) | |||
| 315 | + | ||||
| 274 | xCarouselSetRevealDuration(x.GoPointer(), RevealDurationVar) | 316 | xCarouselSetRevealDuration(x.GoPointer(), RevealDurationVar) | ||
| 275 | } | 317 | } | ||
| 276 | 318 | ||||
| @@ -284,6 +326,8 @@ var xCarouselSetScrollParams func(uintptr, *SpringParams) | |||||
| 284 | // adw_spring_params_new (1, 0.5, 500) | 326 | // adw_spring_params_new (1, 0.5, 500) | ||
| 285 | // ``` | 327 | // ``` | ||
| 286 | func (x *Carousel) SetScrollParams(ParamsVar *SpringParams) { | 328 | func (x *Carousel) SetScrollParams(ParamsVar *SpringParams) { | ||
| 329 | + | core.LazyRegister(&xCarouselSetScrollParams, "ADW", "adw_carousel_set_scroll_params", false) | |||
| 330 | + | ||||
| 287 | xCarouselSetScrollParams(x.GoPointer(), ParamsVar) | 331 | xCarouselSetScrollParams(x.GoPointer(), ParamsVar) | ||
| 288 | } | 332 | } | ||
| 289 | 333 | ||||
| @@ -291,6 +335,8 @@ var xCarouselSetSpacing func(uintptr, uint) | |||||
| 291 | 335 | ||||
| 292 | // Sets spacing between pages in pixels. | 336 | // Sets spacing between pages in pixels. | ||
| 293 | func (x *Carousel) SetSpacing(SpacingVar uint) { | 337 | func (x *Carousel) SetSpacing(SpacingVar uint) { | ||
| 338 | + | core.LazyRegister(&xCarouselSetSpacing, "ADW", "adw_carousel_set_spacing", false) | |||
| 339 | + | ||||
| 294 | xCarouselSetSpacing(x.GoPointer(), SpacingVar) | 340 | xCarouselSetSpacing(x.GoPointer(), SpacingVar) | ||
| 295 | } | 341 | } | ||
| 296 | 342 | ||||
| @@ -822,40 +868,4 @@ func (x *Carousel) SetOrientation(OrientationVar gtk.Orientation) { | |||||
| 822 | func init() { | 868 | func init() { | ||
| 823 | core.SetPackageName("ADW", "libadwaita-1") | 869 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 824 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 870 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 825 | - | var libs []uintptr | |||
| 826 | - | for _, libPath := range core.GetPaths("ADW") { | |||
| 827 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 828 | - | if err != nil { | |||
| 829 | - | panic(err) | |||
| 830 | - | } | |||
| 831 | - | libs = append(libs, lib) | |||
| 832 | - | } | |||
| 833 | - | ||||
| 834 | - | core.PuregoSafeRegister(&xCarouselGLibType, libs, "adw_carousel_get_type") | |||
| 835 | - | ||||
| 836 | - | core.PuregoSafeRegister(&xNewCarousel, libs, "adw_carousel_new") | |||
| 837 | - | ||||
| 838 | - | core.PuregoSafeRegister(&xCarouselAppend, libs, "adw_carousel_append") | |||
| 839 | - | core.PuregoSafeRegister(&xCarouselGetAllowLongSwipes, libs, "adw_carousel_get_allow_long_swipes") | |||
| 840 | - | core.PuregoSafeRegister(&xCarouselGetAllowMouseDrag, libs, "adw_carousel_get_allow_mouse_drag") | |||
| 841 | - | core.PuregoSafeRegister(&xCarouselGetAllowScrollWheel, libs, "adw_carousel_get_allow_scroll_wheel") | |||
| 842 | - | core.PuregoSafeRegister(&xCarouselGetInteractive, libs, "adw_carousel_get_interactive") | |||
| 843 | - | core.PuregoSafeRegister(&xCarouselGetNPages, libs, "adw_carousel_get_n_pages") | |||
| 844 | - | core.PuregoSafeRegister(&xCarouselGetNthPage, libs, "adw_carousel_get_nth_page") | |||
| 845 | - | core.PuregoSafeRegister(&xCarouselGetPosition, libs, "adw_carousel_get_position") | |||
| 846 | - | core.PuregoSafeRegister(&xCarouselGetRevealDuration, libs, "adw_carousel_get_reveal_duration") | |||
| 847 | - | core.PuregoSafeRegister(&xCarouselGetScrollParams, libs, "adw_carousel_get_scroll_params") | |||
| 848 | - | core.PuregoSafeRegister(&xCarouselGetSpacing, libs, "adw_carousel_get_spacing") | |||
| 849 | - | core.PuregoSafeRegister(&xCarouselInsert, libs, "adw_carousel_insert") | |||
| 850 | - | core.PuregoSafeRegister(&xCarouselPrepend, libs, "adw_carousel_prepend") | |||
| 851 | - | core.PuregoSafeRegister(&xCarouselRemove, libs, "adw_carousel_remove") | |||
| 852 | - | core.PuregoSafeRegister(&xCarouselReorder, libs, "adw_carousel_reorder") | |||
| 853 | - | core.PuregoSafeRegister(&xCarouselScrollTo, libs, "adw_carousel_scroll_to") | |||
| 854 | - | core.PuregoSafeRegister(&xCarouselSetAllowLongSwipes, libs, "adw_carousel_set_allow_long_swipes") | |||
| 855 | - | core.PuregoSafeRegister(&xCarouselSetAllowMouseDrag, libs, "adw_carousel_set_allow_mouse_drag") | |||
| 856 | - | core.PuregoSafeRegister(&xCarouselSetAllowScrollWheel, libs, "adw_carousel_set_allow_scroll_wheel") | |||
| 857 | - | core.PuregoSafeRegister(&xCarouselSetInteractive, libs, "adw_carousel_set_interactive") | |||
| 858 | - | core.PuregoSafeRegister(&xCarouselSetRevealDuration, libs, "adw_carousel_set_reveal_duration") | |||
| 859 | - | core.PuregoSafeRegister(&xCarouselSetScrollParams, libs, "adw_carousel_set_scroll_params") | |||
| 860 | - | core.PuregoSafeRegister(&xCarouselSetSpacing, libs, "adw_carousel_set_spacing") | |||
| 861 | } | 871 | } | ||