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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +61 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +18 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +7 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +69 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +5 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +63 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +60 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +48 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +38 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +31 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +24 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +41 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +39 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +34 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +17 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +49 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +20 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +25 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +33 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +35 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +123 -87 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +30 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +41 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +64 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +40 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +78 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +15 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +66 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +57 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +36 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +20 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +34 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +28 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +23 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +27 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +51 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +53 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +20 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +11 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrop.go +19 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkenums.go +21 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkevents.go +120 -118 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframeclock.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframetimings.go +17 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkglcontext.go +40 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexture.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexturebuilder.go +41 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkkeys.go +19 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexture.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexturebuilder.go +42 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmonitor.go +27 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpaintable.go +63 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpango.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpixbuf.go +2 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopup.go +47 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopuplayout.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkrgba.go +19 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkseat.go +11 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksnapshot.go +7 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksurface.go +46 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktexture.go +27 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevel.go +157 -66
| @@ -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/glib" | |
| 11 | 10 | "github.com/bnema/puregotk/v4/gobject" | |
| @@ -63,6 +62,7 @@ type Toplevel interface { | |||
| 63 | 62 | var xToplevelGLibType func() types.GType | |
| 64 | 63 | ||
| 65 | 64 | func ToplevelGLibType() types.GType { | |
| 65 | + | core.LazyRegister(&xToplevelGLibType, "GDK", "gdk_toplevel_get_type", false) | |
| 66 | 66 | return xToplevelGLibType() | |
| 67 | 67 | } | |
| 68 | 68 | ||
| @@ -433,30 +433,159 @@ func (x *ToplevelBase) GetPropertyTitle() string { | |||
| 433 | 433 | return v.GetString() | |
| 434 | 434 | } | |
| 435 | 435 | ||
| 436 | + | var XGdkToplevelBeginMove func(uintptr, uintptr, int, float64, float64, uint32) = func(instance uintptr, DeviceVarp uintptr, ButtonVarp int, XVarp float64, YVarp float64, TimestampVarp uint32) { | |
| 437 | + | core.LazyRegister(&xXGdkToplevelBeginMove, "GDK", "gdk_toplevel_begin_move", false) | |
| 438 | + | xXGdkToplevelBeginMove(instance, DeviceVarp, ButtonVarp, XVarp, YVarp, TimestampVarp) | |
| 439 | + | } | |
| 440 | + | ||
| 441 | + | var ( | |
| 442 | + | xXGdkToplevelBeginMove func(uintptr, uintptr, int, float64, float64, uint32) | |
| 443 | + | XGdkToplevelBeginResize func(uintptr, SurfaceEdge, uintptr, int, float64, float64, uint32) = func(instance uintptr, EdgeVarp SurfaceEdge, DeviceVarp uintptr, ButtonVarp int, XVarp float64, YVarp float64, TimestampVarp uint32) { | |
| 444 | + | core.LazyRegister(&xXGdkToplevelBeginResize, "GDK", "gdk_toplevel_begin_resize", false) | |
| 445 | + | xXGdkToplevelBeginResize(instance, EdgeVarp, DeviceVarp, ButtonVarp, XVarp, YVarp, TimestampVarp) | |
| 446 | + | } | |
| 447 | + | ) | |
| 448 | + | var ( | |
| 449 | + | xXGdkToplevelBeginResize func(uintptr, SurfaceEdge, uintptr, int, float64, float64, uint32) | |
| 450 | + | XGdkToplevelFocus func(uintptr, uint32) = func(instance uintptr, TimestampVarp uint32) { | |
| 451 | + | core.LazyRegister(&xXGdkToplevelFocus, "GDK", "gdk_toplevel_focus", false) | |
| 452 | + | xXGdkToplevelFocus(instance, TimestampVarp) | |
| 453 | + | } | |
| 454 | + | ) | |
| 455 | + | var ( | |
| 456 | + | xXGdkToplevelFocus func(uintptr, uint32) | |
| 457 | + | XGdkToplevelGetCapabilities func(uintptr) ToplevelCapabilities = func(instance uintptr) ToplevelCapabilities { | |
| 458 | + | core.LazyRegister(&xXGdkToplevelGetCapabilities, "GDK", "gdk_toplevel_get_capabilities", false) | |
| 459 | + | return xXGdkToplevelGetCapabilities(instance) | |
| 460 | + | } | |
| 461 | + | ) | |
| 462 | + | var ( | |
| 463 | + | xXGdkToplevelGetCapabilities func(uintptr) ToplevelCapabilities | |
| 464 | + | XGdkToplevelGetGravity func(uintptr) Gravity = func(instance uintptr) Gravity { | |
| 465 | + | core.LazyRegister(&xXGdkToplevelGetGravity, "GDK", "gdk_toplevel_get_gravity", false) | |
| 466 | + | return xXGdkToplevelGetGravity(instance) | |
| 467 | + | } | |
| 468 | + | ) | |
| 469 | + | var ( | |
| 470 | + | xXGdkToplevelGetGravity func(uintptr) Gravity | |
| 471 | + | XGdkToplevelGetState func(uintptr) ToplevelState = func(instance uintptr) ToplevelState { | |
| 472 | + | core.LazyRegister(&xXGdkToplevelGetState, "GDK", "gdk_toplevel_get_state", false) | |
| 473 | + | return xXGdkToplevelGetState(instance) | |
| 474 | + | } | |
| 475 | + | ) | |
| 436 | 476 | var ( | |
| 437 | - | XGdkToplevelBeginMove func(uintptr, uintptr, int, float64, float64, uint32) | |
| 438 | - | XGdkToplevelBeginResize func(uintptr, SurfaceEdge, uintptr, int, float64, float64, uint32) | |
| 439 | - | XGdkToplevelFocus func(uintptr, uint32) | |
| 440 | - | XGdkToplevelGetCapabilities func(uintptr) ToplevelCapabilities | |
| 441 | - | XGdkToplevelGetGravity func(uintptr) Gravity | |
| 442 | - | XGdkToplevelGetState func(uintptr) ToplevelState | |
| 443 | - | XGdkToplevelInhibitSystemShortcuts func(uintptr, uintptr) | |
| 444 | - | XGdkToplevelLower func(uintptr) bool | |
| 445 | - | XGdkToplevelMinimize func(uintptr) bool | |
| 446 | - | XGdkToplevelPresent func(uintptr, *ToplevelLayout) | |
| 447 | - | XGdkToplevelRestoreSystemShortcuts func(uintptr) | |
| 448 | - | XGdkToplevelSetDecorated func(uintptr, bool) | |
| 449 | - | XGdkToplevelSetDeletable func(uintptr, bool) | |
| 450 | - | XGdkToplevelSetGravity func(uintptr, Gravity) | |
| 451 | - | XGdkToplevelSetIconList func(uintptr, *glib.List) | |
| 452 | - | XGdkToplevelSetModal func(uintptr, bool) | |
| 453 | - | XGdkToplevelSetStartupId func(uintptr, string) | |
| 454 | - | XGdkToplevelSetTitle func(uintptr, string) | |
| 455 | - | XGdkToplevelSetTransientFor func(uintptr, uintptr) | |
| 456 | - | XGdkToplevelShowWindowMenu func(uintptr, uintptr) bool | |
| 457 | - | XGdkToplevelSupportsEdgeConstraints func(uintptr) bool | |
| 458 | - | XGdkToplevelTitlebarGesture func(uintptr, TitlebarGesture) bool | |
| 477 | + | xXGdkToplevelGetState func(uintptr) ToplevelState | |
| 478 | + | XGdkToplevelInhibitSystemShortcuts func(uintptr, uintptr) = func(instance uintptr, EventVarp uintptr) { | |
| 479 | + | core.LazyRegister(&xXGdkToplevelInhibitSystemShortcuts, "GDK", "gdk_toplevel_inhibit_system_shortcuts", false) | |
| 480 | + | xXGdkToplevelInhibitSystemShortcuts(instance, EventVarp) | |
| 481 | + | } | |
| 482 | + | ) | |
| 483 | + | var ( | |
| 484 | + | xXGdkToplevelInhibitSystemShortcuts func(uintptr, uintptr) | |
| 485 | + | XGdkToplevelLower func(uintptr) bool = func(instance uintptr) bool { | |
| 486 | + | core.LazyRegister(&xXGdkToplevelLower, "GDK", "gdk_toplevel_lower", false) | |
| 487 | + | return xXGdkToplevelLower(instance) | |
| 488 | + | } | |
| 489 | + | ) | |
| 490 | + | var ( | |
| 491 | + | xXGdkToplevelLower func(uintptr) bool | |
| 492 | + | XGdkToplevelMinimize func(uintptr) bool = func(instance uintptr) bool { | |
| 493 | + | core.LazyRegister(&xXGdkToplevelMinimize, "GDK", "gdk_toplevel_minimize", false) | |
| 494 | + | return xXGdkToplevelMinimize(instance) | |
| 495 | + | } | |
| 496 | + | ) | |
| 497 | + | var ( | |
| 498 | + | xXGdkToplevelMinimize func(uintptr) bool | |
| 499 | + | XGdkToplevelPresent func(uintptr, *ToplevelLayout) = func(instance uintptr, LayoutVarp *ToplevelLayout) { | |
| 500 | + | core.LazyRegister(&xXGdkToplevelPresent, "GDK", "gdk_toplevel_present", false) | |
| 501 | + | xXGdkToplevelPresent(instance, LayoutVarp) | |
| 502 | + | } | |
| 503 | + | ) | |
| 504 | + | var ( | |
| 505 | + | xXGdkToplevelPresent func(uintptr, *ToplevelLayout) | |
| 506 | + | XGdkToplevelRestoreSystemShortcuts func(uintptr) = func(instance uintptr) { | |
| 507 | + | core.LazyRegister(&xXGdkToplevelRestoreSystemShortcuts, "GDK", "gdk_toplevel_restore_system_shortcuts", false) | |
| 508 | + | xXGdkToplevelRestoreSystemShortcuts(instance) | |
| 509 | + | } | |
| 510 | + | ) | |
| 511 | + | var ( | |
| 512 | + | xXGdkToplevelRestoreSystemShortcuts func(uintptr) | |
| 513 | + | XGdkToplevelSetDecorated func(uintptr, bool) = func(instance uintptr, DecoratedVarp bool) { | |
| 514 | + | core.LazyRegister(&xXGdkToplevelSetDecorated, "GDK", "gdk_toplevel_set_decorated", false) | |
| 515 | + | xXGdkToplevelSetDecorated(instance, DecoratedVarp) | |
| 516 | + | } | |
| 459 | 517 | ) | |
| 518 | + | var ( | |
| 519 | + | xXGdkToplevelSetDecorated func(uintptr, bool) | |
| 520 | + | XGdkToplevelSetDeletable func(uintptr, bool) = func(instance uintptr, DeletableVarp bool) { | |
| 521 | + | core.LazyRegister(&xXGdkToplevelSetDeletable, "GDK", "gdk_toplevel_set_deletable", false) | |
| 522 | + | xXGdkToplevelSetDeletable(instance, DeletableVarp) | |
| 523 | + | } | |
| 524 | + | ) | |
| 525 | + | var ( | |
| 526 | + | xXGdkToplevelSetDeletable func(uintptr, bool) | |
| 527 | + | XGdkToplevelSetGravity func(uintptr, Gravity) = func(instance uintptr, GravityVarp Gravity) { | |
| 528 | + | core.LazyRegister(&xXGdkToplevelSetGravity, "GDK", "gdk_toplevel_set_gravity", false) | |
| 529 | + | xXGdkToplevelSetGravity(instance, GravityVarp) | |
| 530 | + | } | |
| 531 | + | ) | |
| 532 | + | var ( | |
| 533 | + | xXGdkToplevelSetGravity func(uintptr, Gravity) | |
| 534 | + | XGdkToplevelSetIconList func(uintptr, *glib.List) = func(instance uintptr, SurfacesVarp *glib.List) { | |
| 535 | + | core.LazyRegister(&xXGdkToplevelSetIconList, "GDK", "gdk_toplevel_set_icon_list", false) | |
| 536 | + | xXGdkToplevelSetIconList(instance, SurfacesVarp) | |
| 537 | + | } | |
| 538 | + | ) | |
| 539 | + | var ( | |
| 540 | + | xXGdkToplevelSetIconList func(uintptr, *glib.List) | |
| 541 | + | XGdkToplevelSetModal func(uintptr, bool) = func(instance uintptr, ModalVarp bool) { | |
| 542 | + | core.LazyRegister(&xXGdkToplevelSetModal, "GDK", "gdk_toplevel_set_modal", false) | |
| 543 | + | xXGdkToplevelSetModal(instance, ModalVarp) | |
| 544 | + | } | |
| 545 | + | ) | |
| 546 | + | var ( | |
| 547 | + | xXGdkToplevelSetModal func(uintptr, bool) | |
| 548 | + | XGdkToplevelSetStartupId func(uintptr, string) = func(instance uintptr, StartupIdVarp string) { | |
| 549 | + | core.LazyRegister(&xXGdkToplevelSetStartupId, "GDK", "gdk_toplevel_set_startup_id", false) | |
| 550 | + | xXGdkToplevelSetStartupId(instance, StartupIdVarp) | |
| 551 | + | } | |
| 552 | + | ) | |
| 553 | + | var ( | |
| 554 | + | xXGdkToplevelSetStartupId func(uintptr, string) | |
| 555 | + | XGdkToplevelSetTitle func(uintptr, string) = func(instance uintptr, TitleVarp string) { | |
| 556 | + | core.LazyRegister(&xXGdkToplevelSetTitle, "GDK", "gdk_toplevel_set_title", false) | |
| 557 | + | xXGdkToplevelSetTitle(instance, TitleVarp) | |
| 558 | + | } | |
| 559 | + | ) | |
| 560 | + | var ( | |
| 561 | + | xXGdkToplevelSetTitle func(uintptr, string) | |
| 562 | + | XGdkToplevelSetTransientFor func(uintptr, uintptr) = func(instance uintptr, ParentVarp uintptr) { | |
| 563 | + | core.LazyRegister(&xXGdkToplevelSetTransientFor, "GDK", "gdk_toplevel_set_transient_for", false) | |
| 564 | + | xXGdkToplevelSetTransientFor(instance, ParentVarp) | |
| 565 | + | } | |
| 566 | + | ) | |
| 567 | + | var ( | |
| 568 | + | xXGdkToplevelSetTransientFor func(uintptr, uintptr) | |
| 569 | + | XGdkToplevelShowWindowMenu func(uintptr, uintptr) bool = func(instance uintptr, EventVarp uintptr) bool { | |
| 570 | + | core.LazyRegister(&xXGdkToplevelShowWindowMenu, "GDK", "gdk_toplevel_show_window_menu", false) | |
| 571 | + | return xXGdkToplevelShowWindowMenu(instance, EventVarp) | |
| 572 | + | } | |
| 573 | + | ) | |
| 574 | + | var ( | |
| 575 | + | xXGdkToplevelShowWindowMenu func(uintptr, uintptr) bool | |
| 576 | + | XGdkToplevelSupportsEdgeConstraints func(uintptr) bool = func(instance uintptr) bool { | |
| 577 | + | core.LazyRegister(&xXGdkToplevelSupportsEdgeConstraints, "GDK", "gdk_toplevel_supports_edge_constraints", false) | |
| 578 | + | return xXGdkToplevelSupportsEdgeConstraints(instance) | |
| 579 | + | } | |
| 580 | + | ) | |
| 581 | + | var ( | |
| 582 | + | xXGdkToplevelSupportsEdgeConstraints func(uintptr) bool | |
| 583 | + | XGdkToplevelTitlebarGesture func(uintptr, TitlebarGesture) bool = func(instance uintptr, GestureVarp TitlebarGesture) bool { | |
| 584 | + | core.LazyRegister(&xXGdkToplevelTitlebarGesture, "GDK", "gdk_toplevel_titlebar_gesture", false) | |
| 585 | + | return xXGdkToplevelTitlebarGesture(instance, GestureVarp) | |
| 586 | + | } | |
| 587 | + | ) | |
| 588 | + | var xXGdkToplevelTitlebarGesture func(uintptr, TitlebarGesture) bool | |
| 460 | 589 | ||
| 461 | 590 | // Reflects what features a `GdkToplevel` supports. | |
| 462 | 591 | type ToplevelCapabilities int | |
| @@ -464,6 +593,7 @@ type ToplevelCapabilities int | |||
| 464 | 593 | var xToplevelCapabilitiesGLibType func() types.GType | |
| 465 | 594 | ||
| 466 | 595 | func ToplevelCapabilitiesGLibType() types.GType { | |
| 596 | + | core.LazyRegister(&xToplevelCapabilitiesGLibType, "GDK", "gdk_toplevel_capabilities_get_type", false) | |
| 467 | 597 | return xToplevelCapabilitiesGLibType() | |
| 468 | 598 | } | |
| 469 | 599 | ||
| @@ -504,6 +634,7 @@ type ToplevelState int | |||
| 504 | 634 | var xToplevelStateGLibType func() types.GType | |
| 505 | 635 | ||
| 506 | 636 | func ToplevelStateGLibType() types.GType { | |
| 637 | + | core.LazyRegister(&xToplevelStateGLibType, "GDK", "gdk_toplevel_state_get_type", false) | |
| 507 | 638 | return xToplevelStateGLibType() | |
| 508 | 639 | } | |
| 509 | 640 | ||
| @@ -551,6 +682,7 @@ type FullscreenMode int | |||
| 551 | 682 | var xFullscreenModeGLibType func() types.GType | |
| 552 | 683 | ||
| 553 | 684 | func FullscreenModeGLibType() types.GType { | |
| 685 | + | core.LazyRegister(&xFullscreenModeGLibType, "GDK", "gdk_fullscreen_mode_get_type", false) | |
| 554 | 686 | return xFullscreenModeGLibType() | |
| 555 | 687 | } | |
| 556 | 688 | ||
| @@ -568,6 +700,7 @@ type SurfaceEdge int | |||
| 568 | 700 | var xSurfaceEdgeGLibType func() types.GType | |
| 569 | 701 | ||
| 570 | 702 | func SurfaceEdgeGLibType() types.GType { | |
| 703 | + | core.LazyRegister(&xSurfaceEdgeGLibType, "GDK", "gdk_surface_edge_get_type", false) | |
| 571 | 704 | return xSurfaceEdgeGLibType() | |
| 572 | 705 | } | |
| 573 | 706 | ||
| @@ -598,6 +731,7 @@ type TitlebarGesture int | |||
| 598 | 731 | var xTitlebarGestureGLibType func() types.GType | |
| 599 | 732 | ||
| 600 | 733 | func TitlebarGestureGLibType() types.GType { | |
| 734 | + | core.LazyRegister(&xTitlebarGestureGLibType, "GDK", "gdk_titlebar_gesture_get_type", false) | |
| 601 | 735 | return xTitlebarGestureGLibType() | |
| 602 | 736 | } | |
| 603 | 737 | ||
| @@ -614,47 +748,4 @@ const ( | |||
| 614 | 748 | func init() { | |
| 615 | 749 | core.SetPackageName("GDK", "gtk4") | |
| 616 | 750 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | |
| 617 | - | var libs []uintptr | |
| 618 | - | for _, libPath := range core.GetPaths("GDK") { | |
| 619 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 620 | - | if err != nil { | |
| 621 | - | panic(err) | |
| 622 | - | } | |
| 623 | - | libs = append(libs, lib) | |
| 624 | - | } | |
| 625 | - | ||
| 626 | - | core.PuregoSafeRegister(&xToplevelCapabilitiesGLibType, libs, "gdk_toplevel_capabilities_get_type") | |
| 627 | - | ||
| 628 | - | core.PuregoSafeRegister(&xToplevelStateGLibType, libs, "gdk_toplevel_state_get_type") | |
| 629 | - | ||
| 630 | - | core.PuregoSafeRegister(&xFullscreenModeGLibType, libs, "gdk_fullscreen_mode_get_type") | |
| 631 | - | ||
| 632 | - | core.PuregoSafeRegister(&xSurfaceEdgeGLibType, libs, "gdk_surface_edge_get_type") | |
| 633 | - | ||
| 634 | - | core.PuregoSafeRegister(&xTitlebarGestureGLibType, libs, "gdk_titlebar_gesture_get_type") | |
| 635 | - | ||
| 636 | - | core.PuregoSafeRegister(&xToplevelGLibType, libs, "gdk_toplevel_get_type") | |
| 637 | - | ||
| 638 | - | core.PuregoSafeRegister(&XGdkToplevelBeginMove, libs, "gdk_toplevel_begin_move") | |
| 639 | - | core.PuregoSafeRegister(&XGdkToplevelBeginResize, libs, "gdk_toplevel_begin_resize") | |
| 640 | - | core.PuregoSafeRegister(&XGdkToplevelFocus, libs, "gdk_toplevel_focus") | |
| 641 | - | core.PuregoSafeRegister(&XGdkToplevelGetCapabilities, libs, "gdk_toplevel_get_capabilities") | |
| 642 | - | core.PuregoSafeRegister(&XGdkToplevelGetGravity, libs, "gdk_toplevel_get_gravity") | |
| 643 | - | core.PuregoSafeRegister(&XGdkToplevelGetState, libs, "gdk_toplevel_get_state") | |
| 644 | - | core.PuregoSafeRegister(&XGdkToplevelInhibitSystemShortcuts, libs, "gdk_toplevel_inhibit_system_shortcuts") | |
| 645 | - | core.PuregoSafeRegister(&XGdkToplevelLower, libs, "gdk_toplevel_lower") | |
| 646 | - | core.PuregoSafeRegister(&XGdkToplevelMinimize, libs, "gdk_toplevel_minimize") | |
| 647 | - | core.PuregoSafeRegister(&XGdkToplevelPresent, libs, "gdk_toplevel_present") | |
| 648 | - | core.PuregoSafeRegister(&XGdkToplevelRestoreSystemShortcuts, libs, "gdk_toplevel_restore_system_shortcuts") | |
| 649 | - | core.PuregoSafeRegister(&XGdkToplevelSetDecorated, libs, "gdk_toplevel_set_decorated") | |
| 650 | - | core.PuregoSafeRegister(&XGdkToplevelSetDeletable, libs, "gdk_toplevel_set_deletable") | |
| 651 | - | core.PuregoSafeRegister(&XGdkToplevelSetGravity, libs, "gdk_toplevel_set_gravity") | |
| 652 | - | core.PuregoSafeRegister(&XGdkToplevelSetIconList, libs, "gdk_toplevel_set_icon_list") | |
| 653 | - | core.PuregoSafeRegister(&XGdkToplevelSetModal, libs, "gdk_toplevel_set_modal") | |
| 654 | - | core.PuregoSafeRegister(&XGdkToplevelSetStartupId, libs, "gdk_toplevel_set_startup_id") | |
| 655 | - | core.PuregoSafeRegister(&XGdkToplevelSetTitle, libs, "gdk_toplevel_set_title") | |
| 656 | - | core.PuregoSafeRegister(&XGdkToplevelSetTransientFor, libs, "gdk_toplevel_set_transient_for") | |
| 657 | - | core.PuregoSafeRegister(&XGdkToplevelShowWindowMenu, libs, "gdk_toplevel_show_window_menu") | |
| 658 | - | core.PuregoSafeRegister(&XGdkToplevelSupportsEdgeConstraints, libs, "gdk_toplevel_supports_edge_constraints") | |
| 659 | - | core.PuregoSafeRegister(&XGdkToplevelTitlebarGesture, libs, "gdk_toplevel_titlebar_gesture") | |
| 660 | 751 | } | |
| @@ -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/glib" | 9 | "github.com/bnema/puregotk/v4/glib" | ||
| 11 | "github.com/bnema/puregotk/v4/gobject" | 10 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -63,6 +62,7 @@ type Toplevel interface { | |||||
| 63 | var xToplevelGLibType func() types.GType | 62 | var xToplevelGLibType func() types.GType | ||
| 64 | 63 | ||||
| 65 | func ToplevelGLibType() types.GType { | 64 | func ToplevelGLibType() types.GType { | ||
| 65 | + | core.LazyRegister(&xToplevelGLibType, "GDK", "gdk_toplevel_get_type", false) | |||
| 66 | return xToplevelGLibType() | 66 | return xToplevelGLibType() | ||
| 67 | } | 67 | } | ||
| 68 | 68 | ||||
| @@ -433,30 +433,159 @@ func (x *ToplevelBase) GetPropertyTitle() string { | |||||
| 433 | return v.GetString() | 433 | return v.GetString() | ||
| 434 | } | 434 | } | ||
| 435 | 435 | ||||
| 436 | + | var XGdkToplevelBeginMove func(uintptr, uintptr, int, float64, float64, uint32) = func(instance uintptr, DeviceVarp uintptr, ButtonVarp int, XVarp float64, YVarp float64, TimestampVarp uint32) { | |||
| 437 | + | core.LazyRegister(&xXGdkToplevelBeginMove, "GDK", "gdk_toplevel_begin_move", false) | |||
| 438 | + | xXGdkToplevelBeginMove(instance, DeviceVarp, ButtonVarp, XVarp, YVarp, TimestampVarp) | |||
| 439 | + | } | |||
| 440 | + | ||||
| 441 | + | var ( | |||
| 442 | + | xXGdkToplevelBeginMove func(uintptr, uintptr, int, float64, float64, uint32) | |||
| 443 | + | XGdkToplevelBeginResize func(uintptr, SurfaceEdge, uintptr, int, float64, float64, uint32) = func(instance uintptr, EdgeVarp SurfaceEdge, DeviceVarp uintptr, ButtonVarp int, XVarp float64, YVarp float64, TimestampVarp uint32) { | |||
| 444 | + | core.LazyRegister(&xXGdkToplevelBeginResize, "GDK", "gdk_toplevel_begin_resize", false) | |||
| 445 | + | xXGdkToplevelBeginResize(instance, EdgeVarp, DeviceVarp, ButtonVarp, XVarp, YVarp, TimestampVarp) | |||
| 446 | + | } | |||
| 447 | + | ) | |||
| 448 | + | var ( | |||
| 449 | + | xXGdkToplevelBeginResize func(uintptr, SurfaceEdge, uintptr, int, float64, float64, uint32) | |||
| 450 | + | XGdkToplevelFocus func(uintptr, uint32) = func(instance uintptr, TimestampVarp uint32) { | |||
| 451 | + | core.LazyRegister(&xXGdkToplevelFocus, "GDK", "gdk_toplevel_focus", false) | |||
| 452 | + | xXGdkToplevelFocus(instance, TimestampVarp) | |||
| 453 | + | } | |||
| 454 | + | ) | |||
| 455 | + | var ( | |||
| 456 | + | xXGdkToplevelFocus func(uintptr, uint32) | |||
| 457 | + | XGdkToplevelGetCapabilities func(uintptr) ToplevelCapabilities = func(instance uintptr) ToplevelCapabilities { | |||
| 458 | + | core.LazyRegister(&xXGdkToplevelGetCapabilities, "GDK", "gdk_toplevel_get_capabilities", false) | |||
| 459 | + | return xXGdkToplevelGetCapabilities(instance) | |||
| 460 | + | } | |||
| 461 | + | ) | |||
| 462 | + | var ( | |||
| 463 | + | xXGdkToplevelGetCapabilities func(uintptr) ToplevelCapabilities | |||
| 464 | + | XGdkToplevelGetGravity func(uintptr) Gravity = func(instance uintptr) Gravity { | |||
| 465 | + | core.LazyRegister(&xXGdkToplevelGetGravity, "GDK", "gdk_toplevel_get_gravity", false) | |||
| 466 | + | return xXGdkToplevelGetGravity(instance) | |||
| 467 | + | } | |||
| 468 | + | ) | |||
| 469 | + | var ( | |||
| 470 | + | xXGdkToplevelGetGravity func(uintptr) Gravity | |||
| 471 | + | XGdkToplevelGetState func(uintptr) ToplevelState = func(instance uintptr) ToplevelState { | |||
| 472 | + | core.LazyRegister(&xXGdkToplevelGetState, "GDK", "gdk_toplevel_get_state", false) | |||
| 473 | + | return xXGdkToplevelGetState(instance) | |||
| 474 | + | } | |||
| 475 | + | ) | |||
| 436 | var ( | 476 | var ( | ||
| 437 | - | XGdkToplevelBeginMove func(uintptr, uintptr, int, float64, float64, uint32) | 477 | + | xXGdkToplevelGetState func(uintptr) ToplevelState |
| 438 | - | XGdkToplevelBeginResize func(uintptr, SurfaceEdge, uintptr, int, float64, float64, uint32) | 478 | + | XGdkToplevelInhibitSystemShortcuts func(uintptr, uintptr) = func(instance uintptr, EventVarp uintptr) { |
| 439 | - | XGdkToplevelFocus func(uintptr, uint32) | 479 | + | core.LazyRegister(&xXGdkToplevelInhibitSystemShortcuts, "GDK", "gdk_toplevel_inhibit_system_shortcuts", false) |
| 440 | - | XGdkToplevelGetCapabilities func(uintptr) ToplevelCapabilities | 480 | + | xXGdkToplevelInhibitSystemShortcuts(instance, EventVarp) |
| 441 | - | XGdkToplevelGetGravity func(uintptr) Gravity | 481 | + | } |
| 442 | - | XGdkToplevelGetState func(uintptr) ToplevelState | 482 | + | ) |
| 443 | - | XGdkToplevelInhibitSystemShortcuts func(uintptr, uintptr) | 483 | + | var ( |
| 444 | - | XGdkToplevelLower func(uintptr) bool | 484 | + | xXGdkToplevelInhibitSystemShortcuts func(uintptr, uintptr) |
| 445 | - | XGdkToplevelMinimize func(uintptr) bool | 485 | + | XGdkToplevelLower func(uintptr) bool = func(instance uintptr) bool { |
| 446 | - | XGdkToplevelPresent func(uintptr, *ToplevelLayout) | 486 | + | core.LazyRegister(&xXGdkToplevelLower, "GDK", "gdk_toplevel_lower", false) |
| 447 | - | XGdkToplevelRestoreSystemShortcuts func(uintptr) | 487 | + | return xXGdkToplevelLower(instance) |
| 448 | - | XGdkToplevelSetDecorated func(uintptr, bool) | 488 | + | } |
| 449 | - | XGdkToplevelSetDeletable func(uintptr, bool) | 489 | + | ) |
| 450 | - | XGdkToplevelSetGravity func(uintptr, Gravity) | 490 | + | var ( |
| 451 | - | XGdkToplevelSetIconList func(uintptr, *glib.List) | 491 | + | xXGdkToplevelLower func(uintptr) bool |
| 452 | - | XGdkToplevelSetModal func(uintptr, bool) | 492 | + | XGdkToplevelMinimize func(uintptr) bool = func(instance uintptr) bool { |
| 453 | - | XGdkToplevelSetStartupId func(uintptr, string) | 493 | + | core.LazyRegister(&xXGdkToplevelMinimize, "GDK", "gdk_toplevel_minimize", false) |
| 454 | - | XGdkToplevelSetTitle func(uintptr, string) | 494 | + | return xXGdkToplevelMinimize(instance) |
| 455 | - | XGdkToplevelSetTransientFor func(uintptr, uintptr) | 495 | + | } |
| 456 | - | XGdkToplevelShowWindowMenu func(uintptr, uintptr) bool | 496 | + | ) |
| 457 | - | XGdkToplevelSupportsEdgeConstraints func(uintptr) bool | 497 | + | var ( |
| 458 | - | XGdkToplevelTitlebarGesture func(uintptr, TitlebarGesture) bool | 498 | + | xXGdkToplevelMinimize func(uintptr) bool |
| 499 | + | XGdkToplevelPresent func(uintptr, *ToplevelLayout) = func(instance uintptr, LayoutVarp *ToplevelLayout) { | |||
| 500 | + | core.LazyRegister(&xXGdkToplevelPresent, "GDK", "gdk_toplevel_present", false) | |||
| 501 | + | xXGdkToplevelPresent(instance, LayoutVarp) | |||
| 502 | + | } | |||
| 503 | + | ) | |||
| 504 | + | var ( | |||
| 505 | + | xXGdkToplevelPresent func(uintptr, *ToplevelLayout) | |||
| 506 | + | XGdkToplevelRestoreSystemShortcuts func(uintptr) = func(instance uintptr) { | |||
| 507 | + | core.LazyRegister(&xXGdkToplevelRestoreSystemShortcuts, "GDK", "gdk_toplevel_restore_system_shortcuts", false) | |||
| 508 | + | xXGdkToplevelRestoreSystemShortcuts(instance) | |||
| 509 | + | } | |||
| 510 | + | ) | |||
| 511 | + | var ( | |||
| 512 | + | xXGdkToplevelRestoreSystemShortcuts func(uintptr) | |||
| 513 | + | XGdkToplevelSetDecorated func(uintptr, bool) = func(instance uintptr, DecoratedVarp bool) { | |||
| 514 | + | core.LazyRegister(&xXGdkToplevelSetDecorated, "GDK", "gdk_toplevel_set_decorated", false) | |||
| 515 | + | xXGdkToplevelSetDecorated(instance, DecoratedVarp) | |||
| 516 | + | } | |||
| 459 | ) | 517 | ) | ||
| 518 | + | var ( | |||
| 519 | + | xXGdkToplevelSetDecorated func(uintptr, bool) | |||
| 520 | + | XGdkToplevelSetDeletable func(uintptr, bool) = func(instance uintptr, DeletableVarp bool) { | |||
| 521 | + | core.LazyRegister(&xXGdkToplevelSetDeletable, "GDK", "gdk_toplevel_set_deletable", false) | |||
| 522 | + | xXGdkToplevelSetDeletable(instance, DeletableVarp) | |||
| 523 | + | } | |||
| 524 | + | ) | |||
| 525 | + | var ( | |||
| 526 | + | xXGdkToplevelSetDeletable func(uintptr, bool) | |||
| 527 | + | XGdkToplevelSetGravity func(uintptr, Gravity) = func(instance uintptr, GravityVarp Gravity) { | |||
| 528 | + | core.LazyRegister(&xXGdkToplevelSetGravity, "GDK", "gdk_toplevel_set_gravity", false) | |||
| 529 | + | xXGdkToplevelSetGravity(instance, GravityVarp) | |||
| 530 | + | } | |||
| 531 | + | ) | |||
| 532 | + | var ( | |||
| 533 | + | xXGdkToplevelSetGravity func(uintptr, Gravity) | |||
| 534 | + | XGdkToplevelSetIconList func(uintptr, *glib.List) = func(instance uintptr, SurfacesVarp *glib.List) { | |||
| 535 | + | core.LazyRegister(&xXGdkToplevelSetIconList, "GDK", "gdk_toplevel_set_icon_list", false) | |||
| 536 | + | xXGdkToplevelSetIconList(instance, SurfacesVarp) | |||
| 537 | + | } | |||
| 538 | + | ) | |||
| 539 | + | var ( | |||
| 540 | + | xXGdkToplevelSetIconList func(uintptr, *glib.List) | |||
| 541 | + | XGdkToplevelSetModal func(uintptr, bool) = func(instance uintptr, ModalVarp bool) { | |||
| 542 | + | core.LazyRegister(&xXGdkToplevelSetModal, "GDK", "gdk_toplevel_set_modal", false) | |||
| 543 | + | xXGdkToplevelSetModal(instance, ModalVarp) | |||
| 544 | + | } | |||
| 545 | + | ) | |||
| 546 | + | var ( | |||
| 547 | + | xXGdkToplevelSetModal func(uintptr, bool) | |||
| 548 | + | XGdkToplevelSetStartupId func(uintptr, string) = func(instance uintptr, StartupIdVarp string) { | |||
| 549 | + | core.LazyRegister(&xXGdkToplevelSetStartupId, "GDK", "gdk_toplevel_set_startup_id", false) | |||
| 550 | + | xXGdkToplevelSetStartupId(instance, StartupIdVarp) | |||
| 551 | + | } | |||
| 552 | + | ) | |||
| 553 | + | var ( | |||
| 554 | + | xXGdkToplevelSetStartupId func(uintptr, string) | |||
| 555 | + | XGdkToplevelSetTitle func(uintptr, string) = func(instance uintptr, TitleVarp string) { | |||
| 556 | + | core.LazyRegister(&xXGdkToplevelSetTitle, "GDK", "gdk_toplevel_set_title", false) | |||
| 557 | + | xXGdkToplevelSetTitle(instance, TitleVarp) | |||
| 558 | + | } | |||
| 559 | + | ) | |||
| 560 | + | var ( | |||
| 561 | + | xXGdkToplevelSetTitle func(uintptr, string) | |||
| 562 | + | XGdkToplevelSetTransientFor func(uintptr, uintptr) = func(instance uintptr, ParentVarp uintptr) { | |||
| 563 | + | core.LazyRegister(&xXGdkToplevelSetTransientFor, "GDK", "gdk_toplevel_set_transient_for", false) | |||
| 564 | + | xXGdkToplevelSetTransientFor(instance, ParentVarp) | |||
| 565 | + | } | |||
| 566 | + | ) | |||
| 567 | + | var ( | |||
| 568 | + | xXGdkToplevelSetTransientFor func(uintptr, uintptr) | |||
| 569 | + | XGdkToplevelShowWindowMenu func(uintptr, uintptr) bool = func(instance uintptr, EventVarp uintptr) bool { | |||
| 570 | + | core.LazyRegister(&xXGdkToplevelShowWindowMenu, "GDK", "gdk_toplevel_show_window_menu", false) | |||
| 571 | + | return xXGdkToplevelShowWindowMenu(instance, EventVarp) | |||
| 572 | + | } | |||
| 573 | + | ) | |||
| 574 | + | var ( | |||
| 575 | + | xXGdkToplevelShowWindowMenu func(uintptr, uintptr) bool | |||
| 576 | + | XGdkToplevelSupportsEdgeConstraints func(uintptr) bool = func(instance uintptr) bool { | |||
| 577 | + | core.LazyRegister(&xXGdkToplevelSupportsEdgeConstraints, "GDK", "gdk_toplevel_supports_edge_constraints", false) | |||
| 578 | + | return xXGdkToplevelSupportsEdgeConstraints(instance) | |||
| 579 | + | } | |||
| 580 | + | ) | |||
| 581 | + | var ( | |||
| 582 | + | xXGdkToplevelSupportsEdgeConstraints func(uintptr) bool | |||
| 583 | + | XGdkToplevelTitlebarGesture func(uintptr, TitlebarGesture) bool = func(instance uintptr, GestureVarp TitlebarGesture) bool { | |||
| 584 | + | core.LazyRegister(&xXGdkToplevelTitlebarGesture, "GDK", "gdk_toplevel_titlebar_gesture", false) | |||
| 585 | + | return xXGdkToplevelTitlebarGesture(instance, GestureVarp) | |||
| 586 | + | } | |||
| 587 | + | ) | |||
| 588 | + | var xXGdkToplevelTitlebarGesture func(uintptr, TitlebarGesture) bool | |||
| 460 | 589 | ||||
| 461 | // Reflects what features a `GdkToplevel` supports. | 590 | // Reflects what features a `GdkToplevel` supports. | ||
| 462 | type ToplevelCapabilities int | 591 | type ToplevelCapabilities int | ||
| @@ -464,6 +593,7 @@ type ToplevelCapabilities int | |||||
| 464 | var xToplevelCapabilitiesGLibType func() types.GType | 593 | var xToplevelCapabilitiesGLibType func() types.GType | ||
| 465 | 594 | ||||
| 466 | func ToplevelCapabilitiesGLibType() types.GType { | 595 | func ToplevelCapabilitiesGLibType() types.GType { | ||
| 596 | + | core.LazyRegister(&xToplevelCapabilitiesGLibType, "GDK", "gdk_toplevel_capabilities_get_type", false) | |||
| 467 | return xToplevelCapabilitiesGLibType() | 597 | return xToplevelCapabilitiesGLibType() | ||
| 468 | } | 598 | } | ||
| 469 | 599 | ||||
| @@ -504,6 +634,7 @@ type ToplevelState int | |||||
| 504 | var xToplevelStateGLibType func() types.GType | 634 | var xToplevelStateGLibType func() types.GType | ||
| 505 | 635 | ||||
| 506 | func ToplevelStateGLibType() types.GType { | 636 | func ToplevelStateGLibType() types.GType { | ||
| 637 | + | core.LazyRegister(&xToplevelStateGLibType, "GDK", "gdk_toplevel_state_get_type", false) | |||
| 507 | return xToplevelStateGLibType() | 638 | return xToplevelStateGLibType() | ||
| 508 | } | 639 | } | ||
| 509 | 640 | ||||
| @@ -551,6 +682,7 @@ type FullscreenMode int | |||||
| 551 | var xFullscreenModeGLibType func() types.GType | 682 | var xFullscreenModeGLibType func() types.GType | ||
| 552 | 683 | ||||
| 553 | func FullscreenModeGLibType() types.GType { | 684 | func FullscreenModeGLibType() types.GType { | ||
| 685 | + | core.LazyRegister(&xFullscreenModeGLibType, "GDK", "gdk_fullscreen_mode_get_type", false) | |||
| 554 | return xFullscreenModeGLibType() | 686 | return xFullscreenModeGLibType() | ||
| 555 | } | 687 | } | ||
| 556 | 688 | ||||
| @@ -568,6 +700,7 @@ type SurfaceEdge int | |||||
| 568 | var xSurfaceEdgeGLibType func() types.GType | 700 | var xSurfaceEdgeGLibType func() types.GType | ||
| 569 | 701 | ||||
| 570 | func SurfaceEdgeGLibType() types.GType { | 702 | func SurfaceEdgeGLibType() types.GType { | ||
| 703 | + | core.LazyRegister(&xSurfaceEdgeGLibType, "GDK", "gdk_surface_edge_get_type", false) | |||
| 571 | return xSurfaceEdgeGLibType() | 704 | return xSurfaceEdgeGLibType() | ||
| 572 | } | 705 | } | ||
| 573 | 706 | ||||
| @@ -598,6 +731,7 @@ type TitlebarGesture int | |||||
| 598 | var xTitlebarGestureGLibType func() types.GType | 731 | var xTitlebarGestureGLibType func() types.GType | ||
| 599 | 732 | ||||
| 600 | func TitlebarGestureGLibType() types.GType { | 733 | func TitlebarGestureGLibType() types.GType { | ||
| 734 | + | core.LazyRegister(&xTitlebarGestureGLibType, "GDK", "gdk_titlebar_gesture_get_type", false) | |||
| 601 | return xTitlebarGestureGLibType() | 735 | return xTitlebarGestureGLibType() | ||
| 602 | } | 736 | } | ||
| 603 | 737 | ||||
| @@ -614,47 +748,4 @@ const ( | |||||
| 614 | func init() { | 748 | func init() { | ||
| 615 | core.SetPackageName("GDK", "gtk4") | 749 | core.SetPackageName("GDK", "gtk4") | ||
| 616 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 750 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | ||
| 617 | - | var libs []uintptr | |||
| 618 | - | for _, libPath := range core.GetPaths("GDK") { | |||
| 619 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 620 | - | if err != nil { | |||
| 621 | - | panic(err) | |||
| 622 | - | } | |||
| 623 | - | libs = append(libs, lib) | |||
| 624 | - | } | |||
| 625 | - | ||||
| 626 | - | core.PuregoSafeRegister(&xToplevelCapabilitiesGLibType, libs, "gdk_toplevel_capabilities_get_type") | |||
| 627 | - | ||||
| 628 | - | core.PuregoSafeRegister(&xToplevelStateGLibType, libs, "gdk_toplevel_state_get_type") | |||
| 629 | - | ||||
| 630 | - | core.PuregoSafeRegister(&xFullscreenModeGLibType, libs, "gdk_fullscreen_mode_get_type") | |||
| 631 | - | ||||
| 632 | - | core.PuregoSafeRegister(&xSurfaceEdgeGLibType, libs, "gdk_surface_edge_get_type") | |||
| 633 | - | ||||
| 634 | - | core.PuregoSafeRegister(&xTitlebarGestureGLibType, libs, "gdk_titlebar_gesture_get_type") | |||
| 635 | - | ||||
| 636 | - | core.PuregoSafeRegister(&xToplevelGLibType, libs, "gdk_toplevel_get_type") | |||
| 637 | - | ||||
| 638 | - | core.PuregoSafeRegister(&XGdkToplevelBeginMove, libs, "gdk_toplevel_begin_move") | |||
| 639 | - | core.PuregoSafeRegister(&XGdkToplevelBeginResize, libs, "gdk_toplevel_begin_resize") | |||
| 640 | - | core.PuregoSafeRegister(&XGdkToplevelFocus, libs, "gdk_toplevel_focus") | |||
| 641 | - | core.PuregoSafeRegister(&XGdkToplevelGetCapabilities, libs, "gdk_toplevel_get_capabilities") | |||
| 642 | - | core.PuregoSafeRegister(&XGdkToplevelGetGravity, libs, "gdk_toplevel_get_gravity") | |||
| 643 | - | core.PuregoSafeRegister(&XGdkToplevelGetState, libs, "gdk_toplevel_get_state") | |||
| 644 | - | core.PuregoSafeRegister(&XGdkToplevelInhibitSystemShortcuts, libs, "gdk_toplevel_inhibit_system_shortcuts") | |||
| 645 | - | core.PuregoSafeRegister(&XGdkToplevelLower, libs, "gdk_toplevel_lower") | |||
| 646 | - | core.PuregoSafeRegister(&XGdkToplevelMinimize, libs, "gdk_toplevel_minimize") | |||
| 647 | - | core.PuregoSafeRegister(&XGdkToplevelPresent, libs, "gdk_toplevel_present") | |||
| 648 | - | core.PuregoSafeRegister(&XGdkToplevelRestoreSystemShortcuts, libs, "gdk_toplevel_restore_system_shortcuts") | |||
| 649 | - | core.PuregoSafeRegister(&XGdkToplevelSetDecorated, libs, "gdk_toplevel_set_decorated") | |||
| 650 | - | core.PuregoSafeRegister(&XGdkToplevelSetDeletable, libs, "gdk_toplevel_set_deletable") | |||
| 651 | - | core.PuregoSafeRegister(&XGdkToplevelSetGravity, libs, "gdk_toplevel_set_gravity") | |||
| 652 | - | core.PuregoSafeRegister(&XGdkToplevelSetIconList, libs, "gdk_toplevel_set_icon_list") | |||
| 653 | - | core.PuregoSafeRegister(&XGdkToplevelSetModal, libs, "gdk_toplevel_set_modal") | |||
| 654 | - | core.PuregoSafeRegister(&XGdkToplevelSetStartupId, libs, "gdk_toplevel_set_startup_id") | |||
| 655 | - | core.PuregoSafeRegister(&XGdkToplevelSetTitle, libs, "gdk_toplevel_set_title") | |||
| 656 | - | core.PuregoSafeRegister(&XGdkToplevelSetTransientFor, libs, "gdk_toplevel_set_transient_for") | |||
| 657 | - | core.PuregoSafeRegister(&XGdkToplevelShowWindowMenu, libs, "gdk_toplevel_show_window_menu") | |||
| 658 | - | core.PuregoSafeRegister(&XGdkToplevelSupportsEdgeConstraints, libs, "gdk_toplevel_supports_edge_constraints") | |||
| 659 | - | core.PuregoSafeRegister(&XGdkToplevelTitlebarGesture, libs, "gdk_toplevel_titlebar_gesture") | |||
| 660 | } | 751 | } | ||