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
| @@ -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/gobject" | |
| 10 | 11 | "github.com/bnema/puregotk/v4/gobject/types" | |
| @@ -57,7 +58,6 @@ type PreferencesPage struct { | |||
| 57 | 58 | var xPreferencesPageGLibType func() types.GType | |
| 58 | 59 | ||
| 59 | 60 | func PreferencesPageGLibType() types.GType { | |
| 60 | - | core.LazyRegister(&xPreferencesPageGLibType, "ADW", "adw_preferences_page_get_type", false) | |
| 61 | 61 | return xPreferencesPageGLibType() | |
| 62 | 62 | } | |
| 63 | 63 | ||
| @@ -71,7 +71,6 @@ var xNewPreferencesPage func() uintptr | |||
| 71 | 71 | ||
| 72 | 72 | // Creates a new `AdwPreferencesPage`. | |
| 73 | 73 | func NewPreferencesPage() *PreferencesPage { | |
| 74 | - | core.LazyRegister(&xNewPreferencesPage, "ADW", "adw_preferences_page_new", false) | |
| 75 | 74 | var cls *PreferencesPage | |
| 76 | 75 | ||
| 77 | 76 | cret := xNewPreferencesPage() | |
| @@ -89,8 +88,6 @@ var xPreferencesPageAdd func(uintptr, uintptr) | |||
| 89 | 88 | ||
| 90 | 89 | // Adds a preferences group to @self. | |
| 91 | 90 | func (x *PreferencesPage) Add(GroupVar *PreferencesGroup) { | |
| 92 | - | core.LazyRegister(&xPreferencesPageAdd, "ADW", "adw_preferences_page_add", false) | |
| 93 | - | ||
| 94 | 91 | xPreferencesPageAdd(x.GoPointer(), GroupVar.GoPointer()) | |
| 95 | 92 | } | |
| 96 | 93 | ||
| @@ -98,7 +95,6 @@ var xPreferencesPageGetBanner func(uintptr) uintptr | |||
| 98 | 95 | ||
| 99 | 96 | // Gets the banner displayed at the top of the page. | |
| 100 | 97 | func (x *PreferencesPage) GetBanner() *Banner { | |
| 101 | - | core.LazyRegister(&xPreferencesPageGetBanner, "ADW", "adw_preferences_page_get_banner", false) | |
| 102 | 98 | var cls *Banner | |
| 103 | 99 | ||
| 104 | 100 | cret := xPreferencesPageGetBanner(x.GoPointer()) | |
| @@ -116,8 +112,6 @@ var xPreferencesPageGetDescription func(uintptr) string | |||
| 116 | 112 | ||
| 117 | 113 | // Gets the description of @self. | |
| 118 | 114 | func (x *PreferencesPage) GetDescription() string { | |
| 119 | - | core.LazyRegister(&xPreferencesPageGetDescription, "ADW", "adw_preferences_page_get_description", false) | |
| 120 | - | ||
| 121 | 115 | cret := xPreferencesPageGetDescription(x.GoPointer()) | |
| 122 | 116 | return cret | |
| 123 | 117 | } | |
| @@ -126,8 +120,6 @@ var xPreferencesPageGetDescriptionCentered func(uintptr) bool | |||
| 126 | 120 | ||
| 127 | 121 | // Gets whether the description is centered. | |
| 128 | 122 | func (x *PreferencesPage) GetDescriptionCentered() bool { | |
| 129 | - | core.LazyRegister(&xPreferencesPageGetDescriptionCentered, "ADW", "adw_preferences_page_get_description_centered", false) | |
| 130 | - | ||
| 131 | 123 | cret := xPreferencesPageGetDescriptionCentered(x.GoPointer()) | |
| 132 | 124 | return cret | |
| 133 | 125 | } | |
| @@ -138,7 +130,6 @@ var xPreferencesPageGetGroup func(uintptr, uint) uintptr | |||
| 138 | 130 | // | |
| 139 | 131 | // Can return `NULL` if @index is larger than the number of groups in the page. | |
| 140 | 132 | func (x *PreferencesPage) GetGroup(IndexVar uint) *PreferencesGroup { | |
| 141 | - | core.LazyRegister(&xPreferencesPageGetGroup, "ADW", "adw_preferences_page_get_group", false) | |
| 142 | 133 | var cls *PreferencesGroup | |
| 143 | 134 | ||
| 144 | 135 | cret := xPreferencesPageGetGroup(x.GoPointer(), IndexVar) | |
| @@ -156,8 +147,6 @@ var xPreferencesPageGetIconName func(uintptr) string | |||
| 156 | 147 | ||
| 157 | 148 | // Gets the icon name for @self. | |
| 158 | 149 | func (x *PreferencesPage) GetIconName() string { | |
| 159 | - | core.LazyRegister(&xPreferencesPageGetIconName, "ADW", "adw_preferences_page_get_icon_name", false) | |
| 160 | - | ||
| 161 | 150 | cret := xPreferencesPageGetIconName(x.GoPointer()) | |
| 162 | 151 | return cret | |
| 163 | 152 | } | |
| @@ -166,8 +155,6 @@ var xPreferencesPageGetName func(uintptr) string | |||
| 166 | 155 | ||
| 167 | 156 | // Gets the name of @self. | |
| 168 | 157 | func (x *PreferencesPage) GetName() string { | |
| 169 | - | core.LazyRegister(&xPreferencesPageGetName, "ADW", "adw_preferences_page_get_name", false) | |
| 170 | - | ||
| 171 | 158 | cret := xPreferencesPageGetName(x.GoPointer()) | |
| 172 | 159 | return cret | |
| 173 | 160 | } | |
| @@ -176,8 +163,6 @@ var xPreferencesPageGetTitle func(uintptr) string | |||
| 176 | 163 | ||
| 177 | 164 | // Gets the title of @self. | |
| 178 | 165 | func (x *PreferencesPage) GetTitle() string { | |
| 179 | - | core.LazyRegister(&xPreferencesPageGetTitle, "ADW", "adw_preferences_page_get_title", false) | |
| 180 | - | ||
| 181 | 166 | cret := xPreferencesPageGetTitle(x.GoPointer()) | |
| 182 | 167 | return cret | |
| 183 | 168 | } | |
| @@ -186,8 +171,6 @@ var xPreferencesPageGetUseUnderline func(uintptr) bool | |||
| 186 | 171 | ||
| 187 | 172 | // Gets whether an embedded underline in the title indicates a mnemonic. | |
| 188 | 173 | func (x *PreferencesPage) GetUseUnderline() bool { | |
| 189 | - | core.LazyRegister(&xPreferencesPageGetUseUnderline, "ADW", "adw_preferences_page_get_use_underline", false) | |
| 190 | - | ||
| 191 | 174 | cret := xPreferencesPageGetUseUnderline(x.GoPointer()) | |
| 192 | 175 | return cret | |
| 193 | 176 | } | |
| @@ -199,8 +182,6 @@ var xPreferencesPageInsert func(uintptr, uintptr, int) | |||
| 199 | 182 | // If @index is negative or larger than the number of groups, appends the group, | |
| 200 | 183 | // same as [method@PreferencesPage.add]. | |
| 201 | 184 | func (x *PreferencesPage) Insert(GroupVar *PreferencesGroup, IndexVar int) { | |
| 202 | - | core.LazyRegister(&xPreferencesPageInsert, "ADW", "adw_preferences_page_insert", false) | |
| 203 | - | ||
| 204 | 185 | xPreferencesPageInsert(x.GoPointer(), GroupVar.GoPointer(), IndexVar) | |
| 205 | 186 | } | |
| 206 | 187 | ||
| @@ -208,8 +189,6 @@ var xPreferencesPageRemove func(uintptr, uintptr) | |||
| 208 | 189 | ||
| 209 | 190 | // Removes a group from @self. | |
| 210 | 191 | func (x *PreferencesPage) Remove(GroupVar *PreferencesGroup) { | |
| 211 | - | core.LazyRegister(&xPreferencesPageRemove, "ADW", "adw_preferences_page_remove", false) | |
| 212 | - | ||
| 213 | 192 | xPreferencesPageRemove(x.GoPointer(), GroupVar.GoPointer()) | |
| 214 | 193 | } | |
| 215 | 194 | ||
| @@ -217,8 +196,6 @@ var xPreferencesPageScrollToTop func(uintptr) | |||
| 217 | 196 | ||
| 218 | 197 | // Scrolls the scrolled window of @self to the top. | |
| 219 | 198 | func (x *PreferencesPage) ScrollToTop() { | |
| 220 | - | core.LazyRegister(&xPreferencesPageScrollToTop, "ADW", "adw_preferences_page_scroll_to_top", false) | |
| 221 | - | ||
| 222 | 199 | xPreferencesPageScrollToTop(x.GoPointer()) | |
| 223 | 200 | } | |
| 224 | 201 | ||
| @@ -226,8 +203,6 @@ var xPreferencesPageSetBanner func(uintptr, uintptr) | |||
| 226 | 203 | ||
| 227 | 204 | // Sets the banner displayed at the top of the page. | |
| 228 | 205 | func (x *PreferencesPage) SetBanner(BannerVar *Banner) { | |
| 229 | - | core.LazyRegister(&xPreferencesPageSetBanner, "ADW", "adw_preferences_page_set_banner", false) | |
| 230 | - | ||
| 231 | 206 | xPreferencesPageSetBanner(x.GoPointer(), BannerVar.GoPointer()) | |
| 232 | 207 | } | |
| 233 | 208 | ||
| @@ -237,8 +212,6 @@ var xPreferencesPageSetDescription func(uintptr, string) | |||
| 237 | 212 | // | |
| 238 | 213 | // The description is displayed at the top of the page. | |
| 239 | 214 | func (x *PreferencesPage) SetDescription(DescriptionVar string) { | |
| 240 | - | core.LazyRegister(&xPreferencesPageSetDescription, "ADW", "adw_preferences_page_set_description", false) | |
| 241 | - | ||
| 242 | 215 | xPreferencesPageSetDescription(x.GoPointer(), DescriptionVar) | |
| 243 | 216 | } | |
| 244 | 217 | ||
| @@ -246,8 +219,6 @@ var xPreferencesPageSetDescriptionCentered func(uintptr, bool) | |||
| 246 | 219 | ||
| 247 | 220 | // Sets whether the description should be centered. | |
| 248 | 221 | func (x *PreferencesPage) SetDescriptionCentered(CenteredVar bool) { | |
| 249 | - | core.LazyRegister(&xPreferencesPageSetDescriptionCentered, "ADW", "adw_preferences_page_set_description_centered", false) | |
| 250 | - | ||
| 251 | 222 | xPreferencesPageSetDescriptionCentered(x.GoPointer(), CenteredVar) | |
| 252 | 223 | } | |
| 253 | 224 | ||
| @@ -255,8 +226,6 @@ var xPreferencesPageSetIconName func(uintptr, uintptr) | |||
| 255 | 226 | ||
| 256 | 227 | // Sets the icon name for @self. | |
| 257 | 228 | func (x *PreferencesPage) SetIconName(IconNameVar *string) { | |
| 258 | - | core.LazyRegister(&xPreferencesPageSetIconName, "ADW", "adw_preferences_page_set_icon_name", false) | |
| 259 | - | ||
| 260 | 229 | IconNameVarPtr := core.GStrdupNullable(IconNameVar) | |
| 261 | 230 | defer core.GFreeNullable(IconNameVarPtr) | |
| 262 | 231 | ||
| @@ -267,8 +236,6 @@ var xPreferencesPageSetName func(uintptr, uintptr) | |||
| 267 | 236 | ||
| 268 | 237 | // Sets the name of @self. | |
| 269 | 238 | func (x *PreferencesPage) SetName(NameVar *string) { | |
| 270 | - | core.LazyRegister(&xPreferencesPageSetName, "ADW", "adw_preferences_page_set_name", false) | |
| 271 | - | ||
| 272 | 239 | NameVarPtr := core.GStrdupNullable(NameVar) | |
| 273 | 240 | defer core.GFreeNullable(NameVarPtr) | |
| 274 | 241 | ||
| @@ -279,8 +246,6 @@ var xPreferencesPageSetTitle func(uintptr, string) | |||
| 279 | 246 | ||
| 280 | 247 | // Sets the title of @self. | |
| 281 | 248 | func (x *PreferencesPage) SetTitle(TitleVar string) { | |
| 282 | - | core.LazyRegister(&xPreferencesPageSetTitle, "ADW", "adw_preferences_page_set_title", false) | |
| 283 | - | ||
| 284 | 249 | xPreferencesPageSetTitle(x.GoPointer(), TitleVar) | |
| 285 | 250 | } | |
| 286 | 251 | ||
| @@ -288,8 +253,6 @@ var xPreferencesPageSetUseUnderline func(uintptr, bool) | |||
| 288 | 253 | ||
| 289 | 254 | // Sets whether an embedded underline in the title indicates a mnemonic. | |
| 290 | 255 | func (x *PreferencesPage) SetUseUnderline(UseUnderlineVar bool) { | |
| 291 | - | core.LazyRegister(&xPreferencesPageSetUseUnderline, "ADW", "adw_preferences_page_set_use_underline", false) | |
| 292 | - | ||
| 293 | 256 | xPreferencesPageSetUseUnderline(x.GoPointer(), UseUnderlineVar) | |
| 294 | 257 | } | |
| 295 | 258 | ||
| @@ -669,4 +632,36 @@ func (x *PreferencesPage) GetBuildableId() string { | |||
| 669 | 632 | func init() { | |
| 670 | 633 | core.SetPackageName("ADW", "libadwaita-1") | |
| 671 | 634 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 635 | + | var libs []uintptr | |
| 636 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 637 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 638 | + | if err != nil { | |
| 639 | + | panic(err) | |
| 640 | + | } | |
| 641 | + | libs = append(libs, lib) | |
| 642 | + | } | |
| 643 | + | ||
| 644 | + | core.PuregoSafeRegister(&xPreferencesPageGLibType, libs, "adw_preferences_page_get_type") | |
| 645 | + | ||
| 646 | + | core.PuregoSafeRegister(&xNewPreferencesPage, libs, "adw_preferences_page_new") | |
| 647 | + | ||
| 648 | + | core.PuregoSafeRegister(&xPreferencesPageAdd, libs, "adw_preferences_page_add") | |
| 649 | + | core.PuregoSafeRegister(&xPreferencesPageGetBanner, libs, "adw_preferences_page_get_banner") | |
| 650 | + | core.PuregoSafeRegister(&xPreferencesPageGetDescription, libs, "adw_preferences_page_get_description") | |
| 651 | + | core.PuregoSafeRegister(&xPreferencesPageGetDescriptionCentered, libs, "adw_preferences_page_get_description_centered") | |
| 652 | + | core.PuregoSafeRegister(&xPreferencesPageGetGroup, libs, "adw_preferences_page_get_group") | |
| 653 | + | core.PuregoSafeRegister(&xPreferencesPageGetIconName, libs, "adw_preferences_page_get_icon_name") | |
| 654 | + | core.PuregoSafeRegister(&xPreferencesPageGetName, libs, "adw_preferences_page_get_name") | |
| 655 | + | core.PuregoSafeRegister(&xPreferencesPageGetTitle, libs, "adw_preferences_page_get_title") | |
| 656 | + | core.PuregoSafeRegister(&xPreferencesPageGetUseUnderline, libs, "adw_preferences_page_get_use_underline") | |
| 657 | + | core.PuregoSafeRegister(&xPreferencesPageInsert, libs, "adw_preferences_page_insert") | |
| 658 | + | core.PuregoSafeRegister(&xPreferencesPageRemove, libs, "adw_preferences_page_remove") | |
| 659 | + | core.PuregoSafeRegister(&xPreferencesPageScrollToTop, libs, "adw_preferences_page_scroll_to_top") | |
| 660 | + | core.PuregoSafeRegister(&xPreferencesPageSetBanner, libs, "adw_preferences_page_set_banner") | |
| 661 | + | core.PuregoSafeRegister(&xPreferencesPageSetDescription, libs, "adw_preferences_page_set_description") | |
| 662 | + | core.PuregoSafeRegister(&xPreferencesPageSetDescriptionCentered, libs, "adw_preferences_page_set_description_centered") | |
| 663 | + | core.PuregoSafeRegister(&xPreferencesPageSetIconName, libs, "adw_preferences_page_set_icon_name") | |
| 664 | + | core.PuregoSafeRegister(&xPreferencesPageSetName, libs, "adw_preferences_page_set_name") | |
| 665 | + | core.PuregoSafeRegister(&xPreferencesPageSetTitle, libs, "adw_preferences_page_set_title") | |
| 666 | + | core.PuregoSafeRegister(&xPreferencesPageSetUseUnderline, libs, "adw_preferences_page_set_use_underline") | |
| 672 | 667 | } | |
| @@ -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/gobject" | 10 | "github.com/bnema/puregotk/v4/gobject" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject/types" | 11 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| @@ -57,7 +58,6 @@ type PreferencesPage struct { | |||||
| 57 | var xPreferencesPageGLibType func() types.GType | 58 | var xPreferencesPageGLibType func() types.GType | ||
| 58 | 59 | ||||
| 59 | func PreferencesPageGLibType() types.GType { | 60 | func PreferencesPageGLibType() types.GType { | ||
| 60 | - | core.LazyRegister(&xPreferencesPageGLibType, "ADW", "adw_preferences_page_get_type", false) | |||
| 61 | return xPreferencesPageGLibType() | 61 | return xPreferencesPageGLibType() | ||
| 62 | } | 62 | } | ||
| 63 | 63 | ||||
| @@ -71,7 +71,6 @@ var xNewPreferencesPage func() uintptr | |||||
| 71 | 71 | ||||
| 72 | // Creates a new `AdwPreferencesPage`. | 72 | // Creates a new `AdwPreferencesPage`. | ||
| 73 | func NewPreferencesPage() *PreferencesPage { | 73 | func NewPreferencesPage() *PreferencesPage { | ||
| 74 | - | core.LazyRegister(&xNewPreferencesPage, "ADW", "adw_preferences_page_new", false) | |||
| 75 | var cls *PreferencesPage | 74 | var cls *PreferencesPage | ||
| 76 | 75 | ||||
| 77 | cret := xNewPreferencesPage() | 76 | cret := xNewPreferencesPage() | ||
| @@ -89,8 +88,6 @@ var xPreferencesPageAdd func(uintptr, uintptr) | |||||
| 89 | 88 | ||||
| 90 | // Adds a preferences group to @self. | 89 | // Adds a preferences group to @self. | ||
| 91 | func (x *PreferencesPage) Add(GroupVar *PreferencesGroup) { | 90 | func (x *PreferencesPage) Add(GroupVar *PreferencesGroup) { | ||
| 92 | - | core.LazyRegister(&xPreferencesPageAdd, "ADW", "adw_preferences_page_add", false) | |||
| 93 | - | ||||
| 94 | xPreferencesPageAdd(x.GoPointer(), GroupVar.GoPointer()) | 91 | xPreferencesPageAdd(x.GoPointer(), GroupVar.GoPointer()) | ||
| 95 | } | 92 | } | ||
| 96 | 93 | ||||
| @@ -98,7 +95,6 @@ var xPreferencesPageGetBanner func(uintptr) uintptr | |||||
| 98 | 95 | ||||
| 99 | // Gets the banner displayed at the top of the page. | 96 | // Gets the banner displayed at the top of the page. | ||
| 100 | func (x *PreferencesPage) GetBanner() *Banner { | 97 | func (x *PreferencesPage) GetBanner() *Banner { | ||
| 101 | - | core.LazyRegister(&xPreferencesPageGetBanner, "ADW", "adw_preferences_page_get_banner", false) | |||
| 102 | var cls *Banner | 98 | var cls *Banner | ||
| 103 | 99 | ||||
| 104 | cret := xPreferencesPageGetBanner(x.GoPointer()) | 100 | cret := xPreferencesPageGetBanner(x.GoPointer()) | ||
| @@ -116,8 +112,6 @@ var xPreferencesPageGetDescription func(uintptr) string | |||||
| 116 | 112 | ||||
| 117 | // Gets the description of @self. | 113 | // Gets the description of @self. | ||
| 118 | func (x *PreferencesPage) GetDescription() string { | 114 | func (x *PreferencesPage) GetDescription() string { | ||
| 119 | - | core.LazyRegister(&xPreferencesPageGetDescription, "ADW", "adw_preferences_page_get_description", false) | |||
| 120 | - | ||||
| 121 | cret := xPreferencesPageGetDescription(x.GoPointer()) | 115 | cret := xPreferencesPageGetDescription(x.GoPointer()) | ||
| 122 | return cret | 116 | return cret | ||
| 123 | } | 117 | } | ||
| @@ -126,8 +120,6 @@ var xPreferencesPageGetDescriptionCentered func(uintptr) bool | |||||
| 126 | 120 | ||||
| 127 | // Gets whether the description is centered. | 121 | // Gets whether the description is centered. | ||
| 128 | func (x *PreferencesPage) GetDescriptionCentered() bool { | 122 | func (x *PreferencesPage) GetDescriptionCentered() bool { | ||
| 129 | - | core.LazyRegister(&xPreferencesPageGetDescriptionCentered, "ADW", "adw_preferences_page_get_description_centered", false) | |||
| 130 | - | ||||
| 131 | cret := xPreferencesPageGetDescriptionCentered(x.GoPointer()) | 123 | cret := xPreferencesPageGetDescriptionCentered(x.GoPointer()) | ||
| 132 | return cret | 124 | return cret | ||
| 133 | } | 125 | } | ||
| @@ -138,7 +130,6 @@ var xPreferencesPageGetGroup func(uintptr, uint) uintptr | |||||
| 138 | // | 130 | // | ||
| 139 | // Can return `NULL` if @index is larger than the number of groups in the page. | 131 | // Can return `NULL` if @index is larger than the number of groups in the page. | ||
| 140 | func (x *PreferencesPage) GetGroup(IndexVar uint) *PreferencesGroup { | 132 | func (x *PreferencesPage) GetGroup(IndexVar uint) *PreferencesGroup { | ||
| 141 | - | core.LazyRegister(&xPreferencesPageGetGroup, "ADW", "adw_preferences_page_get_group", false) | |||
| 142 | var cls *PreferencesGroup | 133 | var cls *PreferencesGroup | ||
| 143 | 134 | ||||
| 144 | cret := xPreferencesPageGetGroup(x.GoPointer(), IndexVar) | 135 | cret := xPreferencesPageGetGroup(x.GoPointer(), IndexVar) | ||
| @@ -156,8 +147,6 @@ var xPreferencesPageGetIconName func(uintptr) string | |||||
| 156 | 147 | ||||
| 157 | // Gets the icon name for @self. | 148 | // Gets the icon name for @self. | ||
| 158 | func (x *PreferencesPage) GetIconName() string { | 149 | func (x *PreferencesPage) GetIconName() string { | ||
| 159 | - | core.LazyRegister(&xPreferencesPageGetIconName, "ADW", "adw_preferences_page_get_icon_name", false) | |||
| 160 | - | ||||
| 161 | cret := xPreferencesPageGetIconName(x.GoPointer()) | 150 | cret := xPreferencesPageGetIconName(x.GoPointer()) | ||
| 162 | return cret | 151 | return cret | ||
| 163 | } | 152 | } | ||
| @@ -166,8 +155,6 @@ var xPreferencesPageGetName func(uintptr) string | |||||
| 166 | 155 | ||||
| 167 | // Gets the name of @self. | 156 | // Gets the name of @self. | ||
| 168 | func (x *PreferencesPage) GetName() string { | 157 | func (x *PreferencesPage) GetName() string { | ||
| 169 | - | core.LazyRegister(&xPreferencesPageGetName, "ADW", "adw_preferences_page_get_name", false) | |||
| 170 | - | ||||
| 171 | cret := xPreferencesPageGetName(x.GoPointer()) | 158 | cret := xPreferencesPageGetName(x.GoPointer()) | ||
| 172 | return cret | 159 | return cret | ||
| 173 | } | 160 | } | ||
| @@ -176,8 +163,6 @@ var xPreferencesPageGetTitle func(uintptr) string | |||||
| 176 | 163 | ||||
| 177 | // Gets the title of @self. | 164 | // Gets the title of @self. | ||
| 178 | func (x *PreferencesPage) GetTitle() string { | 165 | func (x *PreferencesPage) GetTitle() string { | ||
| 179 | - | core.LazyRegister(&xPreferencesPageGetTitle, "ADW", "adw_preferences_page_get_title", false) | |||
| 180 | - | ||||
| 181 | cret := xPreferencesPageGetTitle(x.GoPointer()) | 166 | cret := xPreferencesPageGetTitle(x.GoPointer()) | ||
| 182 | return cret | 167 | return cret | ||
| 183 | } | 168 | } | ||
| @@ -186,8 +171,6 @@ var xPreferencesPageGetUseUnderline func(uintptr) bool | |||||
| 186 | 171 | ||||
| 187 | // Gets whether an embedded underline in the title indicates a mnemonic. | 172 | // Gets whether an embedded underline in the title indicates a mnemonic. | ||
| 188 | func (x *PreferencesPage) GetUseUnderline() bool { | 173 | func (x *PreferencesPage) GetUseUnderline() bool { | ||
| 189 | - | core.LazyRegister(&xPreferencesPageGetUseUnderline, "ADW", "adw_preferences_page_get_use_underline", false) | |||
| 190 | - | ||||
| 191 | cret := xPreferencesPageGetUseUnderline(x.GoPointer()) | 174 | cret := xPreferencesPageGetUseUnderline(x.GoPointer()) | ||
| 192 | return cret | 175 | return cret | ||
| 193 | } | 176 | } | ||
| @@ -199,8 +182,6 @@ var xPreferencesPageInsert func(uintptr, uintptr, int) | |||||
| 199 | // If @index is negative or larger than the number of groups, appends the group, | 182 | // If @index is negative or larger than the number of groups, appends the group, | ||
| 200 | // same as [method@PreferencesPage.add]. | 183 | // same as [method@PreferencesPage.add]. | ||
| 201 | func (x *PreferencesPage) Insert(GroupVar *PreferencesGroup, IndexVar int) { | 184 | func (x *PreferencesPage) Insert(GroupVar *PreferencesGroup, IndexVar int) { | ||
| 202 | - | core.LazyRegister(&xPreferencesPageInsert, "ADW", "adw_preferences_page_insert", false) | |||
| 203 | - | ||||
| 204 | xPreferencesPageInsert(x.GoPointer(), GroupVar.GoPointer(), IndexVar) | 185 | xPreferencesPageInsert(x.GoPointer(), GroupVar.GoPointer(), IndexVar) | ||
| 205 | } | 186 | } | ||
| 206 | 187 | ||||
| @@ -208,8 +189,6 @@ var xPreferencesPageRemove func(uintptr, uintptr) | |||||
| 208 | 189 | ||||
| 209 | // Removes a group from @self. | 190 | // Removes a group from @self. | ||
| 210 | func (x *PreferencesPage) Remove(GroupVar *PreferencesGroup) { | 191 | func (x *PreferencesPage) Remove(GroupVar *PreferencesGroup) { | ||
| 211 | - | core.LazyRegister(&xPreferencesPageRemove, "ADW", "adw_preferences_page_remove", false) | |||
| 212 | - | ||||
| 213 | xPreferencesPageRemove(x.GoPointer(), GroupVar.GoPointer()) | 192 | xPreferencesPageRemove(x.GoPointer(), GroupVar.GoPointer()) | ||
| 214 | } | 193 | } | ||
| 215 | 194 | ||||
| @@ -217,8 +196,6 @@ var xPreferencesPageScrollToTop func(uintptr) | |||||
| 217 | 196 | ||||
| 218 | // Scrolls the scrolled window of @self to the top. | 197 | // Scrolls the scrolled window of @self to the top. | ||
| 219 | func (x *PreferencesPage) ScrollToTop() { | 198 | func (x *PreferencesPage) ScrollToTop() { | ||
| 220 | - | core.LazyRegister(&xPreferencesPageScrollToTop, "ADW", "adw_preferences_page_scroll_to_top", false) | |||
| 221 | - | ||||
| 222 | xPreferencesPageScrollToTop(x.GoPointer()) | 199 | xPreferencesPageScrollToTop(x.GoPointer()) | ||
| 223 | } | 200 | } | ||
| 224 | 201 | ||||
| @@ -226,8 +203,6 @@ var xPreferencesPageSetBanner func(uintptr, uintptr) | |||||
| 226 | 203 | ||||
| 227 | // Sets the banner displayed at the top of the page. | 204 | // Sets the banner displayed at the top of the page. | ||
| 228 | func (x *PreferencesPage) SetBanner(BannerVar *Banner) { | 205 | func (x *PreferencesPage) SetBanner(BannerVar *Banner) { | ||
| 229 | - | core.LazyRegister(&xPreferencesPageSetBanner, "ADW", "adw_preferences_page_set_banner", false) | |||
| 230 | - | ||||
| 231 | xPreferencesPageSetBanner(x.GoPointer(), BannerVar.GoPointer()) | 206 | xPreferencesPageSetBanner(x.GoPointer(), BannerVar.GoPointer()) | ||
| 232 | } | 207 | } | ||
| 233 | 208 | ||||
| @@ -237,8 +212,6 @@ var xPreferencesPageSetDescription func(uintptr, string) | |||||
| 237 | // | 212 | // | ||
| 238 | // The description is displayed at the top of the page. | 213 | // The description is displayed at the top of the page. | ||
| 239 | func (x *PreferencesPage) SetDescription(DescriptionVar string) { | 214 | func (x *PreferencesPage) SetDescription(DescriptionVar string) { | ||
| 240 | - | core.LazyRegister(&xPreferencesPageSetDescription, "ADW", "adw_preferences_page_set_description", false) | |||
| 241 | - | ||||
| 242 | xPreferencesPageSetDescription(x.GoPointer(), DescriptionVar) | 215 | xPreferencesPageSetDescription(x.GoPointer(), DescriptionVar) | ||
| 243 | } | 216 | } | ||
| 244 | 217 | ||||
| @@ -246,8 +219,6 @@ var xPreferencesPageSetDescriptionCentered func(uintptr, bool) | |||||
| 246 | 219 | ||||
| 247 | // Sets whether the description should be centered. | 220 | // Sets whether the description should be centered. | ||
| 248 | func (x *PreferencesPage) SetDescriptionCentered(CenteredVar bool) { | 221 | func (x *PreferencesPage) SetDescriptionCentered(CenteredVar bool) { | ||
| 249 | - | core.LazyRegister(&xPreferencesPageSetDescriptionCentered, "ADW", "adw_preferences_page_set_description_centered", false) | |||
| 250 | - | ||||
| 251 | xPreferencesPageSetDescriptionCentered(x.GoPointer(), CenteredVar) | 222 | xPreferencesPageSetDescriptionCentered(x.GoPointer(), CenteredVar) | ||
| 252 | } | 223 | } | ||
| 253 | 224 | ||||
| @@ -255,8 +226,6 @@ var xPreferencesPageSetIconName func(uintptr, uintptr) | |||||
| 255 | 226 | ||||
| 256 | // Sets the icon name for @self. | 227 | // Sets the icon name for @self. | ||
| 257 | func (x *PreferencesPage) SetIconName(IconNameVar *string) { | 228 | func (x *PreferencesPage) SetIconName(IconNameVar *string) { | ||
| 258 | - | core.LazyRegister(&xPreferencesPageSetIconName, "ADW", "adw_preferences_page_set_icon_name", false) | |||
| 259 | - | ||||
| 260 | IconNameVarPtr := core.GStrdupNullable(IconNameVar) | 229 | IconNameVarPtr := core.GStrdupNullable(IconNameVar) | ||
| 261 | defer core.GFreeNullable(IconNameVarPtr) | 230 | defer core.GFreeNullable(IconNameVarPtr) | ||
| 262 | 231 | ||||
| @@ -267,8 +236,6 @@ var xPreferencesPageSetName func(uintptr, uintptr) | |||||
| 267 | 236 | ||||
| 268 | // Sets the name of @self. | 237 | // Sets the name of @self. | ||
| 269 | func (x *PreferencesPage) SetName(NameVar *string) { | 238 | func (x *PreferencesPage) SetName(NameVar *string) { | ||
| 270 | - | core.LazyRegister(&xPreferencesPageSetName, "ADW", "adw_preferences_page_set_name", false) | |||
| 271 | - | ||||
| 272 | NameVarPtr := core.GStrdupNullable(NameVar) | 239 | NameVarPtr := core.GStrdupNullable(NameVar) | ||
| 273 | defer core.GFreeNullable(NameVarPtr) | 240 | defer core.GFreeNullable(NameVarPtr) | ||
| 274 | 241 | ||||
| @@ -279,8 +246,6 @@ var xPreferencesPageSetTitle func(uintptr, string) | |||||
| 279 | 246 | ||||
| 280 | // Sets the title of @self. | 247 | // Sets the title of @self. | ||
| 281 | func (x *PreferencesPage) SetTitle(TitleVar string) { | 248 | func (x *PreferencesPage) SetTitle(TitleVar string) { | ||
| 282 | - | core.LazyRegister(&xPreferencesPageSetTitle, "ADW", "adw_preferences_page_set_title", false) | |||
| 283 | - | ||||
| 284 | xPreferencesPageSetTitle(x.GoPointer(), TitleVar) | 249 | xPreferencesPageSetTitle(x.GoPointer(), TitleVar) | ||
| 285 | } | 250 | } | ||
| 286 | 251 | ||||
| @@ -288,8 +253,6 @@ var xPreferencesPageSetUseUnderline func(uintptr, bool) | |||||
| 288 | 253 | ||||
| 289 | // Sets whether an embedded underline in the title indicates a mnemonic. | 254 | // Sets whether an embedded underline in the title indicates a mnemonic. | ||
| 290 | func (x *PreferencesPage) SetUseUnderline(UseUnderlineVar bool) { | 255 | func (x *PreferencesPage) SetUseUnderline(UseUnderlineVar bool) { | ||
| 291 | - | core.LazyRegister(&xPreferencesPageSetUseUnderline, "ADW", "adw_preferences_page_set_use_underline", false) | |||
| 292 | - | ||||
| 293 | xPreferencesPageSetUseUnderline(x.GoPointer(), UseUnderlineVar) | 256 | xPreferencesPageSetUseUnderline(x.GoPointer(), UseUnderlineVar) | ||
| 294 | } | 257 | } | ||
| 295 | 258 | ||||
| @@ -669,4 +632,36 @@ func (x *PreferencesPage) GetBuildableId() string { | |||||
| 669 | func init() { | 632 | func init() { | ||
| 670 | core.SetPackageName("ADW", "libadwaita-1") | 633 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 671 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 634 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 635 | + | var libs []uintptr | |||
| 636 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 637 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 638 | + | if err != nil { | |||
| 639 | + | panic(err) | |||
| 640 | + | } | |||
| 641 | + | libs = append(libs, lib) | |||
| 642 | + | } | |||
| 643 | + | ||||
| 644 | + | core.PuregoSafeRegister(&xPreferencesPageGLibType, libs, "adw_preferences_page_get_type") | |||
| 645 | + | ||||
| 646 | + | core.PuregoSafeRegister(&xNewPreferencesPage, libs, "adw_preferences_page_new") | |||
| 647 | + | ||||
| 648 | + | core.PuregoSafeRegister(&xPreferencesPageAdd, libs, "adw_preferences_page_add") | |||
| 649 | + | core.PuregoSafeRegister(&xPreferencesPageGetBanner, libs, "adw_preferences_page_get_banner") | |||
| 650 | + | core.PuregoSafeRegister(&xPreferencesPageGetDescription, libs, "adw_preferences_page_get_description") | |||
| 651 | + | core.PuregoSafeRegister(&xPreferencesPageGetDescriptionCentered, libs, "adw_preferences_page_get_description_centered") | |||
| 652 | + | core.PuregoSafeRegister(&xPreferencesPageGetGroup, libs, "adw_preferences_page_get_group") | |||
| 653 | + | core.PuregoSafeRegister(&xPreferencesPageGetIconName, libs, "adw_preferences_page_get_icon_name") | |||
| 654 | + | core.PuregoSafeRegister(&xPreferencesPageGetName, libs, "adw_preferences_page_get_name") | |||
| 655 | + | core.PuregoSafeRegister(&xPreferencesPageGetTitle, libs, "adw_preferences_page_get_title") | |||
| 656 | + | core.PuregoSafeRegister(&xPreferencesPageGetUseUnderline, libs, "adw_preferences_page_get_use_underline") | |||
| 657 | + | core.PuregoSafeRegister(&xPreferencesPageInsert, libs, "adw_preferences_page_insert") | |||
| 658 | + | core.PuregoSafeRegister(&xPreferencesPageRemove, libs, "adw_preferences_page_remove") | |||
| 659 | + | core.PuregoSafeRegister(&xPreferencesPageScrollToTop, libs, "adw_preferences_page_scroll_to_top") | |||
| 660 | + | core.PuregoSafeRegister(&xPreferencesPageSetBanner, libs, "adw_preferences_page_set_banner") | |||
| 661 | + | core.PuregoSafeRegister(&xPreferencesPageSetDescription, libs, "adw_preferences_page_set_description") | |||
| 662 | + | core.PuregoSafeRegister(&xPreferencesPageSetDescriptionCentered, libs, "adw_preferences_page_set_description_centered") | |||
| 663 | + | core.PuregoSafeRegister(&xPreferencesPageSetIconName, libs, "adw_preferences_page_set_icon_name") | |||
| 664 | + | core.PuregoSafeRegister(&xPreferencesPageSetName, libs, "adw_preferences_page_set_name") | |||
| 665 | + | core.PuregoSafeRegister(&xPreferencesPageSetTitle, libs, "adw_preferences_page_set_title") | |||
| 666 | + | core.PuregoSafeRegister(&xPreferencesPageSetUseUnderline, libs, "adw_preferences_page_set_use_underline") | |||
| 672 | } | 667 | } | ||