Merge pull request #350 from bnema/fix/repin-fixed-puregotk
fix(deps): validate puregotk lazy registration fix
907 files · +27874 -25296
M go.mod +3 -1
| @@ -11,7 +11,7 @@ require ( | |||
| 11 | 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | |
| 14 | - | github.com/bnema/puregotk v0.7.0 | |
| 14 | + | github.com/bnema/puregotk v0.7.1-0.20260714200603-7370c78950ef | |
| 15 | 15 | github.com/charmbracelet/bubbles v1.0.0 | |
| 16 | 16 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 17 | 17 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -47,6 +47,7 @@ require ( | |||
| 47 | 47 | github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect | |
| 48 | 48 | github.com/fatih/color v1.19.0 // indirect | |
| 49 | 49 | github.com/go-viper/mapstructure/v2 v2.5.0 // indirect | |
| 50 | + | github.com/google/go-cmp v0.7.0 // indirect | |
| 50 | 51 | github.com/inconshreveable/mousetrap v1.1.0 // indirect | |
| 51 | 52 | github.com/lucasb-eyer/go-colorful v1.4.0 // indirect | |
| 52 | 53 | github.com/mattn/go-colorable v0.1.14 // indirect | |
| @@ -80,6 +81,7 @@ require ( | |||
| 80 | 81 | golang.org/x/text v0.40.0 // indirect | |
| 81 | 82 | golang.org/x/tools v0.47.0 // indirect | |
| 82 | 83 | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | |
| 84 | + | mvdan.cc/gofumpt v0.9.2 // indirect | |
| 83 | 85 | ) | |
| 84 | 86 | ||
| 85 | 87 | tool github.com/a-h/templ/cmd/templ | |
| @@ -11,7 +11,7 @@ require ( | |||||
| 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | ||
| 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | ||
| 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | ||
| 14 | - | github.com/bnema/puregotk v0.7.0 | 14 | + | github.com/bnema/puregotk v0.7.1-0.20260714200603-7370c78950ef |
| 15 | github.com/charmbracelet/bubbles v1.0.0 | 15 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 16 | github.com/charmbracelet/bubbletea v1.3.10 | 16 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 17 | github.com/charmbracelet/lipgloss v1.1.0 | 17 | github.com/charmbracelet/lipgloss v1.1.0 | ||
| @@ -47,6 +47,7 @@ require ( | |||||
| 47 | github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect | 47 | github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect | ||
| 48 | github.com/fatih/color v1.19.0 // indirect | 48 | github.com/fatih/color v1.19.0 // indirect | ||
| 49 | github.com/go-viper/mapstructure/v2 v2.5.0 // indirect | 49 | github.com/go-viper/mapstructure/v2 v2.5.0 // indirect | ||
| 50 | + | github.com/google/go-cmp v0.7.0 // indirect | |||
| 50 | github.com/inconshreveable/mousetrap v1.1.0 // indirect | 51 | github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||
| 51 | github.com/lucasb-eyer/go-colorful v1.4.0 // indirect | 52 | github.com/lucasb-eyer/go-colorful v1.4.0 // indirect | ||
| 52 | github.com/mattn/go-colorable v0.1.14 // indirect | 53 | github.com/mattn/go-colorable v0.1.14 // indirect | ||
| @@ -80,6 +81,7 @@ require ( | |||||
| 80 | golang.org/x/text v0.40.0 // indirect | 81 | golang.org/x/text v0.40.0 // indirect | ||
| 81 | golang.org/x/tools v0.47.0 // indirect | 82 | golang.org/x/tools v0.47.0 // indirect | ||
| 82 | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | 83 | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | ||
| 84 | + | mvdan.cc/gofumpt v0.9.2 // indirect | |||
| 83 | ) | 85 | ) | ||
| 84 | 86 | ||||
| 85 | tool github.com/a-h/templ/cmd/templ | 87 | tool github.com/a-h/templ/cmd/templ | ||
M go.sum +4 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +197 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +10 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +99 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +95 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +33 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +66 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +10 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +22 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +23 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +47 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +33 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +47 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +34 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +45 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +61 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +18 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +7 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +69 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +5 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +63 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +60 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +48 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +38 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +31 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +24 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +41 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +39 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +34 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +17 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +49 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +20 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +25 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +33 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +35 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +123 -87 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +30 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +41 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +64 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +40 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +78 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +15 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +66 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +57 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +36 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +20 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +34 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +28 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +23 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +27 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +51 -43 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +53 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder_extra.go +6 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +20 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +6 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +11 -18
| @@ -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/cairo" | |
| 10 | 9 | "github.com/bnema/puregotk/v4/gobject" | |
| @@ -27,6 +26,7 @@ type DrawContext struct { | |||
| 27 | 26 | var xDrawContextGLibType func() types.GType | |
| 28 | 27 | ||
| 29 | 28 | func DrawContextGLibType() types.GType { | |
| 29 | + | core.LazyRegister(&xDrawContextGLibType, "GDK", "gdk_draw_context_get_type", false) | |
| 30 | 30 | return xDrawContextGLibType() | |
| 31 | 31 | } | |
| 32 | 32 | ||
| @@ -63,6 +63,8 @@ var xDrawContextBeginFrame func(uintptr, *cairo.Region) | |||
| 63 | 63 | // use of [GskRenderer](../gsk4/class.Renderer.html)s, so application code | |
| 64 | 64 | // does not need to call these functions explicitly. | |
| 65 | 65 | func (x *DrawContext) BeginFrame(RegionVar *cairo.Region) { | |
| 66 | + | core.LazyRegister(&xDrawContextBeginFrame, "GDK", "gdk_draw_context_begin_frame", false) | |
| 67 | + | ||
| 66 | 68 | xDrawContextBeginFrame(x.GoPointer(), RegionVar) | |
| 67 | 69 | } | |
| 68 | 70 | ||
| @@ -77,6 +79,8 @@ var xDrawContextEndFrame func(uintptr) | |||
| 77 | 79 | // implicitly before returning; it is not recommended to call `glFlush()` | |
| 78 | 80 | // explicitly before calling this function. | |
| 79 | 81 | func (x *DrawContext) EndFrame() { | |
| 82 | + | core.LazyRegister(&xDrawContextEndFrame, "GDK", "gdk_draw_context_end_frame", false) | |
| 83 | + | ||
| 80 | 84 | xDrawContextEndFrame(x.GoPointer()) | |
| 81 | 85 | } | |
| 82 | 86 | ||
| @@ -84,6 +88,7 @@ var xDrawContextGetDisplay func(uintptr) uintptr | |||
| 84 | 88 | ||
| 85 | 89 | // Retrieves the `GdkDisplay` the @context is created for | |
| 86 | 90 | func (x *DrawContext) GetDisplay() *Display { | |
| 91 | + | core.LazyRegister(&xDrawContextGetDisplay, "GDK", "gdk_draw_context_get_display", false) | |
| 87 | 92 | var cls *Display | |
| 88 | 93 | ||
| 89 | 94 | cret := xDrawContextGetDisplay(x.GoPointer()) | |
| @@ -108,6 +113,8 @@ var xDrawContextGetFrameRegion func(uintptr) uintptr | |||
| 108 | 113 | // If @context is not in between calls to [method@Gdk.DrawContext.begin_frame] | |
| 109 | 114 | // and [method@Gdk.DrawContext.end_frame], %NULL will be returned. | |
| 110 | 115 | func (x *DrawContext) GetFrameRegion() *cairo.Region { | |
| 116 | + | core.LazyRegister(&xDrawContextGetFrameRegion, "GDK", "gdk_draw_context_get_frame_region", false) | |
| 117 | + | ||
| 111 | 118 | cret := xDrawContextGetFrameRegion(x.GoPointer()) | |
| 112 | 119 | if cret == 0 { | |
| 113 | 120 | return nil | |
| @@ -119,6 +126,7 @@ var xDrawContextGetSurface func(uintptr) uintptr | |||
| 119 | 126 | ||
| 120 | 127 | // Retrieves the surface that @context is bound to. | |
| 121 | 128 | func (x *DrawContext) GetSurface() *Surface { | |
| 129 | + | core.LazyRegister(&xDrawContextGetSurface, "GDK", "gdk_draw_context_get_surface", false) | |
| 122 | 130 | var cls *Surface | |
| 123 | 131 | ||
| 124 | 132 | cret := xDrawContextGetSurface(x.GoPointer()) | |
| @@ -140,6 +148,8 @@ var xDrawContextIsInFrame func(uintptr) bool | |||
| 140 | 148 | // and [method@Gdk.DrawContext.end_frame]. In this situation, drawing commands | |
| 141 | 149 | // may be effecting the contents of the @context's surface. | |
| 142 | 150 | func (x *DrawContext) IsInFrame() bool { | |
| 151 | + | core.LazyRegister(&xDrawContextIsInFrame, "GDK", "gdk_draw_context_is_in_frame", false) | |
| 152 | + | ||
| 143 | 153 | cret := xDrawContextIsInFrame(x.GoPointer()) | |
| 144 | 154 | return cret | |
| 145 | 155 | } | |
| @@ -158,21 +168,4 @@ func (c *DrawContext) SetGoPointer(ptr uintptr) { | |||
| 158 | 168 | func init() { | |
| 159 | 169 | core.SetPackageName("GDK", "gtk4") | |
| 160 | 170 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | |
| 161 | - | var libs []uintptr | |
| 162 | - | for _, libPath := range core.GetPaths("GDK") { | |
| 163 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 164 | - | if err != nil { | |
| 165 | - | panic(err) | |
| 166 | - | } | |
| 167 | - | libs = append(libs, lib) | |
| 168 | - | } | |
| 169 | - | ||
| 170 | - | core.PuregoSafeRegister(&xDrawContextGLibType, libs, "gdk_draw_context_get_type") | |
| 171 | - | ||
| 172 | - | core.PuregoSafeRegister(&xDrawContextBeginFrame, libs, "gdk_draw_context_begin_frame") | |
| 173 | - | core.PuregoSafeRegister(&xDrawContextEndFrame, libs, "gdk_draw_context_end_frame") | |
| 174 | - | core.PuregoSafeRegister(&xDrawContextGetDisplay, libs, "gdk_draw_context_get_display") | |
| 175 | - | core.PuregoSafeRegister(&xDrawContextGetFrameRegion, libs, "gdk_draw_context_get_frame_region") | |
| 176 | - | core.PuregoSafeRegister(&xDrawContextGetSurface, libs, "gdk_draw_context_get_surface") | |
| 177 | - | core.PuregoSafeRegister(&xDrawContextIsInFrame, libs, "gdk_draw_context_is_in_frame") | |
| 178 | 171 | } | |
| @@ -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/cairo" | 8 | "github.com/bnema/puregotk/v4/cairo" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject" | 9 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -27,6 +26,7 @@ type DrawContext struct { | |||||
| 27 | var xDrawContextGLibType func() types.GType | 26 | var xDrawContextGLibType func() types.GType | ||
| 28 | 27 | ||||
| 29 | func DrawContextGLibType() types.GType { | 28 | func DrawContextGLibType() types.GType { | ||
| 29 | + | core.LazyRegister(&xDrawContextGLibType, "GDK", "gdk_draw_context_get_type", false) | |||
| 30 | return xDrawContextGLibType() | 30 | return xDrawContextGLibType() | ||
| 31 | } | 31 | } | ||
| 32 | 32 | ||||
| @@ -63,6 +63,8 @@ var xDrawContextBeginFrame func(uintptr, *cairo.Region) | |||||
| 63 | // use of [GskRenderer](../gsk4/class.Renderer.html)s, so application code | 63 | // use of [GskRenderer](../gsk4/class.Renderer.html)s, so application code | ||
| 64 | // does not need to call these functions explicitly. | 64 | // does not need to call these functions explicitly. | ||
| 65 | func (x *DrawContext) BeginFrame(RegionVar *cairo.Region) { | 65 | func (x *DrawContext) BeginFrame(RegionVar *cairo.Region) { | ||
| 66 | + | core.LazyRegister(&xDrawContextBeginFrame, "GDK", "gdk_draw_context_begin_frame", false) | |||
| 67 | + | ||||
| 66 | xDrawContextBeginFrame(x.GoPointer(), RegionVar) | 68 | xDrawContextBeginFrame(x.GoPointer(), RegionVar) | ||
| 67 | } | 69 | } | ||
| 68 | 70 | ||||
| @@ -77,6 +79,8 @@ var xDrawContextEndFrame func(uintptr) | |||||
| 77 | // implicitly before returning; it is not recommended to call `glFlush()` | 79 | // implicitly before returning; it is not recommended to call `glFlush()` | ||
| 78 | // explicitly before calling this function. | 80 | // explicitly before calling this function. | ||
| 79 | func (x *DrawContext) EndFrame() { | 81 | func (x *DrawContext) EndFrame() { | ||
| 82 | + | core.LazyRegister(&xDrawContextEndFrame, "GDK", "gdk_draw_context_end_frame", false) | |||
| 83 | + | ||||
| 80 | xDrawContextEndFrame(x.GoPointer()) | 84 | xDrawContextEndFrame(x.GoPointer()) | ||
| 81 | } | 85 | } | ||
| 82 | 86 | ||||
| @@ -84,6 +88,7 @@ var xDrawContextGetDisplay func(uintptr) uintptr | |||||
| 84 | 88 | ||||
| 85 | // Retrieves the `GdkDisplay` the @context is created for | 89 | // Retrieves the `GdkDisplay` the @context is created for | ||
| 86 | func (x *DrawContext) GetDisplay() *Display { | 90 | func (x *DrawContext) GetDisplay() *Display { | ||
| 91 | + | core.LazyRegister(&xDrawContextGetDisplay, "GDK", "gdk_draw_context_get_display", false) | |||
| 87 | var cls *Display | 92 | var cls *Display | ||
| 88 | 93 | ||||
| 89 | cret := xDrawContextGetDisplay(x.GoPointer()) | 94 | cret := xDrawContextGetDisplay(x.GoPointer()) | ||
| @@ -108,6 +113,8 @@ var xDrawContextGetFrameRegion func(uintptr) uintptr | |||||
| 108 | // If @context is not in between calls to [method@Gdk.DrawContext.begin_frame] | 113 | // If @context is not in between calls to [method@Gdk.DrawContext.begin_frame] | ||
| 109 | // and [method@Gdk.DrawContext.end_frame], %NULL will be returned. | 114 | // and [method@Gdk.DrawContext.end_frame], %NULL will be returned. | ||
| 110 | func (x *DrawContext) GetFrameRegion() *cairo.Region { | 115 | func (x *DrawContext) GetFrameRegion() *cairo.Region { | ||
| 116 | + | core.LazyRegister(&xDrawContextGetFrameRegion, "GDK", "gdk_draw_context_get_frame_region", false) | |||
| 117 | + | ||||
| 111 | cret := xDrawContextGetFrameRegion(x.GoPointer()) | 118 | cret := xDrawContextGetFrameRegion(x.GoPointer()) | ||
| 112 | if cret == 0 { | 119 | if cret == 0 { | ||
| 113 | return nil | 120 | return nil | ||
| @@ -119,6 +126,7 @@ var xDrawContextGetSurface func(uintptr) uintptr | |||||
| 119 | 126 | ||||
| 120 | // Retrieves the surface that @context is bound to. | 127 | // Retrieves the surface that @context is bound to. | ||
| 121 | func (x *DrawContext) GetSurface() *Surface { | 128 | func (x *DrawContext) GetSurface() *Surface { | ||
| 129 | + | core.LazyRegister(&xDrawContextGetSurface, "GDK", "gdk_draw_context_get_surface", false) | |||
| 122 | var cls *Surface | 130 | var cls *Surface | ||
| 123 | 131 | ||||
| 124 | cret := xDrawContextGetSurface(x.GoPointer()) | 132 | cret := xDrawContextGetSurface(x.GoPointer()) | ||
| @@ -140,6 +148,8 @@ var xDrawContextIsInFrame func(uintptr) bool | |||||
| 140 | // and [method@Gdk.DrawContext.end_frame]. In this situation, drawing commands | 148 | // and [method@Gdk.DrawContext.end_frame]. In this situation, drawing commands | ||
| 141 | // may be effecting the contents of the @context's surface. | 149 | // may be effecting the contents of the @context's surface. | ||
| 142 | func (x *DrawContext) IsInFrame() bool { | 150 | func (x *DrawContext) IsInFrame() bool { | ||
| 151 | + | core.LazyRegister(&xDrawContextIsInFrame, "GDK", "gdk_draw_context_is_in_frame", false) | |||
| 152 | + | ||||
| 143 | cret := xDrawContextIsInFrame(x.GoPointer()) | 153 | cret := xDrawContextIsInFrame(x.GoPointer()) | ||
| 144 | return cret | 154 | return cret | ||
| 145 | } | 155 | } | ||
| @@ -158,21 +168,4 @@ func (c *DrawContext) SetGoPointer(ptr uintptr) { | |||||
| 158 | func init() { | 168 | func init() { | ||
| 159 | core.SetPackageName("GDK", "gtk4") | 169 | core.SetPackageName("GDK", "gtk4") | ||
| 160 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 170 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | ||
| 161 | - | var libs []uintptr | |||
| 162 | - | for _, libPath := range core.GetPaths("GDK") { | |||
| 163 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 164 | - | if err != nil { | |||
| 165 | - | panic(err) | |||
| 166 | - | } | |||
| 167 | - | libs = append(libs, lib) | |||
| 168 | - | } | |||
| 169 | - | ||||
| 170 | - | core.PuregoSafeRegister(&xDrawContextGLibType, libs, "gdk_draw_context_get_type") | |||
| 171 | - | ||||
| 172 | - | core.PuregoSafeRegister(&xDrawContextBeginFrame, libs, "gdk_draw_context_begin_frame") | |||
| 173 | - | core.PuregoSafeRegister(&xDrawContextEndFrame, libs, "gdk_draw_context_end_frame") | |||
| 174 | - | core.PuregoSafeRegister(&xDrawContextGetDisplay, libs, "gdk_draw_context_get_display") | |||
| 175 | - | core.PuregoSafeRegister(&xDrawContextGetFrameRegion, libs, "gdk_draw_context_get_frame_region") | |||
| 176 | - | core.PuregoSafeRegister(&xDrawContextGetSurface, libs, "gdk_draw_context_get_surface") | |||
| 177 | - | core.PuregoSafeRegister(&xDrawContextIsInFrame, libs, "gdk_draw_context_is_in_frame") | |||
| 178 | } | 171 | } | ||