Merge pull request #349 from bnema/fix/rollback-lazy-puregotk
fix(deps): emergency rollback puregotk lazy registration regression
905 files · +25263 -27842
M go.mod +1 -1
| @@ -11,7 +11,7 @@ require ( | |||
| 11 | 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | |
| 14 | - | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | + | github.com/bnema/puregotk v0.7.0 | |
| 15 | 15 | github.com/charmbracelet/bubbles v1.0.0 | |
| 16 | 16 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 17 | 17 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -11,7 +11,7 @@ require ( | |||||
| 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | ||
| 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | ||
| 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | ||
| 14 | - | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | 14 | + | github.com/bnema/puregotk v0.7.0 |
| 15 | github.com/charmbracelet/bubbles v1.0.0 | 15 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 16 | github.com/charmbracelet/bubbletea v1.3.10 | 16 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 17 | github.com/charmbracelet/lipgloss v1.1.0 | 17 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +0 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +4 -197 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +0 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +64 -99 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +62 -95 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +15 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +29 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +47 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +27 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +12 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +26 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +22 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +15 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +25 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +26 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +38 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +19 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +37 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +22 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +37 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +20 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +33 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +38 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +22 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +48 -61 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +1 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +33 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +24 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +17 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +56 -69 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +14 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +15 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +44 -63 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +23 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +1 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +32 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +49 -60 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +38 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +26 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +33 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +22 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +29 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +17 -8 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +37 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +27 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +39 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +34 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +34 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +30 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +21 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +44 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +24 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +28 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +30 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +21 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +16 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +32 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +37 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +87 -123 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +28 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +18 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +36 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +51 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +35 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +16 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +62 -78 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +18 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +22 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +23 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +20 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +22 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +46 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +46 -57 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +79 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +17 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +16 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +25 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +32 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +16 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +27 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +31 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +28 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +27 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +21 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +33 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +22 -27
| @@ -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/types" | |
| 10 | 11 | ) | |
| @@ -53,7 +54,6 @@ type DevicePad interface { | |||
| 53 | 54 | var xDevicePadGLibType func() types.GType | |
| 54 | 55 | ||
| 55 | 56 | func DevicePadGLibType() types.GType { | |
| 56 | - | core.LazyRegister(&xDevicePadGLibType, "GDK", "gdk_device_pad_get_type", false) | |
| 57 | 57 | return xDevicePadGLibType() | |
| 58 | 58 | } | |
| 59 | 59 | ||
| @@ -102,33 +102,12 @@ func (x *DevicePadBase) GetNGroups() int { | |||
| 102 | 102 | return cret | |
| 103 | 103 | } | |
| 104 | 104 | ||
| 105 | - | var XGdkDevicePadGetFeatureGroup func(uintptr, DevicePadFeature, int) int = func(instance uintptr, FeatureVarp DevicePadFeature, FeatureIdxVarp int) int { | |
| 106 | - | core.LazyRegister(&xXGdkDevicePadGetFeatureGroup, "GDK", "gdk_device_pad_get_feature_group", false) | |
| 107 | - | return xXGdkDevicePadGetFeatureGroup(instance, FeatureVarp, FeatureIdxVarp) | |
| 108 | - | } | |
| 109 | - | ||
| 110 | 105 | var ( | |
| 111 | - | xXGdkDevicePadGetFeatureGroup func(uintptr, DevicePadFeature, int) int | |
| 112 | - | XGdkDevicePadGetGroupNModes func(uintptr, int) int = func(instance uintptr, GroupIdxVarp int) int { | |
| 113 | - | core.LazyRegister(&xXGdkDevicePadGetGroupNModes, "GDK", "gdk_device_pad_get_group_n_modes", false) | |
| 114 | - | return xXGdkDevicePadGetGroupNModes(instance, GroupIdxVarp) | |
| 115 | - | } | |
| 106 | + | XGdkDevicePadGetFeatureGroup func(uintptr, DevicePadFeature, int) int | |
| 107 | + | XGdkDevicePadGetGroupNModes func(uintptr, int) int | |
| 108 | + | XGdkDevicePadGetNFeatures func(uintptr, DevicePadFeature) int | |
| 109 | + | XGdkDevicePadGetNGroups func(uintptr) int | |
| 116 | 110 | ) | |
| 117 | - | var ( | |
| 118 | - | xXGdkDevicePadGetGroupNModes func(uintptr, int) int | |
| 119 | - | XGdkDevicePadGetNFeatures func(uintptr, DevicePadFeature) int = func(instance uintptr, FeatureVarp DevicePadFeature) int { | |
| 120 | - | core.LazyRegister(&xXGdkDevicePadGetNFeatures, "GDK", "gdk_device_pad_get_n_features", false) | |
| 121 | - | return xXGdkDevicePadGetNFeatures(instance, FeatureVarp) | |
| 122 | - | } | |
| 123 | - | ) | |
| 124 | - | var ( | |
| 125 | - | xXGdkDevicePadGetNFeatures func(uintptr, DevicePadFeature) int | |
| 126 | - | XGdkDevicePadGetNGroups func(uintptr) int = func(instance uintptr) int { | |
| 127 | - | core.LazyRegister(&xXGdkDevicePadGetNGroups, "GDK", "gdk_device_pad_get_n_groups", false) | |
| 128 | - | return xXGdkDevicePadGetNGroups(instance) | |
| 129 | - | } | |
| 130 | - | ) | |
| 131 | - | var xXGdkDevicePadGetNGroups func(uintptr) int | |
| 132 | 111 | ||
| 133 | 112 | // A pad feature. | |
| 134 | 113 | type DevicePadFeature int | |
| @@ -136,7 +115,6 @@ type DevicePadFeature int | |||
| 136 | 115 | var xDevicePadFeatureGLibType func() types.GType | |
| 137 | 116 | ||
| 138 | 117 | func DevicePadFeatureGLibType() types.GType { | |
| 139 | - | core.LazyRegister(&xDevicePadFeatureGLibType, "GDK", "gdk_device_pad_feature_get_type", false) | |
| 140 | 118 | return xDevicePadFeatureGLibType() | |
| 141 | 119 | } | |
| 142 | 120 | ||
| @@ -153,4 +131,21 @@ const ( | |||
| 153 | 131 | func init() { | |
| 154 | 132 | core.SetPackageName("GDK", "gtk4") | |
| 155 | 133 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | |
| 134 | + | var libs []uintptr | |
| 135 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 136 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 137 | + | if err != nil { | |
| 138 | + | panic(err) | |
| 139 | + | } | |
| 140 | + | libs = append(libs, lib) | |
| 141 | + | } | |
| 142 | + | ||
| 143 | + | core.PuregoSafeRegister(&xDevicePadFeatureGLibType, libs, "gdk_device_pad_feature_get_type") | |
| 144 | + | ||
| 145 | + | core.PuregoSafeRegister(&xDevicePadGLibType, libs, "gdk_device_pad_get_type") | |
| 146 | + | ||
| 147 | + | core.PuregoSafeRegister(&XGdkDevicePadGetFeatureGroup, libs, "gdk_device_pad_get_feature_group") | |
| 148 | + | core.PuregoSafeRegister(&XGdkDevicePadGetGroupNModes, libs, "gdk_device_pad_get_group_n_modes") | |
| 149 | + | core.PuregoSafeRegister(&XGdkDevicePadGetNFeatures, libs, "gdk_device_pad_get_n_features") | |
| 150 | + | core.PuregoSafeRegister(&XGdkDevicePadGetNGroups, libs, "gdk_device_pad_get_n_groups") | |
| 156 | 151 | } | |
| @@ -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/types" | 10 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| 10 | ) | 11 | ) | ||
| @@ -53,7 +54,6 @@ type DevicePad interface { | |||||
| 53 | var xDevicePadGLibType func() types.GType | 54 | var xDevicePadGLibType func() types.GType | ||
| 54 | 55 | ||||
| 55 | func DevicePadGLibType() types.GType { | 56 | func DevicePadGLibType() types.GType { | ||
| 56 | - | core.LazyRegister(&xDevicePadGLibType, "GDK", "gdk_device_pad_get_type", false) | |||
| 57 | return xDevicePadGLibType() | 57 | return xDevicePadGLibType() | ||
| 58 | } | 58 | } | ||
| 59 | 59 | ||||
| @@ -102,33 +102,12 @@ func (x *DevicePadBase) GetNGroups() int { | |||||
| 102 | return cret | 102 | return cret | ||
| 103 | } | 103 | } | ||
| 104 | 104 | ||||
| 105 | - | var XGdkDevicePadGetFeatureGroup func(uintptr, DevicePadFeature, int) int = func(instance uintptr, FeatureVarp DevicePadFeature, FeatureIdxVarp int) int { | |||
| 106 | - | core.LazyRegister(&xXGdkDevicePadGetFeatureGroup, "GDK", "gdk_device_pad_get_feature_group", false) | |||
| 107 | - | return xXGdkDevicePadGetFeatureGroup(instance, FeatureVarp, FeatureIdxVarp) | |||
| 108 | - | } | |||
| 109 | - | ||||
| 110 | var ( | 105 | var ( | ||
| 111 | - | xXGdkDevicePadGetFeatureGroup func(uintptr, DevicePadFeature, int) int | 106 | + | XGdkDevicePadGetFeatureGroup func(uintptr, DevicePadFeature, int) int |
| 112 | - | XGdkDevicePadGetGroupNModes func(uintptr, int) int = func(instance uintptr, GroupIdxVarp int) int { | 107 | + | XGdkDevicePadGetGroupNModes func(uintptr, int) int |
| 113 | - | core.LazyRegister(&xXGdkDevicePadGetGroupNModes, "GDK", "gdk_device_pad_get_group_n_modes", false) | 108 | + | XGdkDevicePadGetNFeatures func(uintptr, DevicePadFeature) int |
| 114 | - | return xXGdkDevicePadGetGroupNModes(instance, GroupIdxVarp) | 109 | + | XGdkDevicePadGetNGroups func(uintptr) int |
| 115 | - | } | |||
| 116 | ) | 110 | ) | ||
| 117 | - | var ( | |||
| 118 | - | xXGdkDevicePadGetGroupNModes func(uintptr, int) int | |||
| 119 | - | XGdkDevicePadGetNFeatures func(uintptr, DevicePadFeature) int = func(instance uintptr, FeatureVarp DevicePadFeature) int { | |||
| 120 | - | core.LazyRegister(&xXGdkDevicePadGetNFeatures, "GDK", "gdk_device_pad_get_n_features", false) | |||
| 121 | - | return xXGdkDevicePadGetNFeatures(instance, FeatureVarp) | |||
| 122 | - | } | |||
| 123 | - | ) | |||
| 124 | - | var ( | |||
| 125 | - | xXGdkDevicePadGetNFeatures func(uintptr, DevicePadFeature) int | |||
| 126 | - | XGdkDevicePadGetNGroups func(uintptr) int = func(instance uintptr) int { | |||
| 127 | - | core.LazyRegister(&xXGdkDevicePadGetNGroups, "GDK", "gdk_device_pad_get_n_groups", false) | |||
| 128 | - | return xXGdkDevicePadGetNGroups(instance) | |||
| 129 | - | } | |||
| 130 | - | ) | |||
| 131 | - | var xXGdkDevicePadGetNGroups func(uintptr) int | |||
| 132 | 111 | ||||
| 133 | // A pad feature. | 112 | // A pad feature. | ||
| 134 | type DevicePadFeature int | 113 | type DevicePadFeature int | ||
| @@ -136,7 +115,6 @@ type DevicePadFeature int | |||||
| 136 | var xDevicePadFeatureGLibType func() types.GType | 115 | var xDevicePadFeatureGLibType func() types.GType | ||
| 137 | 116 | ||||
| 138 | func DevicePadFeatureGLibType() types.GType { | 117 | func DevicePadFeatureGLibType() types.GType { | ||
| 139 | - | core.LazyRegister(&xDevicePadFeatureGLibType, "GDK", "gdk_device_pad_feature_get_type", false) | |||
| 140 | return xDevicePadFeatureGLibType() | 118 | return xDevicePadFeatureGLibType() | ||
| 141 | } | 119 | } | ||
| 142 | 120 | ||||
| @@ -153,4 +131,21 @@ const ( | |||||
| 153 | func init() { | 131 | func init() { | ||
| 154 | core.SetPackageName("GDK", "gtk4") | 132 | core.SetPackageName("GDK", "gtk4") | ||
| 155 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 133 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | ||
| 134 | + | var libs []uintptr | |||
| 135 | + | for _, libPath := range core.GetPaths("GDK") { | |||
| 136 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 137 | + | if err != nil { | |||
| 138 | + | panic(err) | |||
| 139 | + | } | |||
| 140 | + | libs = append(libs, lib) | |||
| 141 | + | } | |||
| 142 | + | ||||
| 143 | + | core.PuregoSafeRegister(&xDevicePadFeatureGLibType, libs, "gdk_device_pad_feature_get_type") | |||
| 144 | + | ||||
| 145 | + | core.PuregoSafeRegister(&xDevicePadGLibType, libs, "gdk_device_pad_get_type") | |||
| 146 | + | ||||
| 147 | + | core.PuregoSafeRegister(&XGdkDevicePadGetFeatureGroup, libs, "gdk_device_pad_get_feature_group") | |||
| 148 | + | core.PuregoSafeRegister(&XGdkDevicePadGetGroupNModes, libs, "gdk_device_pad_get_group_n_modes") | |||
| 149 | + | core.PuregoSafeRegister(&XGdkDevicePadGetNFeatures, libs, "gdk_device_pad_get_n_features") | |||
| 150 | + | core.PuregoSafeRegister(&XGdkDevicePadGetNGroups, libs, "gdk_device_pad_get_n_groups") | |||
| 156 | } | 151 | } | ||