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
| @@ -5,6 +5,7 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | + | "github.com/bnema/purego" | |
| 8 | 9 | "github.com/bnema/puregotk/pkg/core" | |
| 9 | 10 | "github.com/bnema/puregotk/v4/gdk" | |
| 10 | 11 | "github.com/bnema/puregotk/v4/gio" | |
| @@ -126,7 +127,6 @@ type Window struct { | |||
| 126 | 127 | var xWindowGLibType func() types.GType | |
| 127 | 128 | ||
| 128 | 129 | func WindowGLibType() types.GType { | |
| 129 | - | core.LazyRegister(&xWindowGLibType, "ADW", "adw_window_get_type", false) | |
| 130 | 130 | return xWindowGLibType() | |
| 131 | 131 | } | |
| 132 | 132 | ||
| @@ -140,7 +140,6 @@ var xNewWindow func() uintptr | |||
| 140 | 140 | ||
| 141 | 141 | // Creates a new `AdwWindow`. | |
| 142 | 142 | func NewWindow() *Window { | |
| 143 | - | core.LazyRegister(&xNewWindow, "ADW", "adw_window_new", false) | |
| 144 | 143 | var cls *Window | |
| 145 | 144 | ||
| 146 | 145 | cret := xNewWindow() | |
| @@ -158,8 +157,6 @@ var xWindowAddBreakpoint func(uintptr, uintptr) | |||
| 158 | 157 | ||
| 159 | 158 | // Adds @breakpoint to @self. | |
| 160 | 159 | func (x *Window) AddBreakpoint(BreakpointVar *Breakpoint) { | |
| 161 | - | core.LazyRegister(&xWindowAddBreakpoint, "ADW", "adw_window_add_breakpoint", false) | |
| 162 | - | ||
| 163 | 160 | xWindowAddBreakpoint(x.GoPointer(), BreakpointVar.GoPointer()) | |
| 164 | 161 | } | |
| 165 | 162 | ||
| @@ -167,8 +164,6 @@ var xWindowGetAdaptivePreview func(uintptr) bool | |||
| 167 | 164 | ||
| 168 | 165 | // Gets whether adaptive preview for @self is currently open. | |
| 169 | 166 | func (x *Window) GetAdaptivePreview() bool { | |
| 170 | - | core.LazyRegister(&xWindowGetAdaptivePreview, "ADW", "adw_window_get_adaptive_preview", false) | |
| 171 | - | ||
| 172 | 167 | cret := xWindowGetAdaptivePreview(x.GoPointer()) | |
| 173 | 168 | return cret | |
| 174 | 169 | } | |
| @@ -179,7 +174,6 @@ var xWindowGetContent func(uintptr) uintptr | |||
| 179 | 174 | // | |
| 180 | 175 | // This method should always be used instead of [method@Gtk.Window.get_child]. | |
| 181 | 176 | func (x *Window) GetContent() *gtk.Widget { | |
| 182 | - | core.LazyRegister(&xWindowGetContent, "ADW", "adw_window_get_content", false) | |
| 183 | 177 | var cls *gtk.Widget | |
| 184 | 178 | ||
| 185 | 179 | cret := xWindowGetContent(x.GoPointer()) | |
| @@ -197,7 +191,6 @@ var xWindowGetCurrentBreakpoint func(uintptr) uintptr | |||
| 197 | 191 | ||
| 198 | 192 | // Gets the current breakpoint. | |
| 199 | 193 | func (x *Window) GetCurrentBreakpoint() *Breakpoint { | |
| 200 | - | core.LazyRegister(&xWindowGetCurrentBreakpoint, "ADW", "adw_window_get_current_breakpoint", false) | |
| 201 | 194 | var cls *Breakpoint | |
| 202 | 195 | ||
| 203 | 196 | cret := xWindowGetCurrentBreakpoint(x.GoPointer()) | |
| @@ -217,7 +210,6 @@ var xWindowGetDialogs func(uintptr) uintptr | |||
| 217 | 210 | // | |
| 218 | 211 | // This can be used to keep an up-to-date view. | |
| 219 | 212 | func (x *Window) GetDialogs() *gio.ListModelBase { | |
| 220 | - | core.LazyRegister(&xWindowGetDialogs, "ADW", "adw_window_get_dialogs", false) | |
| 221 | 213 | var cls *gio.ListModelBase | |
| 222 | 214 | ||
| 223 | 215 | cret := xWindowGetDialogs(x.GoPointer()) | |
| @@ -234,7 +226,6 @@ var xWindowGetVisibleDialog func(uintptr) uintptr | |||
| 234 | 226 | ||
| 235 | 227 | // Returns the currently visible dialog in @self, if there's one. | |
| 236 | 228 | func (x *Window) GetVisibleDialog() *Dialog { | |
| 237 | - | core.LazyRegister(&xWindowGetVisibleDialog, "ADW", "adw_window_get_visible_dialog", false) | |
| 238 | 229 | var cls *Dialog | |
| 239 | 230 | ||
| 240 | 231 | cret := xWindowGetVisibleDialog(x.GoPointer()) | |
| @@ -260,8 +251,6 @@ var xWindowSetAdaptivePreview func(uintptr, bool) | |||
| 260 | 251 | // | |
| 261 | 252 | // Most applications should not use this function. | |
| 262 | 253 | func (x *Window) SetAdaptivePreview(AdaptivePreviewVar bool) { | |
| 263 | - | core.LazyRegister(&xWindowSetAdaptivePreview, "ADW", "adw_window_set_adaptive_preview", false) | |
| 264 | - | ||
| 265 | 254 | xWindowSetAdaptivePreview(x.GoPointer(), AdaptivePreviewVar) | |
| 266 | 255 | } | |
| 267 | 256 | ||
| @@ -271,8 +260,6 @@ var xWindowSetContent func(uintptr, uintptr) | |||
| 271 | 260 | // | |
| 272 | 261 | // This method should always be used instead of [method@Gtk.Window.set_child]. | |
| 273 | 262 | func (x *Window) SetContent(ContentVar *gtk.Widget) { | |
| 274 | - | core.LazyRegister(&xWindowSetContent, "ADW", "adw_window_set_content", false) | |
| 275 | - | ||
| 276 | 263 | xWindowSetContent(x.GoPointer(), ContentVar.GoPointer()) | |
| 277 | 264 | } | |
| 278 | 265 | ||
| @@ -682,4 +669,25 @@ func (x *Window) SetFocus(FocusVar *gtk.Widget) { | |||
| 682 | 669 | func init() { | |
| 683 | 670 | core.SetPackageName("ADW", "libadwaita-1") | |
| 684 | 671 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 672 | + | var libs []uintptr | |
| 673 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 674 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 675 | + | if err != nil { | |
| 676 | + | panic(err) | |
| 677 | + | } | |
| 678 | + | libs = append(libs, lib) | |
| 679 | + | } | |
| 680 | + | ||
| 681 | + | core.PuregoSafeRegister(&xWindowGLibType, libs, "adw_window_get_type") | |
| 682 | + | ||
| 683 | + | core.PuregoSafeRegister(&xNewWindow, libs, "adw_window_new") | |
| 684 | + | ||
| 685 | + | core.PuregoSafeRegister(&xWindowAddBreakpoint, libs, "adw_window_add_breakpoint") | |
| 686 | + | core.PuregoSafeRegister(&xWindowGetAdaptivePreview, libs, "adw_window_get_adaptive_preview") | |
| 687 | + | core.PuregoSafeRegister(&xWindowGetContent, libs, "adw_window_get_content") | |
| 688 | + | core.PuregoSafeRegister(&xWindowGetCurrentBreakpoint, libs, "adw_window_get_current_breakpoint") | |
| 689 | + | core.PuregoSafeRegister(&xWindowGetDialogs, libs, "adw_window_get_dialogs") | |
| 690 | + | core.PuregoSafeRegister(&xWindowGetVisibleDialog, libs, "adw_window_get_visible_dialog") | |
| 691 | + | core.PuregoSafeRegister(&xWindowSetAdaptivePreview, libs, "adw_window_set_adaptive_preview") | |
| 692 | + | core.PuregoSafeRegister(&xWindowSetContent, libs, "adw_window_set_content") | |
| 685 | 693 | } | |
| @@ -5,6 +5,7 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | + | "github.com/bnema/purego" | |||
| 8 | "github.com/bnema/puregotk/pkg/core" | 9 | "github.com/bnema/puregotk/pkg/core" | ||
| 9 | "github.com/bnema/puregotk/v4/gdk" | 10 | "github.com/bnema/puregotk/v4/gdk" | ||
| 10 | "github.com/bnema/puregotk/v4/gio" | 11 | "github.com/bnema/puregotk/v4/gio" | ||
| @@ -126,7 +127,6 @@ type Window struct { | |||||
| 126 | var xWindowGLibType func() types.GType | 127 | var xWindowGLibType func() types.GType | ||
| 127 | 128 | ||||
| 128 | func WindowGLibType() types.GType { | 129 | func WindowGLibType() types.GType { | ||
| 129 | - | core.LazyRegister(&xWindowGLibType, "ADW", "adw_window_get_type", false) | |||
| 130 | return xWindowGLibType() | 130 | return xWindowGLibType() | ||
| 131 | } | 131 | } | ||
| 132 | 132 | ||||
| @@ -140,7 +140,6 @@ var xNewWindow func() uintptr | |||||
| 140 | 140 | ||||
| 141 | // Creates a new `AdwWindow`. | 141 | // Creates a new `AdwWindow`. | ||
| 142 | func NewWindow() *Window { | 142 | func NewWindow() *Window { | ||
| 143 | - | core.LazyRegister(&xNewWindow, "ADW", "adw_window_new", false) | |||
| 144 | var cls *Window | 143 | var cls *Window | ||
| 145 | 144 | ||||
| 146 | cret := xNewWindow() | 145 | cret := xNewWindow() | ||
| @@ -158,8 +157,6 @@ var xWindowAddBreakpoint func(uintptr, uintptr) | |||||
| 158 | 157 | ||||
| 159 | // Adds @breakpoint to @self. | 158 | // Adds @breakpoint to @self. | ||
| 160 | func (x *Window) AddBreakpoint(BreakpointVar *Breakpoint) { | 159 | func (x *Window) AddBreakpoint(BreakpointVar *Breakpoint) { | ||
| 161 | - | core.LazyRegister(&xWindowAddBreakpoint, "ADW", "adw_window_add_breakpoint", false) | |||
| 162 | - | ||||
| 163 | xWindowAddBreakpoint(x.GoPointer(), BreakpointVar.GoPointer()) | 160 | xWindowAddBreakpoint(x.GoPointer(), BreakpointVar.GoPointer()) | ||
| 164 | } | 161 | } | ||
| 165 | 162 | ||||
| @@ -167,8 +164,6 @@ var xWindowGetAdaptivePreview func(uintptr) bool | |||||
| 167 | 164 | ||||
| 168 | // Gets whether adaptive preview for @self is currently open. | 165 | // Gets whether adaptive preview for @self is currently open. | ||
| 169 | func (x *Window) GetAdaptivePreview() bool { | 166 | func (x *Window) GetAdaptivePreview() bool { | ||
| 170 | - | core.LazyRegister(&xWindowGetAdaptivePreview, "ADW", "adw_window_get_adaptive_preview", false) | |||
| 171 | - | ||||
| 172 | cret := xWindowGetAdaptivePreview(x.GoPointer()) | 167 | cret := xWindowGetAdaptivePreview(x.GoPointer()) | ||
| 173 | return cret | 168 | return cret | ||
| 174 | } | 169 | } | ||
| @@ -179,7 +174,6 @@ var xWindowGetContent func(uintptr) uintptr | |||||
| 179 | // | 174 | // | ||
| 180 | // This method should always be used instead of [method@Gtk.Window.get_child]. | 175 | // This method should always be used instead of [method@Gtk.Window.get_child]. | ||
| 181 | func (x *Window) GetContent() *gtk.Widget { | 176 | func (x *Window) GetContent() *gtk.Widget { | ||
| 182 | - | core.LazyRegister(&xWindowGetContent, "ADW", "adw_window_get_content", false) | |||
| 183 | var cls *gtk.Widget | 177 | var cls *gtk.Widget | ||
| 184 | 178 | ||||
| 185 | cret := xWindowGetContent(x.GoPointer()) | 179 | cret := xWindowGetContent(x.GoPointer()) | ||
| @@ -197,7 +191,6 @@ var xWindowGetCurrentBreakpoint func(uintptr) uintptr | |||||
| 197 | 191 | ||||
| 198 | // Gets the current breakpoint. | 192 | // Gets the current breakpoint. | ||
| 199 | func (x *Window) GetCurrentBreakpoint() *Breakpoint { | 193 | func (x *Window) GetCurrentBreakpoint() *Breakpoint { | ||
| 200 | - | core.LazyRegister(&xWindowGetCurrentBreakpoint, "ADW", "adw_window_get_current_breakpoint", false) | |||
| 201 | var cls *Breakpoint | 194 | var cls *Breakpoint | ||
| 202 | 195 | ||||
| 203 | cret := xWindowGetCurrentBreakpoint(x.GoPointer()) | 196 | cret := xWindowGetCurrentBreakpoint(x.GoPointer()) | ||
| @@ -217,7 +210,6 @@ var xWindowGetDialogs func(uintptr) uintptr | |||||
| 217 | // | 210 | // | ||
| 218 | // This can be used to keep an up-to-date view. | 211 | // This can be used to keep an up-to-date view. | ||
| 219 | func (x *Window) GetDialogs() *gio.ListModelBase { | 212 | func (x *Window) GetDialogs() *gio.ListModelBase { | ||
| 220 | - | core.LazyRegister(&xWindowGetDialogs, "ADW", "adw_window_get_dialogs", false) | |||
| 221 | var cls *gio.ListModelBase | 213 | var cls *gio.ListModelBase | ||
| 222 | 214 | ||||
| 223 | cret := xWindowGetDialogs(x.GoPointer()) | 215 | cret := xWindowGetDialogs(x.GoPointer()) | ||
| @@ -234,7 +226,6 @@ var xWindowGetVisibleDialog func(uintptr) uintptr | |||||
| 234 | 226 | ||||
| 235 | // Returns the currently visible dialog in @self, if there's one. | 227 | // Returns the currently visible dialog in @self, if there's one. | ||
| 236 | func (x *Window) GetVisibleDialog() *Dialog { | 228 | func (x *Window) GetVisibleDialog() *Dialog { | ||
| 237 | - | core.LazyRegister(&xWindowGetVisibleDialog, "ADW", "adw_window_get_visible_dialog", false) | |||
| 238 | var cls *Dialog | 229 | var cls *Dialog | ||
| 239 | 230 | ||||
| 240 | cret := xWindowGetVisibleDialog(x.GoPointer()) | 231 | cret := xWindowGetVisibleDialog(x.GoPointer()) | ||
| @@ -260,8 +251,6 @@ var xWindowSetAdaptivePreview func(uintptr, bool) | |||||
| 260 | // | 251 | // | ||
| 261 | // Most applications should not use this function. | 252 | // Most applications should not use this function. | ||
| 262 | func (x *Window) SetAdaptivePreview(AdaptivePreviewVar bool) { | 253 | func (x *Window) SetAdaptivePreview(AdaptivePreviewVar bool) { | ||
| 263 | - | core.LazyRegister(&xWindowSetAdaptivePreview, "ADW", "adw_window_set_adaptive_preview", false) | |||
| 264 | - | ||||
| 265 | xWindowSetAdaptivePreview(x.GoPointer(), AdaptivePreviewVar) | 254 | xWindowSetAdaptivePreview(x.GoPointer(), AdaptivePreviewVar) | ||
| 266 | } | 255 | } | ||
| 267 | 256 | ||||
| @@ -271,8 +260,6 @@ var xWindowSetContent func(uintptr, uintptr) | |||||
| 271 | // | 260 | // | ||
| 272 | // This method should always be used instead of [method@Gtk.Window.set_child]. | 261 | // This method should always be used instead of [method@Gtk.Window.set_child]. | ||
| 273 | func (x *Window) SetContent(ContentVar *gtk.Widget) { | 262 | func (x *Window) SetContent(ContentVar *gtk.Widget) { | ||
| 274 | - | core.LazyRegister(&xWindowSetContent, "ADW", "adw_window_set_content", false) | |||
| 275 | - | ||||
| 276 | xWindowSetContent(x.GoPointer(), ContentVar.GoPointer()) | 263 | xWindowSetContent(x.GoPointer(), ContentVar.GoPointer()) | ||
| 277 | } | 264 | } | ||
| 278 | 265 | ||||
| @@ -682,4 +669,25 @@ func (x *Window) SetFocus(FocusVar *gtk.Widget) { | |||||
| 682 | func init() { | 669 | func init() { | ||
| 683 | core.SetPackageName("ADW", "libadwaita-1") | 670 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 684 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 671 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 672 | + | var libs []uintptr | |||
| 673 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 674 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 675 | + | if err != nil { | |||
| 676 | + | panic(err) | |||
| 677 | + | } | |||
| 678 | + | libs = append(libs, lib) | |||
| 679 | + | } | |||
| 680 | + | ||||
| 681 | + | core.PuregoSafeRegister(&xWindowGLibType, libs, "adw_window_get_type") | |||
| 682 | + | ||||
| 683 | + | core.PuregoSafeRegister(&xNewWindow, libs, "adw_window_new") | |||
| 684 | + | ||||
| 685 | + | core.PuregoSafeRegister(&xWindowAddBreakpoint, libs, "adw_window_add_breakpoint") | |||
| 686 | + | core.PuregoSafeRegister(&xWindowGetAdaptivePreview, libs, "adw_window_get_adaptive_preview") | |||
| 687 | + | core.PuregoSafeRegister(&xWindowGetContent, libs, "adw_window_get_content") | |||
| 688 | + | core.PuregoSafeRegister(&xWindowGetCurrentBreakpoint, libs, "adw_window_get_current_breakpoint") | |||
| 689 | + | core.PuregoSafeRegister(&xWindowGetDialogs, libs, "adw_window_get_dialogs") | |||
| 690 | + | core.PuregoSafeRegister(&xWindowGetVisibleDialog, libs, "adw_window_get_visible_dialog") | |||
| 691 | + | core.PuregoSafeRegister(&xWindowSetAdaptivePreview, libs, "adw_window_set_adaptive_preview") | |||
| 692 | + | core.PuregoSafeRegister(&xWindowSetContent, libs, "adw_window_set_content") | |||
| 685 | } | 693 | } | ||