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
| @@ -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/gobject" | |
| @@ -56,7 +57,6 @@ type PreferencesWindow struct { | |||
| 56 | 57 | var xPreferencesWindowGLibType func() types.GType | |
| 57 | 58 | ||
| 58 | 59 | func PreferencesWindowGLibType() types.GType { | |
| 59 | - | core.LazyRegister(&xPreferencesWindowGLibType, "ADW", "adw_preferences_window_get_type", false) | |
| 60 | 60 | return xPreferencesWindowGLibType() | |
| 61 | 61 | } | |
| 62 | 62 | ||
| @@ -70,7 +70,6 @@ var xNewPreferencesWindow func() uintptr | |||
| 70 | 70 | ||
| 71 | 71 | // Creates a new `AdwPreferencesWindow`. | |
| 72 | 72 | func NewPreferencesWindow() *PreferencesWindow { | |
| 73 | - | core.LazyRegister(&xNewPreferencesWindow, "ADW", "adw_preferences_window_new", false) | |
| 74 | 73 | var cls *PreferencesWindow | |
| 75 | 74 | ||
| 76 | 75 | cret := xNewPreferencesWindow() | |
| @@ -88,8 +87,6 @@ var xPreferencesWindowAdd func(uintptr, uintptr) | |||
| 88 | 87 | ||
| 89 | 88 | // Adds a preferences page to @self. | |
| 90 | 89 | func (x *PreferencesWindow) Add(PageVar *PreferencesPage) { | |
| 91 | - | core.LazyRegister(&xPreferencesWindowAdd, "ADW", "adw_preferences_window_add", false) | |
| 92 | - | ||
| 93 | 90 | xPreferencesWindowAdd(x.GoPointer(), PageVar.GoPointer()) | |
| 94 | 91 | } | |
| 95 | 92 | ||
| @@ -99,8 +96,6 @@ var xPreferencesWindowAddToast func(uintptr, uintptr) | |||
| 99 | 96 | // | |
| 100 | 97 | // See [method@ToastOverlay.add_toast]. | |
| 101 | 98 | func (x *PreferencesWindow) AddToast(ToastVar *Toast) { | |
| 102 | - | core.LazyRegister(&xPreferencesWindowAddToast, "ADW", "adw_preferences_window_add_toast", false) | |
| 103 | - | ||
| 104 | 99 | xPreferencesWindowAddToast(x.GoPointer(), ToastVar.GoPointer()) | |
| 105 | 100 | } | |
| 106 | 101 | ||
| @@ -110,8 +105,6 @@ var xPreferencesWindowCloseSubpage func(uintptr) | |||
| 110 | 105 | // | |
| 111 | 106 | // If there is no presented subpage, this does nothing. | |
| 112 | 107 | func (x *PreferencesWindow) CloseSubpage() { | |
| 113 | - | core.LazyRegister(&xPreferencesWindowCloseSubpage, "ADW", "adw_preferences_window_close_subpage", false) | |
| 114 | - | ||
| 115 | 108 | xPreferencesWindowCloseSubpage(x.GoPointer()) | |
| 116 | 109 | } | |
| 117 | 110 | ||
| @@ -119,8 +112,6 @@ var xPreferencesWindowGetCanNavigateBack func(uintptr) bool | |||
| 119 | 112 | ||
| 120 | 113 | // Gets whether gestures and shortcuts for closing subpages are enabled. | |
| 121 | 114 | func (x *PreferencesWindow) GetCanNavigateBack() bool { | |
| 122 | - | core.LazyRegister(&xPreferencesWindowGetCanNavigateBack, "ADW", "adw_preferences_window_get_can_navigate_back", false) | |
| 123 | - | ||
| 124 | 115 | cret := xPreferencesWindowGetCanNavigateBack(x.GoPointer()) | |
| 125 | 116 | return cret | |
| 126 | 117 | } | |
| @@ -129,8 +120,6 @@ var xPreferencesWindowGetSearchEnabled func(uintptr) bool | |||
| 129 | 120 | ||
| 130 | 121 | // Gets whether search is enabled for @self. | |
| 131 | 122 | func (x *PreferencesWindow) GetSearchEnabled() bool { | |
| 132 | - | core.LazyRegister(&xPreferencesWindowGetSearchEnabled, "ADW", "adw_preferences_window_get_search_enabled", false) | |
| 133 | - | ||
| 134 | 123 | cret := xPreferencesWindowGetSearchEnabled(x.GoPointer()) | |
| 135 | 124 | return cret | |
| 136 | 125 | } | |
| @@ -139,7 +128,6 @@ var xPreferencesWindowGetVisiblePage func(uintptr) uintptr | |||
| 139 | 128 | ||
| 140 | 129 | // Gets the currently visible page of @self. | |
| 141 | 130 | func (x *PreferencesWindow) GetVisiblePage() *PreferencesPage { | |
| 142 | - | core.LazyRegister(&xPreferencesWindowGetVisiblePage, "ADW", "adw_preferences_window_get_visible_page", false) | |
| 143 | 131 | var cls *PreferencesPage | |
| 144 | 132 | ||
| 145 | 133 | cret := xPreferencesWindowGetVisiblePage(x.GoPointer()) | |
| @@ -157,8 +145,6 @@ var xPreferencesWindowGetVisiblePageName func(uintptr) string | |||
| 157 | 145 | ||
| 158 | 146 | // Gets the name of currently visible page of @self. | |
| 159 | 147 | func (x *PreferencesWindow) GetVisiblePageName() string { | |
| 160 | - | core.LazyRegister(&xPreferencesWindowGetVisiblePageName, "ADW", "adw_preferences_window_get_visible_page_name", false) | |
| 161 | - | ||
| 162 | 148 | cret := xPreferencesWindowGetVisiblePageName(x.GoPointer()) | |
| 163 | 149 | return cret | |
| 164 | 150 | } | |
| @@ -167,8 +153,6 @@ var xPreferencesWindowPopSubpage func(uintptr) bool | |||
| 167 | 153 | ||
| 168 | 154 | // Pop the visible page from the subpage stack of @self. | |
| 169 | 155 | func (x *PreferencesWindow) PopSubpage() bool { | |
| 170 | - | core.LazyRegister(&xPreferencesWindowPopSubpage, "ADW", "adw_preferences_window_pop_subpage", false) | |
| 171 | - | ||
| 172 | 156 | cret := xPreferencesWindowPopSubpage(x.GoPointer()) | |
| 173 | 157 | return cret | |
| 174 | 158 | } | |
| @@ -180,8 +164,6 @@ var xPreferencesWindowPresentSubpage func(uintptr, uintptr) | |||
| 180 | 164 | // The transition can be cancelled by the user, in which case visible child will | |
| 181 | 165 | // change back to the previously visible child. | |
| 182 | 166 | func (x *PreferencesWindow) PresentSubpage(SubpageVar *gtk.Widget) { | |
| 183 | - | core.LazyRegister(&xPreferencesWindowPresentSubpage, "ADW", "adw_preferences_window_present_subpage", false) | |
| 184 | - | ||
| 185 | 167 | xPreferencesWindowPresentSubpage(x.GoPointer(), SubpageVar.GoPointer()) | |
| 186 | 168 | } | |
| 187 | 169 | ||
| @@ -191,8 +173,6 @@ var xPreferencesWindowPushSubpage func(uintptr, uintptr) | |||
| 191 | 173 | // | |
| 192 | 174 | // The page will be automatically removed when popped. | |
| 193 | 175 | func (x *PreferencesWindow) PushSubpage(PageVar *NavigationPage) { | |
| 194 | - | core.LazyRegister(&xPreferencesWindowPushSubpage, "ADW", "adw_preferences_window_push_subpage", false) | |
| 195 | - | ||
| 196 | 176 | xPreferencesWindowPushSubpage(x.GoPointer(), PageVar.GoPointer()) | |
| 197 | 177 | } | |
| 198 | 178 | ||
| @@ -200,8 +180,6 @@ var xPreferencesWindowRemove func(uintptr, uintptr) | |||
| 200 | 180 | ||
| 201 | 181 | // Removes a page from @self. | |
| 202 | 182 | func (x *PreferencesWindow) Remove(PageVar *PreferencesPage) { | |
| 203 | - | core.LazyRegister(&xPreferencesWindowRemove, "ADW", "adw_preferences_window_remove", false) | |
| 204 | - | ||
| 205 | 183 | xPreferencesWindowRemove(x.GoPointer(), PageVar.GoPointer()) | |
| 206 | 184 | } | |
| 207 | 185 | ||
| @@ -222,8 +200,6 @@ var xPreferencesWindowSetCanNavigateBack func(uintptr, bool) | |||
| 222 | 200 | // | |
| 223 | 201 | // Has no effect for subpages added with [method@PreferencesWindow.push_subpage]. | |
| 224 | 202 | func (x *PreferencesWindow) SetCanNavigateBack(CanNavigateBackVar bool) { | |
| 225 | - | core.LazyRegister(&xPreferencesWindowSetCanNavigateBack, "ADW", "adw_preferences_window_set_can_navigate_back", false) | |
| 226 | - | ||
| 227 | 203 | xPreferencesWindowSetCanNavigateBack(x.GoPointer(), CanNavigateBackVar) | |
| 228 | 204 | } | |
| 229 | 205 | ||
| @@ -231,8 +207,6 @@ var xPreferencesWindowSetSearchEnabled func(uintptr, bool) | |||
| 231 | 207 | ||
| 232 | 208 | // Sets whether search is enabled for @self. | |
| 233 | 209 | func (x *PreferencesWindow) SetSearchEnabled(SearchEnabledVar bool) { | |
| 234 | - | core.LazyRegister(&xPreferencesWindowSetSearchEnabled, "ADW", "adw_preferences_window_set_search_enabled", false) | |
| 235 | - | ||
| 236 | 210 | xPreferencesWindowSetSearchEnabled(x.GoPointer(), SearchEnabledVar) | |
| 237 | 211 | } | |
| 238 | 212 | ||
| @@ -240,8 +214,6 @@ var xPreferencesWindowSetVisiblePage func(uintptr, uintptr) | |||
| 240 | 214 | ||
| 241 | 215 | // Makes @page the visible page of @self. | |
| 242 | 216 | func (x *PreferencesWindow) SetVisiblePage(PageVar *PreferencesPage) { | |
| 243 | - | core.LazyRegister(&xPreferencesWindowSetVisiblePage, "ADW", "adw_preferences_window_set_visible_page", false) | |
| 244 | - | ||
| 245 | 217 | xPreferencesWindowSetVisiblePage(x.GoPointer(), PageVar.GoPointer()) | |
| 246 | 218 | } | |
| 247 | 219 | ||
| @@ -251,8 +223,6 @@ var xPreferencesWindowSetVisiblePageName func(uintptr, string) | |||
| 251 | 223 | // | |
| 252 | 224 | // See [property@PreferencesWindow:visible-page]. | |
| 253 | 225 | func (x *PreferencesWindow) SetVisiblePageName(NameVar string) { | |
| 254 | - | core.LazyRegister(&xPreferencesWindowSetVisiblePageName, "ADW", "adw_preferences_window_set_visible_page_name", false) | |
| 255 | - | ||
| 256 | 226 | xPreferencesWindowSetVisiblePageName(x.GoPointer(), NameVar) | |
| 257 | 227 | } | |
| 258 | 228 | ||
| @@ -712,4 +682,32 @@ func (x *PreferencesWindow) SetFocus(FocusVar *gtk.Widget) { | |||
| 712 | 682 | func init() { | |
| 713 | 683 | core.SetPackageName("ADW", "libadwaita-1") | |
| 714 | 684 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 685 | + | var libs []uintptr | |
| 686 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 687 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 688 | + | if err != nil { | |
| 689 | + | panic(err) | |
| 690 | + | } | |
| 691 | + | libs = append(libs, lib) | |
| 692 | + | } | |
| 693 | + | ||
| 694 | + | core.PuregoSafeRegister(&xPreferencesWindowGLibType, libs, "adw_preferences_window_get_type") | |
| 695 | + | ||
| 696 | + | core.PuregoSafeRegister(&xNewPreferencesWindow, libs, "adw_preferences_window_new") | |
| 697 | + | ||
| 698 | + | core.PuregoSafeRegister(&xPreferencesWindowAdd, libs, "adw_preferences_window_add") | |
| 699 | + | core.PuregoSafeRegister(&xPreferencesWindowAddToast, libs, "adw_preferences_window_add_toast") | |
| 700 | + | core.PuregoSafeRegister(&xPreferencesWindowCloseSubpage, libs, "adw_preferences_window_close_subpage") | |
| 701 | + | core.PuregoSafeRegister(&xPreferencesWindowGetCanNavigateBack, libs, "adw_preferences_window_get_can_navigate_back") | |
| 702 | + | core.PuregoSafeRegister(&xPreferencesWindowGetSearchEnabled, libs, "adw_preferences_window_get_search_enabled") | |
| 703 | + | core.PuregoSafeRegister(&xPreferencesWindowGetVisiblePage, libs, "adw_preferences_window_get_visible_page") | |
| 704 | + | core.PuregoSafeRegister(&xPreferencesWindowGetVisiblePageName, libs, "adw_preferences_window_get_visible_page_name") | |
| 705 | + | core.PuregoSafeRegister(&xPreferencesWindowPopSubpage, libs, "adw_preferences_window_pop_subpage") | |
| 706 | + | core.PuregoSafeRegister(&xPreferencesWindowPresentSubpage, libs, "adw_preferences_window_present_subpage") | |
| 707 | + | core.PuregoSafeRegister(&xPreferencesWindowPushSubpage, libs, "adw_preferences_window_push_subpage") | |
| 708 | + | core.PuregoSafeRegister(&xPreferencesWindowRemove, libs, "adw_preferences_window_remove") | |
| 709 | + | core.PuregoSafeRegister(&xPreferencesWindowSetCanNavigateBack, libs, "adw_preferences_window_set_can_navigate_back") | |
| 710 | + | core.PuregoSafeRegister(&xPreferencesWindowSetSearchEnabled, libs, "adw_preferences_window_set_search_enabled") | |
| 711 | + | core.PuregoSafeRegister(&xPreferencesWindowSetVisiblePage, libs, "adw_preferences_window_set_visible_page") | |
| 712 | + | core.PuregoSafeRegister(&xPreferencesWindowSetVisiblePageName, libs, "adw_preferences_window_set_visible_page_name") | |
| 715 | 713 | } | |
| @@ -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/gobject" | 11 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -56,7 +57,6 @@ type PreferencesWindow struct { | |||||
| 56 | var xPreferencesWindowGLibType func() types.GType | 57 | var xPreferencesWindowGLibType func() types.GType | ||
| 57 | 58 | ||||
| 58 | func PreferencesWindowGLibType() types.GType { | 59 | func PreferencesWindowGLibType() types.GType { | ||
| 59 | - | core.LazyRegister(&xPreferencesWindowGLibType, "ADW", "adw_preferences_window_get_type", false) | |||
| 60 | return xPreferencesWindowGLibType() | 60 | return xPreferencesWindowGLibType() | ||
| 61 | } | 61 | } | ||
| 62 | 62 | ||||
| @@ -70,7 +70,6 @@ var xNewPreferencesWindow func() uintptr | |||||
| 70 | 70 | ||||
| 71 | // Creates a new `AdwPreferencesWindow`. | 71 | // Creates a new `AdwPreferencesWindow`. | ||
| 72 | func NewPreferencesWindow() *PreferencesWindow { | 72 | func NewPreferencesWindow() *PreferencesWindow { | ||
| 73 | - | core.LazyRegister(&xNewPreferencesWindow, "ADW", "adw_preferences_window_new", false) | |||
| 74 | var cls *PreferencesWindow | 73 | var cls *PreferencesWindow | ||
| 75 | 74 | ||||
| 76 | cret := xNewPreferencesWindow() | 75 | cret := xNewPreferencesWindow() | ||
| @@ -88,8 +87,6 @@ var xPreferencesWindowAdd func(uintptr, uintptr) | |||||
| 88 | 87 | ||||
| 89 | // Adds a preferences page to @self. | 88 | // Adds a preferences page to @self. | ||
| 90 | func (x *PreferencesWindow) Add(PageVar *PreferencesPage) { | 89 | func (x *PreferencesWindow) Add(PageVar *PreferencesPage) { | ||
| 91 | - | core.LazyRegister(&xPreferencesWindowAdd, "ADW", "adw_preferences_window_add", false) | |||
| 92 | - | ||||
| 93 | xPreferencesWindowAdd(x.GoPointer(), PageVar.GoPointer()) | 90 | xPreferencesWindowAdd(x.GoPointer(), PageVar.GoPointer()) | ||
| 94 | } | 91 | } | ||
| 95 | 92 | ||||
| @@ -99,8 +96,6 @@ var xPreferencesWindowAddToast func(uintptr, uintptr) | |||||
| 99 | // | 96 | // | ||
| 100 | // See [method@ToastOverlay.add_toast]. | 97 | // See [method@ToastOverlay.add_toast]. | ||
| 101 | func (x *PreferencesWindow) AddToast(ToastVar *Toast) { | 98 | func (x *PreferencesWindow) AddToast(ToastVar *Toast) { | ||
| 102 | - | core.LazyRegister(&xPreferencesWindowAddToast, "ADW", "adw_preferences_window_add_toast", false) | |||
| 103 | - | ||||
| 104 | xPreferencesWindowAddToast(x.GoPointer(), ToastVar.GoPointer()) | 99 | xPreferencesWindowAddToast(x.GoPointer(), ToastVar.GoPointer()) | ||
| 105 | } | 100 | } | ||
| 106 | 101 | ||||
| @@ -110,8 +105,6 @@ var xPreferencesWindowCloseSubpage func(uintptr) | |||||
| 110 | // | 105 | // | ||
| 111 | // If there is no presented subpage, this does nothing. | 106 | // If there is no presented subpage, this does nothing. | ||
| 112 | func (x *PreferencesWindow) CloseSubpage() { | 107 | func (x *PreferencesWindow) CloseSubpage() { | ||
| 113 | - | core.LazyRegister(&xPreferencesWindowCloseSubpage, "ADW", "adw_preferences_window_close_subpage", false) | |||
| 114 | - | ||||
| 115 | xPreferencesWindowCloseSubpage(x.GoPointer()) | 108 | xPreferencesWindowCloseSubpage(x.GoPointer()) | ||
| 116 | } | 109 | } | ||
| 117 | 110 | ||||
| @@ -119,8 +112,6 @@ var xPreferencesWindowGetCanNavigateBack func(uintptr) bool | |||||
| 119 | 112 | ||||
| 120 | // Gets whether gestures and shortcuts for closing subpages are enabled. | 113 | // Gets whether gestures and shortcuts for closing subpages are enabled. | ||
| 121 | func (x *PreferencesWindow) GetCanNavigateBack() bool { | 114 | func (x *PreferencesWindow) GetCanNavigateBack() bool { | ||
| 122 | - | core.LazyRegister(&xPreferencesWindowGetCanNavigateBack, "ADW", "adw_preferences_window_get_can_navigate_back", false) | |||
| 123 | - | ||||
| 124 | cret := xPreferencesWindowGetCanNavigateBack(x.GoPointer()) | 115 | cret := xPreferencesWindowGetCanNavigateBack(x.GoPointer()) | ||
| 125 | return cret | 116 | return cret | ||
| 126 | } | 117 | } | ||
| @@ -129,8 +120,6 @@ var xPreferencesWindowGetSearchEnabled func(uintptr) bool | |||||
| 129 | 120 | ||||
| 130 | // Gets whether search is enabled for @self. | 121 | // Gets whether search is enabled for @self. | ||
| 131 | func (x *PreferencesWindow) GetSearchEnabled() bool { | 122 | func (x *PreferencesWindow) GetSearchEnabled() bool { | ||
| 132 | - | core.LazyRegister(&xPreferencesWindowGetSearchEnabled, "ADW", "adw_preferences_window_get_search_enabled", false) | |||
| 133 | - | ||||
| 134 | cret := xPreferencesWindowGetSearchEnabled(x.GoPointer()) | 123 | cret := xPreferencesWindowGetSearchEnabled(x.GoPointer()) | ||
| 135 | return cret | 124 | return cret | ||
| 136 | } | 125 | } | ||
| @@ -139,7 +128,6 @@ var xPreferencesWindowGetVisiblePage func(uintptr) uintptr | |||||
| 139 | 128 | ||||
| 140 | // Gets the currently visible page of @self. | 129 | // Gets the currently visible page of @self. | ||
| 141 | func (x *PreferencesWindow) GetVisiblePage() *PreferencesPage { | 130 | func (x *PreferencesWindow) GetVisiblePage() *PreferencesPage { | ||
| 142 | - | core.LazyRegister(&xPreferencesWindowGetVisiblePage, "ADW", "adw_preferences_window_get_visible_page", false) | |||
| 143 | var cls *PreferencesPage | 131 | var cls *PreferencesPage | ||
| 144 | 132 | ||||
| 145 | cret := xPreferencesWindowGetVisiblePage(x.GoPointer()) | 133 | cret := xPreferencesWindowGetVisiblePage(x.GoPointer()) | ||
| @@ -157,8 +145,6 @@ var xPreferencesWindowGetVisiblePageName func(uintptr) string | |||||
| 157 | 145 | ||||
| 158 | // Gets the name of currently visible page of @self. | 146 | // Gets the name of currently visible page of @self. | ||
| 159 | func (x *PreferencesWindow) GetVisiblePageName() string { | 147 | func (x *PreferencesWindow) GetVisiblePageName() string { | ||
| 160 | - | core.LazyRegister(&xPreferencesWindowGetVisiblePageName, "ADW", "adw_preferences_window_get_visible_page_name", false) | |||
| 161 | - | ||||
| 162 | cret := xPreferencesWindowGetVisiblePageName(x.GoPointer()) | 148 | cret := xPreferencesWindowGetVisiblePageName(x.GoPointer()) | ||
| 163 | return cret | 149 | return cret | ||
| 164 | } | 150 | } | ||
| @@ -167,8 +153,6 @@ var xPreferencesWindowPopSubpage func(uintptr) bool | |||||
| 167 | 153 | ||||
| 168 | // Pop the visible page from the subpage stack of @self. | 154 | // Pop the visible page from the subpage stack of @self. | ||
| 169 | func (x *PreferencesWindow) PopSubpage() bool { | 155 | func (x *PreferencesWindow) PopSubpage() bool { | ||
| 170 | - | core.LazyRegister(&xPreferencesWindowPopSubpage, "ADW", "adw_preferences_window_pop_subpage", false) | |||
| 171 | - | ||||
| 172 | cret := xPreferencesWindowPopSubpage(x.GoPointer()) | 156 | cret := xPreferencesWindowPopSubpage(x.GoPointer()) | ||
| 173 | return cret | 157 | return cret | ||
| 174 | } | 158 | } | ||
| @@ -180,8 +164,6 @@ var xPreferencesWindowPresentSubpage func(uintptr, uintptr) | |||||
| 180 | // The transition can be cancelled by the user, in which case visible child will | 164 | // The transition can be cancelled by the user, in which case visible child will | ||
| 181 | // change back to the previously visible child. | 165 | // change back to the previously visible child. | ||
| 182 | func (x *PreferencesWindow) PresentSubpage(SubpageVar *gtk.Widget) { | 166 | func (x *PreferencesWindow) PresentSubpage(SubpageVar *gtk.Widget) { | ||
| 183 | - | core.LazyRegister(&xPreferencesWindowPresentSubpage, "ADW", "adw_preferences_window_present_subpage", false) | |||
| 184 | - | ||||
| 185 | xPreferencesWindowPresentSubpage(x.GoPointer(), SubpageVar.GoPointer()) | 167 | xPreferencesWindowPresentSubpage(x.GoPointer(), SubpageVar.GoPointer()) | ||
| 186 | } | 168 | } | ||
| 187 | 169 | ||||
| @@ -191,8 +173,6 @@ var xPreferencesWindowPushSubpage func(uintptr, uintptr) | |||||
| 191 | // | 173 | // | ||
| 192 | // The page will be automatically removed when popped. | 174 | // The page will be automatically removed when popped. | ||
| 193 | func (x *PreferencesWindow) PushSubpage(PageVar *NavigationPage) { | 175 | func (x *PreferencesWindow) PushSubpage(PageVar *NavigationPage) { | ||
| 194 | - | core.LazyRegister(&xPreferencesWindowPushSubpage, "ADW", "adw_preferences_window_push_subpage", false) | |||
| 195 | - | ||||
| 196 | xPreferencesWindowPushSubpage(x.GoPointer(), PageVar.GoPointer()) | 176 | xPreferencesWindowPushSubpage(x.GoPointer(), PageVar.GoPointer()) | ||
| 197 | } | 177 | } | ||
| 198 | 178 | ||||
| @@ -200,8 +180,6 @@ var xPreferencesWindowRemove func(uintptr, uintptr) | |||||
| 200 | 180 | ||||
| 201 | // Removes a page from @self. | 181 | // Removes a page from @self. | ||
| 202 | func (x *PreferencesWindow) Remove(PageVar *PreferencesPage) { | 182 | func (x *PreferencesWindow) Remove(PageVar *PreferencesPage) { | ||
| 203 | - | core.LazyRegister(&xPreferencesWindowRemove, "ADW", "adw_preferences_window_remove", false) | |||
| 204 | - | ||||
| 205 | xPreferencesWindowRemove(x.GoPointer(), PageVar.GoPointer()) | 183 | xPreferencesWindowRemove(x.GoPointer(), PageVar.GoPointer()) | ||
| 206 | } | 184 | } | ||
| 207 | 185 | ||||
| @@ -222,8 +200,6 @@ var xPreferencesWindowSetCanNavigateBack func(uintptr, bool) | |||||
| 222 | // | 200 | // | ||
| 223 | // Has no effect for subpages added with [method@PreferencesWindow.push_subpage]. | 201 | // Has no effect for subpages added with [method@PreferencesWindow.push_subpage]. | ||
| 224 | func (x *PreferencesWindow) SetCanNavigateBack(CanNavigateBackVar bool) { | 202 | func (x *PreferencesWindow) SetCanNavigateBack(CanNavigateBackVar bool) { | ||
| 225 | - | core.LazyRegister(&xPreferencesWindowSetCanNavigateBack, "ADW", "adw_preferences_window_set_can_navigate_back", false) | |||
| 226 | - | ||||
| 227 | xPreferencesWindowSetCanNavigateBack(x.GoPointer(), CanNavigateBackVar) | 203 | xPreferencesWindowSetCanNavigateBack(x.GoPointer(), CanNavigateBackVar) | ||
| 228 | } | 204 | } | ||
| 229 | 205 | ||||
| @@ -231,8 +207,6 @@ var xPreferencesWindowSetSearchEnabled func(uintptr, bool) | |||||
| 231 | 207 | ||||
| 232 | // Sets whether search is enabled for @self. | 208 | // Sets whether search is enabled for @self. | ||
| 233 | func (x *PreferencesWindow) SetSearchEnabled(SearchEnabledVar bool) { | 209 | func (x *PreferencesWindow) SetSearchEnabled(SearchEnabledVar bool) { | ||
| 234 | - | core.LazyRegister(&xPreferencesWindowSetSearchEnabled, "ADW", "adw_preferences_window_set_search_enabled", false) | |||
| 235 | - | ||||
| 236 | xPreferencesWindowSetSearchEnabled(x.GoPointer(), SearchEnabledVar) | 210 | xPreferencesWindowSetSearchEnabled(x.GoPointer(), SearchEnabledVar) | ||
| 237 | } | 211 | } | ||
| 238 | 212 | ||||
| @@ -240,8 +214,6 @@ var xPreferencesWindowSetVisiblePage func(uintptr, uintptr) | |||||
| 240 | 214 | ||||
| 241 | // Makes @page the visible page of @self. | 215 | // Makes @page the visible page of @self. | ||
| 242 | func (x *PreferencesWindow) SetVisiblePage(PageVar *PreferencesPage) { | 216 | func (x *PreferencesWindow) SetVisiblePage(PageVar *PreferencesPage) { | ||
| 243 | - | core.LazyRegister(&xPreferencesWindowSetVisiblePage, "ADW", "adw_preferences_window_set_visible_page", false) | |||
| 244 | - | ||||
| 245 | xPreferencesWindowSetVisiblePage(x.GoPointer(), PageVar.GoPointer()) | 217 | xPreferencesWindowSetVisiblePage(x.GoPointer(), PageVar.GoPointer()) | ||
| 246 | } | 218 | } | ||
| 247 | 219 | ||||
| @@ -251,8 +223,6 @@ var xPreferencesWindowSetVisiblePageName func(uintptr, string) | |||||
| 251 | // | 223 | // | ||
| 252 | // See [property@PreferencesWindow:visible-page]. | 224 | // See [property@PreferencesWindow:visible-page]. | ||
| 253 | func (x *PreferencesWindow) SetVisiblePageName(NameVar string) { | 225 | func (x *PreferencesWindow) SetVisiblePageName(NameVar string) { | ||
| 254 | - | core.LazyRegister(&xPreferencesWindowSetVisiblePageName, "ADW", "adw_preferences_window_set_visible_page_name", false) | |||
| 255 | - | ||||
| 256 | xPreferencesWindowSetVisiblePageName(x.GoPointer(), NameVar) | 226 | xPreferencesWindowSetVisiblePageName(x.GoPointer(), NameVar) | ||
| 257 | } | 227 | } | ||
| 258 | 228 | ||||
| @@ -712,4 +682,32 @@ func (x *PreferencesWindow) SetFocus(FocusVar *gtk.Widget) { | |||||
| 712 | func init() { | 682 | func init() { | ||
| 713 | core.SetPackageName("ADW", "libadwaita-1") | 683 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 714 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 684 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 685 | + | var libs []uintptr | |||
| 686 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 687 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 688 | + | if err != nil { | |||
| 689 | + | panic(err) | |||
| 690 | + | } | |||
| 691 | + | libs = append(libs, lib) | |||
| 692 | + | } | |||
| 693 | + | ||||
| 694 | + | core.PuregoSafeRegister(&xPreferencesWindowGLibType, libs, "adw_preferences_window_get_type") | |||
| 695 | + | ||||
| 696 | + | core.PuregoSafeRegister(&xNewPreferencesWindow, libs, "adw_preferences_window_new") | |||
| 697 | + | ||||
| 698 | + | core.PuregoSafeRegister(&xPreferencesWindowAdd, libs, "adw_preferences_window_add") | |||
| 699 | + | core.PuregoSafeRegister(&xPreferencesWindowAddToast, libs, "adw_preferences_window_add_toast") | |||
| 700 | + | core.PuregoSafeRegister(&xPreferencesWindowCloseSubpage, libs, "adw_preferences_window_close_subpage") | |||
| 701 | + | core.PuregoSafeRegister(&xPreferencesWindowGetCanNavigateBack, libs, "adw_preferences_window_get_can_navigate_back") | |||
| 702 | + | core.PuregoSafeRegister(&xPreferencesWindowGetSearchEnabled, libs, "adw_preferences_window_get_search_enabled") | |||
| 703 | + | core.PuregoSafeRegister(&xPreferencesWindowGetVisiblePage, libs, "adw_preferences_window_get_visible_page") | |||
| 704 | + | core.PuregoSafeRegister(&xPreferencesWindowGetVisiblePageName, libs, "adw_preferences_window_get_visible_page_name") | |||
| 705 | + | core.PuregoSafeRegister(&xPreferencesWindowPopSubpage, libs, "adw_preferences_window_pop_subpage") | |||
| 706 | + | core.PuregoSafeRegister(&xPreferencesWindowPresentSubpage, libs, "adw_preferences_window_present_subpage") | |||
| 707 | + | core.PuregoSafeRegister(&xPreferencesWindowPushSubpage, libs, "adw_preferences_window_push_subpage") | |||
| 708 | + | core.PuregoSafeRegister(&xPreferencesWindowRemove, libs, "adw_preferences_window_remove") | |||
| 709 | + | core.PuregoSafeRegister(&xPreferencesWindowSetCanNavigateBack, libs, "adw_preferences_window_set_can_navigate_back") | |||
| 710 | + | core.PuregoSafeRegister(&xPreferencesWindowSetSearchEnabled, libs, "adw_preferences_window_set_search_enabled") | |||
| 711 | + | core.PuregoSafeRegister(&xPreferencesWindowSetVisiblePage, libs, "adw_preferences_window_set_visible_page") | |||
| 712 | + | core.PuregoSafeRegister(&xPreferencesWindowSetVisiblePageName, libs, "adw_preferences_window_set_visible_page_name") | |||
| 715 | } | 713 | } | ||