Merge pull request #349 from bnema/fix/rollback-lazy-puregotk
fix(deps): emergency rollback puregotk lazy registration regression
905 files · +25263 -27842
M go.mod +1 -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.1-0.20260714170452-0b6b9b901234 | |
| 14 | + | github.com/bnema/puregotk v0.7.0 | |
| 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 | |
| @@ -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.1-0.20260714170452-0b6b9b901234 | 14 | + | github.com/bnema/puregotk v0.7.0 |
| 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 | ||
M go.sum +0 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +4 -197 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +0 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +64 -99 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +62 -95 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +15 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +29 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +47 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +27 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +12 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +26 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +22 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +15 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +25 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +26 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +38 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +19 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +37 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +22 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +37 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +20 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +33 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +38 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +22 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +48 -61 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +1 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +33 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +24 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +17 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +56 -69 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +14 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +15 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +44 -63 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +23 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +1 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +32 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +49 -60 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +38 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +26 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +33 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +22 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +29 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +17 -8 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +37 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +27 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +39 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +34 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +34 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +30 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +21 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +44 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +24 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +28 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +30 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +21 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +16 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +32 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +37 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +87 -123 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +28 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +18 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +36 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +51 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +35 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +16 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +62 -78 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +18 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +22 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +23 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +20 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +22 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +46 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +46 -57 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +79 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +17 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +16 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +25 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +32 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +16 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +27 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +31 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +28 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +27 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +21 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +33 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +22 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +43 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +20 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +41 -53 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +28 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +14 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +18 -11
| @@ -4,6 +4,7 @@ package gdk | |||
| 4 | 4 | import ( | |
| 5 | 5 | "unsafe" | |
| 6 | 6 | ||
| 7 | + | "github.com/bnema/purego" | |
| 7 | 8 | "github.com/bnema/puregotk/pkg/core" | |
| 8 | 9 | "github.com/bnema/puregotk/v4/cairo" | |
| 9 | 10 | "github.com/bnema/puregotk/v4/gobject" | |
| @@ -26,7 +27,6 @@ type DrawContext struct { | |||
| 26 | 27 | var xDrawContextGLibType func() types.GType | |
| 27 | 28 | ||
| 28 | 29 | func DrawContextGLibType() types.GType { | |
| 29 | - | core.LazyRegister(&xDrawContextGLibType, "GDK", "gdk_draw_context_get_type", false) | |
| 30 | 30 | return xDrawContextGLibType() | |
| 31 | 31 | } | |
| 32 | 32 | ||
| @@ -63,8 +63,6 @@ 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 | - | ||
| 68 | 66 | xDrawContextBeginFrame(x.GoPointer(), RegionVar) | |
| 69 | 67 | } | |
| 70 | 68 | ||
| @@ -79,8 +77,6 @@ var xDrawContextEndFrame func(uintptr) | |||
| 79 | 77 | // implicitly before returning; it is not recommended to call `glFlush()` | |
| 80 | 78 | // explicitly before calling this function. | |
| 81 | 79 | func (x *DrawContext) EndFrame() { | |
| 82 | - | core.LazyRegister(&xDrawContextEndFrame, "GDK", "gdk_draw_context_end_frame", false) | |
| 83 | - | ||
| 84 | 80 | xDrawContextEndFrame(x.GoPointer()) | |
| 85 | 81 | } | |
| 86 | 82 | ||
| @@ -88,7 +84,6 @@ var xDrawContextGetDisplay func(uintptr) uintptr | |||
| 88 | 84 | ||
| 89 | 85 | // Retrieves the `GdkDisplay` the @context is created for | |
| 90 | 86 | func (x *DrawContext) GetDisplay() *Display { | |
| 91 | - | core.LazyRegister(&xDrawContextGetDisplay, "GDK", "gdk_draw_context_get_display", false) | |
| 92 | 87 | var cls *Display | |
| 93 | 88 | ||
| 94 | 89 | cret := xDrawContextGetDisplay(x.GoPointer()) | |
| @@ -113,8 +108,6 @@ var xDrawContextGetFrameRegion func(uintptr) uintptr | |||
| 113 | 108 | // If @context is not in between calls to [method@Gdk.DrawContext.begin_frame] | |
| 114 | 109 | // and [method@Gdk.DrawContext.end_frame], %NULL will be returned. | |
| 115 | 110 | func (x *DrawContext) GetFrameRegion() *cairo.Region { | |
| 116 | - | core.LazyRegister(&xDrawContextGetFrameRegion, "GDK", "gdk_draw_context_get_frame_region", false) | |
| 117 | - | ||
| 118 | 111 | cret := xDrawContextGetFrameRegion(x.GoPointer()) | |
| 119 | 112 | if cret == 0 { | |
| 120 | 113 | return nil | |
| @@ -126,7 +119,6 @@ var xDrawContextGetSurface func(uintptr) uintptr | |||
| 126 | 119 | ||
| 127 | 120 | // Retrieves the surface that @context is bound to. | |
| 128 | 121 | func (x *DrawContext) GetSurface() *Surface { | |
| 129 | - | core.LazyRegister(&xDrawContextGetSurface, "GDK", "gdk_draw_context_get_surface", false) | |
| 130 | 122 | var cls *Surface | |
| 131 | 123 | ||
| 132 | 124 | cret := xDrawContextGetSurface(x.GoPointer()) | |
| @@ -148,8 +140,6 @@ var xDrawContextIsInFrame func(uintptr) bool | |||
| 148 | 140 | // and [method@Gdk.DrawContext.end_frame]. In this situation, drawing commands | |
| 149 | 141 | // may be effecting the contents of the @context's surface. | |
| 150 | 142 | func (x *DrawContext) IsInFrame() bool { | |
| 151 | - | core.LazyRegister(&xDrawContextIsInFrame, "GDK", "gdk_draw_context_is_in_frame", false) | |
| 152 | - | ||
| 153 | 143 | cret := xDrawContextIsInFrame(x.GoPointer()) | |
| 154 | 144 | return cret | |
| 155 | 145 | } | |
| @@ -168,4 +158,21 @@ func (c *DrawContext) SetGoPointer(ptr uintptr) { | |||
| 168 | 158 | func init() { | |
| 169 | 159 | core.SetPackageName("GDK", "gtk4") | |
| 170 | 160 | 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") | |
| 171 | 178 | } | |
| @@ -4,6 +4,7 @@ package gdk | |||||
| 4 | import ( | 4 | import ( | ||
| 5 | "unsafe" | 5 | "unsafe" | ||
| 6 | 6 | ||||
| 7 | + | "github.com/bnema/purego" | |||
| 7 | "github.com/bnema/puregotk/pkg/core" | 8 | "github.com/bnema/puregotk/pkg/core" | ||
| 8 | "github.com/bnema/puregotk/v4/cairo" | 9 | "github.com/bnema/puregotk/v4/cairo" | ||
| 9 | "github.com/bnema/puregotk/v4/gobject" | 10 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -26,7 +27,6 @@ type DrawContext struct { | |||||
| 26 | var xDrawContextGLibType func() types.GType | 27 | var xDrawContextGLibType func() types.GType | ||
| 27 | 28 | ||||
| 28 | func DrawContextGLibType() types.GType { | 29 | 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,8 +63,6 @@ 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 | - | ||||
| 68 | xDrawContextBeginFrame(x.GoPointer(), RegionVar) | 66 | xDrawContextBeginFrame(x.GoPointer(), RegionVar) | ||
| 69 | } | 67 | } | ||
| 70 | 68 | ||||
| @@ -79,8 +77,6 @@ var xDrawContextEndFrame func(uintptr) | |||||
| 79 | // implicitly before returning; it is not recommended to call `glFlush()` | 77 | // implicitly before returning; it is not recommended to call `glFlush()` | ||
| 80 | // explicitly before calling this function. | 78 | // explicitly before calling this function. | ||
| 81 | func (x *DrawContext) EndFrame() { | 79 | func (x *DrawContext) EndFrame() { | ||
| 82 | - | core.LazyRegister(&xDrawContextEndFrame, "GDK", "gdk_draw_context_end_frame", false) | |||
| 83 | - | ||||
| 84 | xDrawContextEndFrame(x.GoPointer()) | 80 | xDrawContextEndFrame(x.GoPointer()) | ||
| 85 | } | 81 | } | ||
| 86 | 82 | ||||
| @@ -88,7 +84,6 @@ var xDrawContextGetDisplay func(uintptr) uintptr | |||||
| 88 | 84 | ||||
| 89 | // Retrieves the `GdkDisplay` the @context is created for | 85 | // Retrieves the `GdkDisplay` the @context is created for | ||
| 90 | func (x *DrawContext) GetDisplay() *Display { | 86 | func (x *DrawContext) GetDisplay() *Display { | ||
| 91 | - | core.LazyRegister(&xDrawContextGetDisplay, "GDK", "gdk_draw_context_get_display", false) | |||
| 92 | var cls *Display | 87 | var cls *Display | ||
| 93 | 88 | ||||
| 94 | cret := xDrawContextGetDisplay(x.GoPointer()) | 89 | cret := xDrawContextGetDisplay(x.GoPointer()) | ||
| @@ -113,8 +108,6 @@ var xDrawContextGetFrameRegion func(uintptr) uintptr | |||||
| 113 | // If @context is not in between calls to [method@Gdk.DrawContext.begin_frame] | 108 | // If @context is not in between calls to [method@Gdk.DrawContext.begin_frame] | ||
| 114 | // and [method@Gdk.DrawContext.end_frame], %NULL will be returned. | 109 | // and [method@Gdk.DrawContext.end_frame], %NULL will be returned. | ||
| 115 | func (x *DrawContext) GetFrameRegion() *cairo.Region { | 110 | func (x *DrawContext) GetFrameRegion() *cairo.Region { | ||
| 116 | - | core.LazyRegister(&xDrawContextGetFrameRegion, "GDK", "gdk_draw_context_get_frame_region", false) | |||
| 117 | - | ||||
| 118 | cret := xDrawContextGetFrameRegion(x.GoPointer()) | 111 | cret := xDrawContextGetFrameRegion(x.GoPointer()) | ||
| 119 | if cret == 0 { | 112 | if cret == 0 { | ||
| 120 | return nil | 113 | return nil | ||
| @@ -126,7 +119,6 @@ var xDrawContextGetSurface func(uintptr) uintptr | |||||
| 126 | 119 | ||||
| 127 | // Retrieves the surface that @context is bound to. | 120 | // Retrieves the surface that @context is bound to. | ||
| 128 | func (x *DrawContext) GetSurface() *Surface { | 121 | func (x *DrawContext) GetSurface() *Surface { | ||
| 129 | - | core.LazyRegister(&xDrawContextGetSurface, "GDK", "gdk_draw_context_get_surface", false) | |||
| 130 | var cls *Surface | 122 | var cls *Surface | ||
| 131 | 123 | ||||
| 132 | cret := xDrawContextGetSurface(x.GoPointer()) | 124 | cret := xDrawContextGetSurface(x.GoPointer()) | ||
| @@ -148,8 +140,6 @@ var xDrawContextIsInFrame func(uintptr) bool | |||||
| 148 | // and [method@Gdk.DrawContext.end_frame]. In this situation, drawing commands | 140 | // and [method@Gdk.DrawContext.end_frame]. In this situation, drawing commands | ||
| 149 | // may be effecting the contents of the @context's surface. | 141 | // may be effecting the contents of the @context's surface. | ||
| 150 | func (x *DrawContext) IsInFrame() bool { | 142 | func (x *DrawContext) IsInFrame() bool { | ||
| 151 | - | core.LazyRegister(&xDrawContextIsInFrame, "GDK", "gdk_draw_context_is_in_frame", false) | |||
| 152 | - | ||||
| 153 | cret := xDrawContextIsInFrame(x.GoPointer()) | 143 | cret := xDrawContextIsInFrame(x.GoPointer()) | ||
| 154 | return cret | 144 | return cret | ||
| 155 | } | 145 | } | ||
| @@ -168,4 +158,21 @@ func (c *DrawContext) SetGoPointer(ptr uintptr) { | |||||
| 168 | func init() { | 158 | func init() { | ||
| 169 | core.SetPackageName("GDK", "gtk4") | 159 | core.SetPackageName("GDK", "gtk4") | ||
| 170 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 160 | 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") | |||
| 171 | } | 178 | } | ||