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
| @@ -4,7 +4,6 @@ package gdk | |||
| 4 | 4 | import ( | |
| 5 | 5 | "unsafe" | |
| 6 | 6 | ||
| 7 | - | "github.com/bnema/purego" | |
| 8 | 7 | "github.com/bnema/puregotk/pkg/core" | |
| 9 | 8 | "github.com/bnema/puregotk/v4/gio" | |
| 10 | 9 | "github.com/bnema/puregotk/v4/glib" | |
| @@ -33,6 +32,7 @@ type Display struct { | |||
| 33 | 32 | var xDisplayGLibType func() types.GType | |
| 34 | 33 | ||
| 35 | 34 | func DisplayGLibType() types.GType { | |
| 35 | + | core.LazyRegister(&xDisplayGLibType, "GDK", "gdk_display_get_type", false) | |
| 36 | 36 | return xDisplayGLibType() | |
| 37 | 37 | } | |
| 38 | 38 | ||
| @@ -46,6 +46,8 @@ var xDisplayBeep func(uintptr) | |||
| 46 | 46 | ||
| 47 | 47 | // Emits a short beep on @display | |
| 48 | 48 | func (x *Display) Beep() { | |
| 49 | + | core.LazyRegister(&xDisplayBeep, "GDK", "gdk_display_beep", false) | |
| 50 | + | ||
| 49 | 51 | xDisplayBeep(x.GoPointer()) | |
| 50 | 52 | } | |
| 51 | 53 | ||
| @@ -55,6 +57,8 @@ var xDisplayClose func(uintptr) | |||
| 55 | 57 | // | |
| 56 | 58 | // This cleans up associated resources. | |
| 57 | 59 | func (x *Display) Close() { | |
| 60 | + | core.LazyRegister(&xDisplayClose, "GDK", "gdk_display_close", false) | |
| 61 | + | ||
| 58 | 62 | xDisplayClose(x.GoPointer()) | |
| 59 | 63 | } | |
| 60 | 64 | ||
| @@ -70,6 +74,7 @@ var xDisplayCreateGlContext func(uintptr, **glib.Error) uintptr | |||
| 70 | 74 | // Before using the returned `GdkGLContext`, you will need to | |
| 71 | 75 | // call [method@Gdk.GLContext.make_current] or [method@Gdk.GLContext.realize]. | |
| 72 | 76 | func (x *Display) CreateGlContext() (*GLContext, error) { | |
| 77 | + | core.LazyRegister(&xDisplayCreateGlContext, "GDK", "gdk_display_create_gl_context", false) | |
| 73 | 78 | var cls *GLContext | |
| 74 | 79 | var cerr *glib.Error | |
| 75 | 80 | ||
| @@ -90,6 +95,8 @@ var xDisplayDeviceIsGrabbed func(uintptr, uintptr) bool | |||
| 90 | 95 | ||
| 91 | 96 | // Returns %TRUE if there is an ongoing grab on @device for @display. | |
| 92 | 97 | func (x *Display) DeviceIsGrabbed(DeviceVar *Device) bool { | |
| 98 | + | core.LazyRegister(&xDisplayDeviceIsGrabbed, "GDK", "gdk_display_device_is_grabbed", false) | |
| 99 | + | ||
| 93 | 100 | cret := xDisplayDeviceIsGrabbed(x.GoPointer(), DeviceVar.GoPointer()) | |
| 94 | 101 | return cret | |
| 95 | 102 | } | |
| @@ -107,6 +114,8 @@ var xDisplayFlush func(uintptr) | |||
| 107 | 114 | // This is most useful for X11. On windowing systems where requests are | |
| 108 | 115 | // handled synchronously, this function will do nothing. | |
| 109 | 116 | func (x *Display) Flush() { | |
| 117 | + | core.LazyRegister(&xDisplayFlush, "GDK", "gdk_display_flush", false) | |
| 118 | + | ||
| 110 | 119 | xDisplayFlush(x.GoPointer()) | |
| 111 | 120 | } | |
| 112 | 121 | ||
| @@ -115,6 +124,7 @@ var xDisplayGetAppLaunchContext func(uintptr) uintptr | |||
| 115 | 124 | // Returns a `GdkAppLaunchContext` suitable for launching | |
| 116 | 125 | // applications on the given display. | |
| 117 | 126 | func (x *Display) GetAppLaunchContext() *AppLaunchContext { | |
| 127 | + | core.LazyRegister(&xDisplayGetAppLaunchContext, "GDK", "gdk_display_get_app_launch_context", false) | |
| 118 | 128 | var cls *AppLaunchContext | |
| 119 | 129 | ||
| 120 | 130 | cret := xDisplayGetAppLaunchContext(x.GoPointer()) | |
| @@ -131,6 +141,7 @@ var xDisplayGetClipboard func(uintptr) uintptr | |||
| 131 | 141 | ||
| 132 | 142 | // Gets the clipboard used for copy/paste operations. | |
| 133 | 143 | func (x *Display) GetClipboard() *Clipboard { | |
| 144 | + | core.LazyRegister(&xDisplayGetClipboard, "GDK", "gdk_display_get_clipboard", false) | |
| 134 | 145 | var cls *Clipboard | |
| 135 | 146 | ||
| 136 | 147 | cret := xDisplayGetClipboard(x.GoPointer()) | |
| @@ -151,6 +162,7 @@ var xDisplayGetDefaultSeat func(uintptr) uintptr | |||
| 151 | 162 | // Note that a display may not have a seat. In this case, | |
| 152 | 163 | // this function will return %NULL. | |
| 153 | 164 | func (x *Display) GetDefaultSeat() *Seat { | |
| 165 | + | core.LazyRegister(&xDisplayGetDefaultSeat, "GDK", "gdk_display_get_default_seat", false) | |
| 154 | 166 | var cls *Seat | |
| 155 | 167 | ||
| 156 | 168 | cret := xDisplayGetDefaultSeat(x.GoPointer()) | |
| @@ -178,6 +190,8 @@ var xDisplayGetDmabufFormats func(uintptr) uintptr | |||
| 178 | 190 | // | |
| 179 | 191 | // This function is threadsafe. It can be called from any thread. | |
| 180 | 192 | func (x *Display) GetDmabufFormats() *DmabufFormats { | |
| 193 | + | core.LazyRegister(&xDisplayGetDmabufFormats, "GDK", "gdk_display_get_dmabuf_formats", false) | |
| 194 | + | ||
| 181 | 195 | cret := xDisplayGetDmabufFormats(x.GoPointer()) | |
| 182 | 196 | if cret == 0 { | |
| 183 | 197 | return nil | |
| @@ -190,6 +204,7 @@ var xDisplayGetMonitorAtSurface func(uintptr, uintptr) uintptr | |||
| 190 | 204 | // Gets the monitor in which the largest area of @surface | |
| 191 | 205 | // resides. | |
| 192 | 206 | func (x *Display) GetMonitorAtSurface(SurfaceVar *Surface) *Monitor { | |
| 207 | + | core.LazyRegister(&xDisplayGetMonitorAtSurface, "GDK", "gdk_display_get_monitor_at_surface", false) | |
| 193 | 208 | var cls *Monitor | |
| 194 | 209 | ||
| 195 | 210 | cret := xDisplayGetMonitorAtSurface(x.GoPointer(), SurfaceVar.GoPointer()) | |
| @@ -213,6 +228,7 @@ var xDisplayGetMonitors func(uintptr) uintptr | |||
| 213 | 228 | // You can listen to the GListModel::items-changed signal on | |
| 214 | 229 | // this list to monitor changes to the monitor of this display. | |
| 215 | 230 | func (x *Display) GetMonitors() *gio.ListModelBase { | |
| 231 | + | core.LazyRegister(&xDisplayGetMonitors, "GDK", "gdk_display_get_monitors", false) | |
| 216 | 232 | var cls *gio.ListModelBase | |
| 217 | 233 | ||
| 218 | 234 | cret := xDisplayGetMonitors(x.GoPointer()) | |
| @@ -230,6 +246,8 @@ var xDisplayGetName func(uintptr) string | |||
| 230 | 246 | ||
| 231 | 247 | // Gets the name of the display. | |
| 232 | 248 | func (x *Display) GetName() string { | |
| 249 | + | core.LazyRegister(&xDisplayGetName, "GDK", "gdk_display_get_name", false) | |
| 250 | + | ||
| 233 | 251 | cret := xDisplayGetName(x.GoPointer()) | |
| 234 | 252 | return cret | |
| 235 | 253 | } | |
| @@ -241,6 +259,7 @@ var xDisplayGetPrimaryClipboard func(uintptr) uintptr | |||
| 241 | 259 | // On backends where the primary clipboard is not supported natively, | |
| 242 | 260 | // GDK emulates this clipboard locally. | |
| 243 | 261 | func (x *Display) GetPrimaryClipboard() *Clipboard { | |
| 262 | + | core.LazyRegister(&xDisplayGetPrimaryClipboard, "GDK", "gdk_display_get_primary_clipboard", false) | |
| 244 | 263 | var cls *Clipboard | |
| 245 | 264 | ||
| 246 | 265 | cret := xDisplayGetPrimaryClipboard(x.GoPointer()) | |
| @@ -259,6 +278,8 @@ var xDisplayGetSetting func(uintptr, string, *gobject.Value) bool | |||
| 259 | 278 | // Retrieves a desktop-wide setting such as double-click time | |
| 260 | 279 | // for the @display. | |
| 261 | 280 | func (x *Display) GetSetting(NameVar string, ValueVar *gobject.Value) bool { | |
| 281 | + | core.LazyRegister(&xDisplayGetSetting, "GDK", "gdk_display_get_setting", false) | |
| 282 | + | ||
| 262 | 283 | cret := xDisplayGetSetting(x.GoPointer(), NameVar, ValueVar) | |
| 263 | 284 | return cret | |
| 264 | 285 | } | |
| @@ -268,6 +289,8 @@ var xDisplayGetStartupNotificationId func(uintptr) string | |||
| 268 | 289 | // Gets the startup notification ID for a Wayland display, or %NULL | |
| 269 | 290 | // if no ID has been defined. | |
| 270 | 291 | func (x *Display) GetStartupNotificationId() string { | |
| 292 | + | core.LazyRegister(&xDisplayGetStartupNotificationId, "GDK", "gdk_display_get_startup_notification_id", false) | |
| 293 | + | ||
| 271 | 294 | cret := xDisplayGetStartupNotificationId(x.GoPointer()) | |
| 272 | 295 | return cret | |
| 273 | 296 | } | |
| @@ -276,6 +299,8 @@ var xDisplayIsClosed func(uintptr) bool | |||
| 276 | 299 | ||
| 277 | 300 | // Finds out if the display has been closed. | |
| 278 | 301 | func (x *Display) IsClosed() bool { | |
| 302 | + | core.LazyRegister(&xDisplayIsClosed, "GDK", "gdk_display_is_closed", false) | |
| 303 | + | ||
| 279 | 304 | cret := xDisplayIsClosed(x.GoPointer()) | |
| 280 | 305 | return cret | |
| 281 | 306 | } | |
| @@ -293,6 +318,8 @@ var xDisplayIsComposited func(uintptr) bool | |||
| 293 | 318 | // | |
| 294 | 319 | // On modern displays, this value is always %TRUE. | |
| 295 | 320 | func (x *Display) IsComposited() bool { | |
| 321 | + | core.LazyRegister(&xDisplayIsComposited, "GDK", "gdk_display_is_composited", false) | |
| 322 | + | ||
| 296 | 323 | cret := xDisplayIsComposited(x.GoPointer()) | |
| 297 | 324 | return cret | |
| 298 | 325 | } | |
| @@ -311,6 +338,8 @@ var xDisplayIsRgba func(uintptr) bool | |||
| 311 | 338 | // | |
| 312 | 339 | // On modern displays, this value is always %TRUE. | |
| 313 | 340 | func (x *Display) IsRgba() bool { | |
| 341 | + | core.LazyRegister(&xDisplayIsRgba, "GDK", "gdk_display_is_rgba", false) | |
| 342 | + | ||
| 314 | 343 | cret := xDisplayIsRgba(x.GoPointer()) | |
| 315 | 344 | return cret | |
| 316 | 345 | } | |
| @@ -319,6 +348,8 @@ var xDisplayListSeats func(uintptr) uintptr | |||
| 319 | 348 | ||
| 320 | 349 | // Returns the list of seats known to @display. | |
| 321 | 350 | func (x *Display) ListSeats() *glib.List { | |
| 351 | + | core.LazyRegister(&xDisplayListSeats, "GDK", "gdk_display_list_seats", false) | |
| 352 | + | ||
| 322 | 353 | cret := xDisplayListSeats(x.GoPointer()) | |
| 323 | 354 | if cret == 0 { | |
| 324 | 355 | return nil | |
| @@ -338,6 +369,8 @@ var xDisplayMapKeycode func(uintptr, uint, *uintptr, *[]uint, *int) bool | |||
| 338 | 369 | // | |
| 339 | 370 | // Free the returned arrays with g_free(). | |
| 340 | 371 | func (x *Display) MapKeycode(KeycodeVar uint, KeysVar *uintptr, KeyvalsVar *[]uint, NEntriesVar *int) bool { | |
| 372 | + | core.LazyRegister(&xDisplayMapKeycode, "GDK", "gdk_display_map_keycode", false) | |
| 373 | + | ||
| 341 | 374 | cret := xDisplayMapKeycode(x.GoPointer(), KeycodeVar, KeysVar, KeyvalsVar, NEntriesVar) | |
| 342 | 375 | return cret | |
| 343 | 376 | } | |
| @@ -360,6 +393,8 @@ var xDisplayMapKeyval func(uintptr, uint, *uintptr, *int) bool | |||
| 360 | 393 | // | |
| 361 | 394 | // The returned array should be freed with g_free(). | |
| 362 | 395 | func (x *Display) MapKeyval(KeyvalVar uint, KeysVar *uintptr, NKeysVar *int) bool { | |
| 396 | + | core.LazyRegister(&xDisplayMapKeyval, "GDK", "gdk_display_map_keyval", false) | |
| 397 | + | ||
| 363 | 398 | cret := xDisplayMapKeyval(x.GoPointer(), KeyvalVar, KeysVar, NKeysVar) | |
| 364 | 399 | return cret | |
| 365 | 400 | } | |
| @@ -374,6 +409,8 @@ var xDisplayNotifyStartupComplete func(uintptr, string) | |||
| 374 | 409 | // [gtk_window_set_auto_startup_notification()](../gtk4/method.Window.set_auto_startup_notification.html) | |
| 375 | 410 | // is called to disable that feature. | |
| 376 | 411 | func (x *Display) NotifyStartupComplete(StartupIdVar string) { | |
| 412 | + | core.LazyRegister(&xDisplayNotifyStartupComplete, "GDK", "gdk_display_notify_startup_complete", false) | |
| 413 | + | ||
| 377 | 414 | xDisplayNotifyStartupComplete(x.GoPointer(), StartupIdVar) | |
| 378 | 415 | } | |
| 379 | 416 | ||
| @@ -394,6 +431,7 @@ var xDisplayPrepareGl func(uintptr, **glib.Error) bool | |||
| 394 | 431 | // as needed. But you can use it as a check when setting up code that | |
| 395 | 432 | // might make use of OpenGL. | |
| 396 | 433 | func (x *Display) PrepareGl() (bool, error) { | |
| 434 | + | core.LazyRegister(&xDisplayPrepareGl, "GDK", "gdk_display_prepare_gl", false) | |
| 397 | 435 | var cerr *glib.Error | |
| 398 | 436 | ||
| 399 | 437 | cret := xDisplayPrepareGl(x.GoPointer(), &cerr) | |
| @@ -407,6 +445,8 @@ var xDisplayPutEvent func(uintptr, uintptr) | |||
| 407 | 445 | ||
| 408 | 446 | // Adds the given event to the event queue for @display. | |
| 409 | 447 | func (x *Display) PutEvent(EventVar *Event) { | |
| 448 | + | core.LazyRegister(&xDisplayPutEvent, "GDK", "gdk_display_put_event", false) | |
| 449 | + | ||
| 410 | 450 | xDisplayPutEvent(x.GoPointer(), EventVar.GoPointer()) | |
| 411 | 451 | } | |
| 412 | 452 | ||
| @@ -419,6 +459,8 @@ var xDisplaySupportsInputShapes func(uintptr) bool | |||
| 419 | 459 | // | |
| 420 | 460 | // On modern displays, this value is always %TRUE. | |
| 421 | 461 | func (x *Display) SupportsInputShapes() bool { | |
| 462 | + | core.LazyRegister(&xDisplaySupportsInputShapes, "GDK", "gdk_display_supports_input_shapes", false) | |
| 463 | + | ||
| 422 | 464 | cret := xDisplaySupportsInputShapes(x.GoPointer()) | |
| 423 | 465 | return cret | |
| 424 | 466 | } | |
| @@ -430,6 +472,8 @@ var xDisplaySupportsShadowWidth func(uintptr) bool | |||
| 430 | 472 | // If %TRUE is returned the application decides if it wants to draw shadows. | |
| 431 | 473 | // If %FALSE is returned, the compositor decides if it wants to draw shadows. | |
| 432 | 474 | func (x *Display) SupportsShadowWidth() bool { | |
| 475 | + | core.LazyRegister(&xDisplaySupportsShadowWidth, "GDK", "gdk_display_supports_shadow_width", false) | |
| 476 | + | ||
| 433 | 477 | cret := xDisplaySupportsShadowWidth(x.GoPointer()) | |
| 434 | 478 | return cret | |
| 435 | 479 | } | |
| @@ -447,6 +491,8 @@ var xDisplaySync func(uintptr) | |||
| 447 | 491 | // This is most useful for X11. On windowing systems where requests are | |
| 448 | 492 | // handled synchronously, this function will do nothing. | |
| 449 | 493 | func (x *Display) Sync() { | |
| 494 | + | core.LazyRegister(&xDisplaySync, "GDK", "gdk_display_sync", false) | |
| 495 | + | ||
| 450 | 496 | xDisplaySync(x.GoPointer()) | |
| 451 | 497 | } | |
| 452 | 498 | ||
| @@ -472,6 +518,8 @@ var xDisplayTranslateKey func(uintptr, uint, ModifierType, int, *uint, *int, *in | |||
| 472 | 518 | // contains the translated keyval. It is exported for the benefit of | |
| 473 | 519 | // virtualized test environments. | |
| 474 | 520 | func (x *Display) TranslateKey(KeycodeVar uint, StateVar ModifierType, GroupVar int, KeyvalVar *uint, EffectiveGroupVar *int, LevelVar *int, ConsumedVar *ModifierType) bool { | |
| 521 | + | core.LazyRegister(&xDisplayTranslateKey, "GDK", "gdk_display_translate_key", false) | |
| 522 | + | ||
| 475 | 523 | cret := xDisplayTranslateKey(x.GoPointer(), KeycodeVar, StateVar, GroupVar, KeyvalVar, EffectiveGroupVar, LevelVar, ConsumedVar) | |
| 476 | 524 | return cret | |
| 477 | 525 | } | |
| @@ -650,6 +698,7 @@ var xDisplayGetDefault func() uintptr | |||
| 650 | 698 | // | |
| 651 | 699 | // gdk_display_manager_get_default_display (gdk_display_manager_get ()) | |
| 652 | 700 | func DisplayGetDefault() *Display { | |
| 701 | + | core.LazyRegister(&xDisplayGetDefault, "GDK", "gdk_display_get_default", false) | |
| 653 | 702 | var cls *Display | |
| 654 | 703 | ||
| 655 | 704 | cret := xDisplayGetDefault() | |
| @@ -669,6 +718,7 @@ var xDisplayOpen func(uintptr) uintptr | |||
| 669 | 718 | // | |
| 670 | 719 | // If opening the display fails, `NULL` is returned. | |
| 671 | 720 | func DisplayOpen(DisplayNameVar *string) *Display { | |
| 721 | + | core.LazyRegister(&xDisplayOpen, "GDK", "gdk_display_open", false) | |
| 672 | 722 | var cls *Display | |
| 673 | 723 | ||
| 674 | 724 | DisplayNameVarPtr := core.GStrdupNullable(DisplayNameVar) | |
| @@ -688,46 +738,4 @@ func DisplayOpen(DisplayNameVar *string) *Display { | |||
| 688 | 738 | func init() { | |
| 689 | 739 | core.SetPackageName("GDK", "gtk4") | |
| 690 | 740 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | |
| 691 | - | var libs []uintptr | |
| 692 | - | for _, libPath := range core.GetPaths("GDK") { | |
| 693 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 694 | - | if err != nil { | |
| 695 | - | panic(err) | |
| 696 | - | } | |
| 697 | - | libs = append(libs, lib) | |
| 698 | - | } | |
| 699 | - | ||
| 700 | - | core.PuregoSafeRegister(&xDisplayGLibType, libs, "gdk_display_get_type") | |
| 701 | - | ||
| 702 | - | core.PuregoSafeRegister(&xDisplayBeep, libs, "gdk_display_beep") | |
| 703 | - | core.PuregoSafeRegister(&xDisplayClose, libs, "gdk_display_close") | |
| 704 | - | core.PuregoSafeRegister(&xDisplayCreateGlContext, libs, "gdk_display_create_gl_context") | |
| 705 | - | core.PuregoSafeRegister(&xDisplayDeviceIsGrabbed, libs, "gdk_display_device_is_grabbed") | |
| 706 | - | core.PuregoSafeRegister(&xDisplayFlush, libs, "gdk_display_flush") | |
| 707 | - | core.PuregoSafeRegister(&xDisplayGetAppLaunchContext, libs, "gdk_display_get_app_launch_context") | |
| 708 | - | core.PuregoSafeRegister(&xDisplayGetClipboard, libs, "gdk_display_get_clipboard") | |
| 709 | - | core.PuregoSafeRegister(&xDisplayGetDefaultSeat, libs, "gdk_display_get_default_seat") | |
| 710 | - | core.PuregoSafeRegister(&xDisplayGetDmabufFormats, libs, "gdk_display_get_dmabuf_formats") | |
| 711 | - | core.PuregoSafeRegister(&xDisplayGetMonitorAtSurface, libs, "gdk_display_get_monitor_at_surface") | |
| 712 | - | core.PuregoSafeRegister(&xDisplayGetMonitors, libs, "gdk_display_get_monitors") | |
| 713 | - | core.PuregoSafeRegister(&xDisplayGetName, libs, "gdk_display_get_name") | |
| 714 | - | core.PuregoSafeRegister(&xDisplayGetPrimaryClipboard, libs, "gdk_display_get_primary_clipboard") | |
| 715 | - | core.PuregoSafeRegister(&xDisplayGetSetting, libs, "gdk_display_get_setting") | |
| 716 | - | core.PuregoSafeRegister(&xDisplayGetStartupNotificationId, libs, "gdk_display_get_startup_notification_id") | |
| 717 | - | core.PuregoSafeRegister(&xDisplayIsClosed, libs, "gdk_display_is_closed") | |
| 718 | - | core.PuregoSafeRegister(&xDisplayIsComposited, libs, "gdk_display_is_composited") | |
| 719 | - | core.PuregoSafeRegister(&xDisplayIsRgba, libs, "gdk_display_is_rgba") | |
| 720 | - | core.PuregoSafeRegister(&xDisplayListSeats, libs, "gdk_display_list_seats") | |
| 721 | - | core.PuregoSafeRegister(&xDisplayMapKeycode, libs, "gdk_display_map_keycode") | |
| 722 | - | core.PuregoSafeRegister(&xDisplayMapKeyval, libs, "gdk_display_map_keyval") | |
| 723 | - | core.PuregoSafeRegister(&xDisplayNotifyStartupComplete, libs, "gdk_display_notify_startup_complete") | |
| 724 | - | core.PuregoSafeRegister(&xDisplayPrepareGl, libs, "gdk_display_prepare_gl") | |
| 725 | - | core.PuregoSafeRegister(&xDisplayPutEvent, libs, "gdk_display_put_event") | |
| 726 | - | core.PuregoSafeRegister(&xDisplaySupportsInputShapes, libs, "gdk_display_supports_input_shapes") | |
| 727 | - | core.PuregoSafeRegister(&xDisplaySupportsShadowWidth, libs, "gdk_display_supports_shadow_width") | |
| 728 | - | core.PuregoSafeRegister(&xDisplaySync, libs, "gdk_display_sync") | |
| 729 | - | core.PuregoSafeRegister(&xDisplayTranslateKey, libs, "gdk_display_translate_key") | |
| 730 | - | ||
| 731 | - | core.PuregoSafeRegister(&xDisplayGetDefault, libs, "gdk_display_get_default") | |
| 732 | - | core.PuregoSafeRegister(&xDisplayOpen, libs, "gdk_display_open") | |
| 733 | 741 | } | |
| @@ -4,7 +4,6 @@ package gdk | |||||
| 4 | import ( | 4 | import ( | ||
| 5 | "unsafe" | 5 | "unsafe" | ||
| 6 | 6 | ||||
| 7 | - | "github.com/bnema/purego" | |||
| 8 | "github.com/bnema/puregotk/pkg/core" | 7 | "github.com/bnema/puregotk/pkg/core" | ||
| 9 | "github.com/bnema/puregotk/v4/gio" | 8 | "github.com/bnema/puregotk/v4/gio" | ||
| 10 | "github.com/bnema/puregotk/v4/glib" | 9 | "github.com/bnema/puregotk/v4/glib" | ||
| @@ -33,6 +32,7 @@ type Display struct { | |||||
| 33 | var xDisplayGLibType func() types.GType | 32 | var xDisplayGLibType func() types.GType | ||
| 34 | 33 | ||||
| 35 | func DisplayGLibType() types.GType { | 34 | func DisplayGLibType() types.GType { | ||
| 35 | + | core.LazyRegister(&xDisplayGLibType, "GDK", "gdk_display_get_type", false) | |||
| 36 | return xDisplayGLibType() | 36 | return xDisplayGLibType() | ||
| 37 | } | 37 | } | ||
| 38 | 38 | ||||
| @@ -46,6 +46,8 @@ var xDisplayBeep func(uintptr) | |||||
| 46 | 46 | ||||
| 47 | // Emits a short beep on @display | 47 | // Emits a short beep on @display | ||
| 48 | func (x *Display) Beep() { | 48 | func (x *Display) Beep() { | ||
| 49 | + | core.LazyRegister(&xDisplayBeep, "GDK", "gdk_display_beep", false) | |||
| 50 | + | ||||
| 49 | xDisplayBeep(x.GoPointer()) | 51 | xDisplayBeep(x.GoPointer()) | ||
| 50 | } | 52 | } | ||
| 51 | 53 | ||||
| @@ -55,6 +57,8 @@ var xDisplayClose func(uintptr) | |||||
| 55 | // | 57 | // | ||
| 56 | // This cleans up associated resources. | 58 | // This cleans up associated resources. | ||
| 57 | func (x *Display) Close() { | 59 | func (x *Display) Close() { | ||
| 60 | + | core.LazyRegister(&xDisplayClose, "GDK", "gdk_display_close", false) | |||
| 61 | + | ||||
| 58 | xDisplayClose(x.GoPointer()) | 62 | xDisplayClose(x.GoPointer()) | ||
| 59 | } | 63 | } | ||
| 60 | 64 | ||||
| @@ -70,6 +74,7 @@ var xDisplayCreateGlContext func(uintptr, **glib.Error) uintptr | |||||
| 70 | // Before using the returned `GdkGLContext`, you will need to | 74 | // Before using the returned `GdkGLContext`, you will need to | ||
| 71 | // call [method@Gdk.GLContext.make_current] or [method@Gdk.GLContext.realize]. | 75 | // call [method@Gdk.GLContext.make_current] or [method@Gdk.GLContext.realize]. | ||
| 72 | func (x *Display) CreateGlContext() (*GLContext, error) { | 76 | func (x *Display) CreateGlContext() (*GLContext, error) { | ||
| 77 | + | core.LazyRegister(&xDisplayCreateGlContext, "GDK", "gdk_display_create_gl_context", false) | |||
| 73 | var cls *GLContext | 78 | var cls *GLContext | ||
| 74 | var cerr *glib.Error | 79 | var cerr *glib.Error | ||
| 75 | 80 | ||||
| @@ -90,6 +95,8 @@ var xDisplayDeviceIsGrabbed func(uintptr, uintptr) bool | |||||
| 90 | 95 | ||||
| 91 | // Returns %TRUE if there is an ongoing grab on @device for @display. | 96 | // Returns %TRUE if there is an ongoing grab on @device for @display. | ||
| 92 | func (x *Display) DeviceIsGrabbed(DeviceVar *Device) bool { | 97 | func (x *Display) DeviceIsGrabbed(DeviceVar *Device) bool { | ||
| 98 | + | core.LazyRegister(&xDisplayDeviceIsGrabbed, "GDK", "gdk_display_device_is_grabbed", false) | |||
| 99 | + | ||||
| 93 | cret := xDisplayDeviceIsGrabbed(x.GoPointer(), DeviceVar.GoPointer()) | 100 | cret := xDisplayDeviceIsGrabbed(x.GoPointer(), DeviceVar.GoPointer()) | ||
| 94 | return cret | 101 | return cret | ||
| 95 | } | 102 | } | ||
| @@ -107,6 +114,8 @@ var xDisplayFlush func(uintptr) | |||||
| 107 | // This is most useful for X11. On windowing systems where requests are | 114 | // This is most useful for X11. On windowing systems where requests are | ||
| 108 | // handled synchronously, this function will do nothing. | 115 | // handled synchronously, this function will do nothing. | ||
| 109 | func (x *Display) Flush() { | 116 | func (x *Display) Flush() { | ||
| 117 | + | core.LazyRegister(&xDisplayFlush, "GDK", "gdk_display_flush", false) | |||
| 118 | + | ||||
| 110 | xDisplayFlush(x.GoPointer()) | 119 | xDisplayFlush(x.GoPointer()) | ||
| 111 | } | 120 | } | ||
| 112 | 121 | ||||
| @@ -115,6 +124,7 @@ var xDisplayGetAppLaunchContext func(uintptr) uintptr | |||||
| 115 | // Returns a `GdkAppLaunchContext` suitable for launching | 124 | // Returns a `GdkAppLaunchContext` suitable for launching | ||
| 116 | // applications on the given display. | 125 | // applications on the given display. | ||
| 117 | func (x *Display) GetAppLaunchContext() *AppLaunchContext { | 126 | func (x *Display) GetAppLaunchContext() *AppLaunchContext { | ||
| 127 | + | core.LazyRegister(&xDisplayGetAppLaunchContext, "GDK", "gdk_display_get_app_launch_context", false) | |||
| 118 | var cls *AppLaunchContext | 128 | var cls *AppLaunchContext | ||
| 119 | 129 | ||||
| 120 | cret := xDisplayGetAppLaunchContext(x.GoPointer()) | 130 | cret := xDisplayGetAppLaunchContext(x.GoPointer()) | ||
| @@ -131,6 +141,7 @@ var xDisplayGetClipboard func(uintptr) uintptr | |||||
| 131 | 141 | ||||
| 132 | // Gets the clipboard used for copy/paste operations. | 142 | // Gets the clipboard used for copy/paste operations. | ||
| 133 | func (x *Display) GetClipboard() *Clipboard { | 143 | func (x *Display) GetClipboard() *Clipboard { | ||
| 144 | + | core.LazyRegister(&xDisplayGetClipboard, "GDK", "gdk_display_get_clipboard", false) | |||
| 134 | var cls *Clipboard | 145 | var cls *Clipboard | ||
| 135 | 146 | ||||
| 136 | cret := xDisplayGetClipboard(x.GoPointer()) | 147 | cret := xDisplayGetClipboard(x.GoPointer()) | ||
| @@ -151,6 +162,7 @@ var xDisplayGetDefaultSeat func(uintptr) uintptr | |||||
| 151 | // Note that a display may not have a seat. In this case, | 162 | // Note that a display may not have a seat. In this case, | ||
| 152 | // this function will return %NULL. | 163 | // this function will return %NULL. | ||
| 153 | func (x *Display) GetDefaultSeat() *Seat { | 164 | func (x *Display) GetDefaultSeat() *Seat { | ||
| 165 | + | core.LazyRegister(&xDisplayGetDefaultSeat, "GDK", "gdk_display_get_default_seat", false) | |||
| 154 | var cls *Seat | 166 | var cls *Seat | ||
| 155 | 167 | ||||
| 156 | cret := xDisplayGetDefaultSeat(x.GoPointer()) | 168 | cret := xDisplayGetDefaultSeat(x.GoPointer()) | ||
| @@ -178,6 +190,8 @@ var xDisplayGetDmabufFormats func(uintptr) uintptr | |||||
| 178 | // | 190 | // | ||
| 179 | // This function is threadsafe. It can be called from any thread. | 191 | // This function is threadsafe. It can be called from any thread. | ||
| 180 | func (x *Display) GetDmabufFormats() *DmabufFormats { | 192 | func (x *Display) GetDmabufFormats() *DmabufFormats { | ||
| 193 | + | core.LazyRegister(&xDisplayGetDmabufFormats, "GDK", "gdk_display_get_dmabuf_formats", false) | |||
| 194 | + | ||||
| 181 | cret := xDisplayGetDmabufFormats(x.GoPointer()) | 195 | cret := xDisplayGetDmabufFormats(x.GoPointer()) | ||
| 182 | if cret == 0 { | 196 | if cret == 0 { | ||
| 183 | return nil | 197 | return nil | ||
| @@ -190,6 +204,7 @@ var xDisplayGetMonitorAtSurface func(uintptr, uintptr) uintptr | |||||
| 190 | // Gets the monitor in which the largest area of @surface | 204 | // Gets the monitor in which the largest area of @surface | ||
| 191 | // resides. | 205 | // resides. | ||
| 192 | func (x *Display) GetMonitorAtSurface(SurfaceVar *Surface) *Monitor { | 206 | func (x *Display) GetMonitorAtSurface(SurfaceVar *Surface) *Monitor { | ||
| 207 | + | core.LazyRegister(&xDisplayGetMonitorAtSurface, "GDK", "gdk_display_get_monitor_at_surface", false) | |||
| 193 | var cls *Monitor | 208 | var cls *Monitor | ||
| 194 | 209 | ||||
| 195 | cret := xDisplayGetMonitorAtSurface(x.GoPointer(), SurfaceVar.GoPointer()) | 210 | cret := xDisplayGetMonitorAtSurface(x.GoPointer(), SurfaceVar.GoPointer()) | ||
| @@ -213,6 +228,7 @@ var xDisplayGetMonitors func(uintptr) uintptr | |||||
| 213 | // You can listen to the GListModel::items-changed signal on | 228 | // You can listen to the GListModel::items-changed signal on | ||
| 214 | // this list to monitor changes to the monitor of this display. | 229 | // this list to monitor changes to the monitor of this display. | ||
| 215 | func (x *Display) GetMonitors() *gio.ListModelBase { | 230 | func (x *Display) GetMonitors() *gio.ListModelBase { | ||
| 231 | + | core.LazyRegister(&xDisplayGetMonitors, "GDK", "gdk_display_get_monitors", false) | |||
| 216 | var cls *gio.ListModelBase | 232 | var cls *gio.ListModelBase | ||
| 217 | 233 | ||||
| 218 | cret := xDisplayGetMonitors(x.GoPointer()) | 234 | cret := xDisplayGetMonitors(x.GoPointer()) | ||
| @@ -230,6 +246,8 @@ var xDisplayGetName func(uintptr) string | |||||
| 230 | 246 | ||||
| 231 | // Gets the name of the display. | 247 | // Gets the name of the display. | ||
| 232 | func (x *Display) GetName() string { | 248 | func (x *Display) GetName() string { | ||
| 249 | + | core.LazyRegister(&xDisplayGetName, "GDK", "gdk_display_get_name", false) | |||
| 250 | + | ||||
| 233 | cret := xDisplayGetName(x.GoPointer()) | 251 | cret := xDisplayGetName(x.GoPointer()) | ||
| 234 | return cret | 252 | return cret | ||
| 235 | } | 253 | } | ||
| @@ -241,6 +259,7 @@ var xDisplayGetPrimaryClipboard func(uintptr) uintptr | |||||
| 241 | // On backends where the primary clipboard is not supported natively, | 259 | // On backends where the primary clipboard is not supported natively, | ||
| 242 | // GDK emulates this clipboard locally. | 260 | // GDK emulates this clipboard locally. | ||
| 243 | func (x *Display) GetPrimaryClipboard() *Clipboard { | 261 | func (x *Display) GetPrimaryClipboard() *Clipboard { | ||
| 262 | + | core.LazyRegister(&xDisplayGetPrimaryClipboard, "GDK", "gdk_display_get_primary_clipboard", false) | |||
| 244 | var cls *Clipboard | 263 | var cls *Clipboard | ||
| 245 | 264 | ||||
| 246 | cret := xDisplayGetPrimaryClipboard(x.GoPointer()) | 265 | cret := xDisplayGetPrimaryClipboard(x.GoPointer()) | ||
| @@ -259,6 +278,8 @@ var xDisplayGetSetting func(uintptr, string, *gobject.Value) bool | |||||
| 259 | // Retrieves a desktop-wide setting such as double-click time | 278 | // Retrieves a desktop-wide setting such as double-click time | ||
| 260 | // for the @display. | 279 | // for the @display. | ||
| 261 | func (x *Display) GetSetting(NameVar string, ValueVar *gobject.Value) bool { | 280 | func (x *Display) GetSetting(NameVar string, ValueVar *gobject.Value) bool { | ||
| 281 | + | core.LazyRegister(&xDisplayGetSetting, "GDK", "gdk_display_get_setting", false) | |||
| 282 | + | ||||
| 262 | cret := xDisplayGetSetting(x.GoPointer(), NameVar, ValueVar) | 283 | cret := xDisplayGetSetting(x.GoPointer(), NameVar, ValueVar) | ||
| 263 | return cret | 284 | return cret | ||
| 264 | } | 285 | } | ||
| @@ -268,6 +289,8 @@ var xDisplayGetStartupNotificationId func(uintptr) string | |||||
| 268 | // Gets the startup notification ID for a Wayland display, or %NULL | 289 | // Gets the startup notification ID for a Wayland display, or %NULL | ||
| 269 | // if no ID has been defined. | 290 | // if no ID has been defined. | ||
| 270 | func (x *Display) GetStartupNotificationId() string { | 291 | func (x *Display) GetStartupNotificationId() string { | ||
| 292 | + | core.LazyRegister(&xDisplayGetStartupNotificationId, "GDK", "gdk_display_get_startup_notification_id", false) | |||
| 293 | + | ||||
| 271 | cret := xDisplayGetStartupNotificationId(x.GoPointer()) | 294 | cret := xDisplayGetStartupNotificationId(x.GoPointer()) | ||
| 272 | return cret | 295 | return cret | ||
| 273 | } | 296 | } | ||
| @@ -276,6 +299,8 @@ var xDisplayIsClosed func(uintptr) bool | |||||
| 276 | 299 | ||||
| 277 | // Finds out if the display has been closed. | 300 | // Finds out if the display has been closed. | ||
| 278 | func (x *Display) IsClosed() bool { | 301 | func (x *Display) IsClosed() bool { | ||
| 302 | + | core.LazyRegister(&xDisplayIsClosed, "GDK", "gdk_display_is_closed", false) | |||
| 303 | + | ||||
| 279 | cret := xDisplayIsClosed(x.GoPointer()) | 304 | cret := xDisplayIsClosed(x.GoPointer()) | ||
| 280 | return cret | 305 | return cret | ||
| 281 | } | 306 | } | ||
| @@ -293,6 +318,8 @@ var xDisplayIsComposited func(uintptr) bool | |||||
| 293 | // | 318 | // | ||
| 294 | // On modern displays, this value is always %TRUE. | 319 | // On modern displays, this value is always %TRUE. | ||
| 295 | func (x *Display) IsComposited() bool { | 320 | func (x *Display) IsComposited() bool { | ||
| 321 | + | core.LazyRegister(&xDisplayIsComposited, "GDK", "gdk_display_is_composited", false) | |||
| 322 | + | ||||
| 296 | cret := xDisplayIsComposited(x.GoPointer()) | 323 | cret := xDisplayIsComposited(x.GoPointer()) | ||
| 297 | return cret | 324 | return cret | ||
| 298 | } | 325 | } | ||
| @@ -311,6 +338,8 @@ var xDisplayIsRgba func(uintptr) bool | |||||
| 311 | // | 338 | // | ||
| 312 | // On modern displays, this value is always %TRUE. | 339 | // On modern displays, this value is always %TRUE. | ||
| 313 | func (x *Display) IsRgba() bool { | 340 | func (x *Display) IsRgba() bool { | ||
| 341 | + | core.LazyRegister(&xDisplayIsRgba, "GDK", "gdk_display_is_rgba", false) | |||
| 342 | + | ||||
| 314 | cret := xDisplayIsRgba(x.GoPointer()) | 343 | cret := xDisplayIsRgba(x.GoPointer()) | ||
| 315 | return cret | 344 | return cret | ||
| 316 | } | 345 | } | ||
| @@ -319,6 +348,8 @@ var xDisplayListSeats func(uintptr) uintptr | |||||
| 319 | 348 | ||||
| 320 | // Returns the list of seats known to @display. | 349 | // Returns the list of seats known to @display. | ||
| 321 | func (x *Display) ListSeats() *glib.List { | 350 | func (x *Display) ListSeats() *glib.List { | ||
| 351 | + | core.LazyRegister(&xDisplayListSeats, "GDK", "gdk_display_list_seats", false) | |||
| 352 | + | ||||
| 322 | cret := xDisplayListSeats(x.GoPointer()) | 353 | cret := xDisplayListSeats(x.GoPointer()) | ||
| 323 | if cret == 0 { | 354 | if cret == 0 { | ||
| 324 | return nil | 355 | return nil | ||
| @@ -338,6 +369,8 @@ var xDisplayMapKeycode func(uintptr, uint, *uintptr, *[]uint, *int) bool | |||||
| 338 | // | 369 | // | ||
| 339 | // Free the returned arrays with g_free(). | 370 | // Free the returned arrays with g_free(). | ||
| 340 | func (x *Display) MapKeycode(KeycodeVar uint, KeysVar *uintptr, KeyvalsVar *[]uint, NEntriesVar *int) bool { | 371 | func (x *Display) MapKeycode(KeycodeVar uint, KeysVar *uintptr, KeyvalsVar *[]uint, NEntriesVar *int) bool { | ||
| 372 | + | core.LazyRegister(&xDisplayMapKeycode, "GDK", "gdk_display_map_keycode", false) | |||
| 373 | + | ||||
| 341 | cret := xDisplayMapKeycode(x.GoPointer(), KeycodeVar, KeysVar, KeyvalsVar, NEntriesVar) | 374 | cret := xDisplayMapKeycode(x.GoPointer(), KeycodeVar, KeysVar, KeyvalsVar, NEntriesVar) | ||
| 342 | return cret | 375 | return cret | ||
| 343 | } | 376 | } | ||
| @@ -360,6 +393,8 @@ var xDisplayMapKeyval func(uintptr, uint, *uintptr, *int) bool | |||||
| 360 | // | 393 | // | ||
| 361 | // The returned array should be freed with g_free(). | 394 | // The returned array should be freed with g_free(). | ||
| 362 | func (x *Display) MapKeyval(KeyvalVar uint, KeysVar *uintptr, NKeysVar *int) bool { | 395 | func (x *Display) MapKeyval(KeyvalVar uint, KeysVar *uintptr, NKeysVar *int) bool { | ||
| 396 | + | core.LazyRegister(&xDisplayMapKeyval, "GDK", "gdk_display_map_keyval", false) | |||
| 397 | + | ||||
| 363 | cret := xDisplayMapKeyval(x.GoPointer(), KeyvalVar, KeysVar, NKeysVar) | 398 | cret := xDisplayMapKeyval(x.GoPointer(), KeyvalVar, KeysVar, NKeysVar) | ||
| 364 | return cret | 399 | return cret | ||
| 365 | } | 400 | } | ||
| @@ -374,6 +409,8 @@ var xDisplayNotifyStartupComplete func(uintptr, string) | |||||
| 374 | // [gtk_window_set_auto_startup_notification()](../gtk4/method.Window.set_auto_startup_notification.html) | 409 | // [gtk_window_set_auto_startup_notification()](../gtk4/method.Window.set_auto_startup_notification.html) | ||
| 375 | // is called to disable that feature. | 410 | // is called to disable that feature. | ||
| 376 | func (x *Display) NotifyStartupComplete(StartupIdVar string) { | 411 | func (x *Display) NotifyStartupComplete(StartupIdVar string) { | ||
| 412 | + | core.LazyRegister(&xDisplayNotifyStartupComplete, "GDK", "gdk_display_notify_startup_complete", false) | |||
| 413 | + | ||||
| 377 | xDisplayNotifyStartupComplete(x.GoPointer(), StartupIdVar) | 414 | xDisplayNotifyStartupComplete(x.GoPointer(), StartupIdVar) | ||
| 378 | } | 415 | } | ||
| 379 | 416 | ||||
| @@ -394,6 +431,7 @@ var xDisplayPrepareGl func(uintptr, **glib.Error) bool | |||||
| 394 | // as needed. But you can use it as a check when setting up code that | 431 | // as needed. But you can use it as a check when setting up code that | ||
| 395 | // might make use of OpenGL. | 432 | // might make use of OpenGL. | ||
| 396 | func (x *Display) PrepareGl() (bool, error) { | 433 | func (x *Display) PrepareGl() (bool, error) { | ||
| 434 | + | core.LazyRegister(&xDisplayPrepareGl, "GDK", "gdk_display_prepare_gl", false) | |||
| 397 | var cerr *glib.Error | 435 | var cerr *glib.Error | ||
| 398 | 436 | ||||
| 399 | cret := xDisplayPrepareGl(x.GoPointer(), &cerr) | 437 | cret := xDisplayPrepareGl(x.GoPointer(), &cerr) | ||
| @@ -407,6 +445,8 @@ var xDisplayPutEvent func(uintptr, uintptr) | |||||
| 407 | 445 | ||||
| 408 | // Adds the given event to the event queue for @display. | 446 | // Adds the given event to the event queue for @display. | ||
| 409 | func (x *Display) PutEvent(EventVar *Event) { | 447 | func (x *Display) PutEvent(EventVar *Event) { | ||
| 448 | + | core.LazyRegister(&xDisplayPutEvent, "GDK", "gdk_display_put_event", false) | |||
| 449 | + | ||||
| 410 | xDisplayPutEvent(x.GoPointer(), EventVar.GoPointer()) | 450 | xDisplayPutEvent(x.GoPointer(), EventVar.GoPointer()) | ||
| 411 | } | 451 | } | ||
| 412 | 452 | ||||
| @@ -419,6 +459,8 @@ var xDisplaySupportsInputShapes func(uintptr) bool | |||||
| 419 | // | 459 | // | ||
| 420 | // On modern displays, this value is always %TRUE. | 460 | // On modern displays, this value is always %TRUE. | ||
| 421 | func (x *Display) SupportsInputShapes() bool { | 461 | func (x *Display) SupportsInputShapes() bool { | ||
| 462 | + | core.LazyRegister(&xDisplaySupportsInputShapes, "GDK", "gdk_display_supports_input_shapes", false) | |||
| 463 | + | ||||
| 422 | cret := xDisplaySupportsInputShapes(x.GoPointer()) | 464 | cret := xDisplaySupportsInputShapes(x.GoPointer()) | ||
| 423 | return cret | 465 | return cret | ||
| 424 | } | 466 | } | ||
| @@ -430,6 +472,8 @@ var xDisplaySupportsShadowWidth func(uintptr) bool | |||||
| 430 | // If %TRUE is returned the application decides if it wants to draw shadows. | 472 | // If %TRUE is returned the application decides if it wants to draw shadows. | ||
| 431 | // If %FALSE is returned, the compositor decides if it wants to draw shadows. | 473 | // If %FALSE is returned, the compositor decides if it wants to draw shadows. | ||
| 432 | func (x *Display) SupportsShadowWidth() bool { | 474 | func (x *Display) SupportsShadowWidth() bool { | ||
| 475 | + | core.LazyRegister(&xDisplaySupportsShadowWidth, "GDK", "gdk_display_supports_shadow_width", false) | |||
| 476 | + | ||||
| 433 | cret := xDisplaySupportsShadowWidth(x.GoPointer()) | 477 | cret := xDisplaySupportsShadowWidth(x.GoPointer()) | ||
| 434 | return cret | 478 | return cret | ||
| 435 | } | 479 | } | ||
| @@ -447,6 +491,8 @@ var xDisplaySync func(uintptr) | |||||
| 447 | // This is most useful for X11. On windowing systems where requests are | 491 | // This is most useful for X11. On windowing systems where requests are | ||
| 448 | // handled synchronously, this function will do nothing. | 492 | // handled synchronously, this function will do nothing. | ||
| 449 | func (x *Display) Sync() { | 493 | func (x *Display) Sync() { | ||
| 494 | + | core.LazyRegister(&xDisplaySync, "GDK", "gdk_display_sync", false) | |||
| 495 | + | ||||
| 450 | xDisplaySync(x.GoPointer()) | 496 | xDisplaySync(x.GoPointer()) | ||
| 451 | } | 497 | } | ||
| 452 | 498 | ||||
| @@ -472,6 +518,8 @@ var xDisplayTranslateKey func(uintptr, uint, ModifierType, int, *uint, *int, *in | |||||
| 472 | // contains the translated keyval. It is exported for the benefit of | 518 | // contains the translated keyval. It is exported for the benefit of | ||
| 473 | // virtualized test environments. | 519 | // virtualized test environments. | ||
| 474 | func (x *Display) TranslateKey(KeycodeVar uint, StateVar ModifierType, GroupVar int, KeyvalVar *uint, EffectiveGroupVar *int, LevelVar *int, ConsumedVar *ModifierType) bool { | 520 | func (x *Display) TranslateKey(KeycodeVar uint, StateVar ModifierType, GroupVar int, KeyvalVar *uint, EffectiveGroupVar *int, LevelVar *int, ConsumedVar *ModifierType) bool { | ||
| 521 | + | core.LazyRegister(&xDisplayTranslateKey, "GDK", "gdk_display_translate_key", false) | |||
| 522 | + | ||||
| 475 | cret := xDisplayTranslateKey(x.GoPointer(), KeycodeVar, StateVar, GroupVar, KeyvalVar, EffectiveGroupVar, LevelVar, ConsumedVar) | 523 | cret := xDisplayTranslateKey(x.GoPointer(), KeycodeVar, StateVar, GroupVar, KeyvalVar, EffectiveGroupVar, LevelVar, ConsumedVar) | ||
| 476 | return cret | 524 | return cret | ||
| 477 | } | 525 | } | ||
| @@ -650,6 +698,7 @@ var xDisplayGetDefault func() uintptr | |||||
| 650 | // | 698 | // | ||
| 651 | // gdk_display_manager_get_default_display (gdk_display_manager_get ()) | 699 | // gdk_display_manager_get_default_display (gdk_display_manager_get ()) | ||
| 652 | func DisplayGetDefault() *Display { | 700 | func DisplayGetDefault() *Display { | ||
| 701 | + | core.LazyRegister(&xDisplayGetDefault, "GDK", "gdk_display_get_default", false) | |||
| 653 | var cls *Display | 702 | var cls *Display | ||
| 654 | 703 | ||||
| 655 | cret := xDisplayGetDefault() | 704 | cret := xDisplayGetDefault() | ||
| @@ -669,6 +718,7 @@ var xDisplayOpen func(uintptr) uintptr | |||||
| 669 | // | 718 | // | ||
| 670 | // If opening the display fails, `NULL` is returned. | 719 | // If opening the display fails, `NULL` is returned. | ||
| 671 | func DisplayOpen(DisplayNameVar *string) *Display { | 720 | func DisplayOpen(DisplayNameVar *string) *Display { | ||
| 721 | + | core.LazyRegister(&xDisplayOpen, "GDK", "gdk_display_open", false) | |||
| 672 | var cls *Display | 722 | var cls *Display | ||
| 673 | 723 | ||||
| 674 | DisplayNameVarPtr := core.GStrdupNullable(DisplayNameVar) | 724 | DisplayNameVarPtr := core.GStrdupNullable(DisplayNameVar) | ||
| @@ -688,46 +738,4 @@ func DisplayOpen(DisplayNameVar *string) *Display { | |||||
| 688 | func init() { | 738 | func init() { | ||
| 689 | core.SetPackageName("GDK", "gtk4") | 739 | core.SetPackageName("GDK", "gtk4") | ||
| 690 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 740 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | ||
| 691 | - | var libs []uintptr | |||
| 692 | - | for _, libPath := range core.GetPaths("GDK") { | |||
| 693 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 694 | - | if err != nil { | |||
| 695 | - | panic(err) | |||
| 696 | - | } | |||
| 697 | - | libs = append(libs, lib) | |||
| 698 | - | } | |||
| 699 | - | ||||
| 700 | - | core.PuregoSafeRegister(&xDisplayGLibType, libs, "gdk_display_get_type") | |||
| 701 | - | ||||
| 702 | - | core.PuregoSafeRegister(&xDisplayBeep, libs, "gdk_display_beep") | |||
| 703 | - | core.PuregoSafeRegister(&xDisplayClose, libs, "gdk_display_close") | |||
| 704 | - | core.PuregoSafeRegister(&xDisplayCreateGlContext, libs, "gdk_display_create_gl_context") | |||
| 705 | - | core.PuregoSafeRegister(&xDisplayDeviceIsGrabbed, libs, "gdk_display_device_is_grabbed") | |||
| 706 | - | core.PuregoSafeRegister(&xDisplayFlush, libs, "gdk_display_flush") | |||
| 707 | - | core.PuregoSafeRegister(&xDisplayGetAppLaunchContext, libs, "gdk_display_get_app_launch_context") | |||
| 708 | - | core.PuregoSafeRegister(&xDisplayGetClipboard, libs, "gdk_display_get_clipboard") | |||
| 709 | - | core.PuregoSafeRegister(&xDisplayGetDefaultSeat, libs, "gdk_display_get_default_seat") | |||
| 710 | - | core.PuregoSafeRegister(&xDisplayGetDmabufFormats, libs, "gdk_display_get_dmabuf_formats") | |||
| 711 | - | core.PuregoSafeRegister(&xDisplayGetMonitorAtSurface, libs, "gdk_display_get_monitor_at_surface") | |||
| 712 | - | core.PuregoSafeRegister(&xDisplayGetMonitors, libs, "gdk_display_get_monitors") | |||
| 713 | - | core.PuregoSafeRegister(&xDisplayGetName, libs, "gdk_display_get_name") | |||
| 714 | - | core.PuregoSafeRegister(&xDisplayGetPrimaryClipboard, libs, "gdk_display_get_primary_clipboard") | |||
| 715 | - | core.PuregoSafeRegister(&xDisplayGetSetting, libs, "gdk_display_get_setting") | |||
| 716 | - | core.PuregoSafeRegister(&xDisplayGetStartupNotificationId, libs, "gdk_display_get_startup_notification_id") | |||
| 717 | - | core.PuregoSafeRegister(&xDisplayIsClosed, libs, "gdk_display_is_closed") | |||
| 718 | - | core.PuregoSafeRegister(&xDisplayIsComposited, libs, "gdk_display_is_composited") | |||
| 719 | - | core.PuregoSafeRegister(&xDisplayIsRgba, libs, "gdk_display_is_rgba") | |||
| 720 | - | core.PuregoSafeRegister(&xDisplayListSeats, libs, "gdk_display_list_seats") | |||
| 721 | - | core.PuregoSafeRegister(&xDisplayMapKeycode, libs, "gdk_display_map_keycode") | |||
| 722 | - | core.PuregoSafeRegister(&xDisplayMapKeyval, libs, "gdk_display_map_keyval") | |||
| 723 | - | core.PuregoSafeRegister(&xDisplayNotifyStartupComplete, libs, "gdk_display_notify_startup_complete") | |||
| 724 | - | core.PuregoSafeRegister(&xDisplayPrepareGl, libs, "gdk_display_prepare_gl") | |||
| 725 | - | core.PuregoSafeRegister(&xDisplayPutEvent, libs, "gdk_display_put_event") | |||
| 726 | - | core.PuregoSafeRegister(&xDisplaySupportsInputShapes, libs, "gdk_display_supports_input_shapes") | |||
| 727 | - | core.PuregoSafeRegister(&xDisplaySupportsShadowWidth, libs, "gdk_display_supports_shadow_width") | |||
| 728 | - | core.PuregoSafeRegister(&xDisplaySync, libs, "gdk_display_sync") | |||
| 729 | - | core.PuregoSafeRegister(&xDisplayTranslateKey, libs, "gdk_display_translate_key") | |||
| 730 | - | ||||
| 731 | - | core.PuregoSafeRegister(&xDisplayGetDefault, libs, "gdk_display_get_default") | |||
| 732 | - | core.PuregoSafeRegister(&xDisplayOpen, libs, "gdk_display_open") | |||
| 733 | } | 741 | } | ||