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
| @@ -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/glib" | |
| 10 | 11 | "github.com/bnema/puregotk/v4/gobject" | |
| @@ -48,7 +49,6 @@ type SwipeTracker struct { | |||
| 48 | 49 | var xSwipeTrackerGLibType func() types.GType | |
| 49 | 50 | ||
| 50 | 51 | func SwipeTrackerGLibType() types.GType { | |
| 51 | - | core.LazyRegister(&xSwipeTrackerGLibType, "ADW", "adw_swipe_tracker_get_type", false) | |
| 52 | 52 | return xSwipeTrackerGLibType() | |
| 53 | 53 | } | |
| 54 | 54 | ||
| @@ -62,7 +62,6 @@ var xNewSwipeTracker func(uintptr) uintptr | |||
| 62 | 62 | ||
| 63 | 63 | // Creates a new `AdwSwipeTracker` for @widget. | |
| 64 | 64 | func NewSwipeTracker(SwipeableVar Swipeable) *SwipeTracker { | |
| 65 | - | core.LazyRegister(&xNewSwipeTracker, "ADW", "adw_swipe_tracker_new", false) | |
| 66 | 65 | var cls *SwipeTracker | |
| 67 | 66 | ||
| 68 | 67 | cret := xNewSwipeTracker(SwipeableVar.GoPointer()) | |
| @@ -79,8 +78,6 @@ var xSwipeTrackerGetAllowLongSwipes func(uintptr) bool | |||
| 79 | 78 | ||
| 80 | 79 | // Gets whether to allow swiping for more than one snap point at a time. | |
| 81 | 80 | func (x *SwipeTracker) GetAllowLongSwipes() bool { | |
| 82 | - | core.LazyRegister(&xSwipeTrackerGetAllowLongSwipes, "ADW", "adw_swipe_tracker_get_allow_long_swipes", false) | |
| 83 | - | ||
| 84 | 81 | cret := xSwipeTrackerGetAllowLongSwipes(x.GoPointer()) | |
| 85 | 82 | return cret | |
| 86 | 83 | } | |
| @@ -89,8 +86,6 @@ var xSwipeTrackerGetAllowMouseDrag func(uintptr) bool | |||
| 89 | 86 | ||
| 90 | 87 | // Gets whether @self can be dragged with mouse pointer. | |
| 91 | 88 | func (x *SwipeTracker) GetAllowMouseDrag() bool { | |
| 92 | - | core.LazyRegister(&xSwipeTrackerGetAllowMouseDrag, "ADW", "adw_swipe_tracker_get_allow_mouse_drag", false) | |
| 93 | - | ||
| 94 | 89 | cret := xSwipeTrackerGetAllowMouseDrag(x.GoPointer()) | |
| 95 | 90 | return cret | |
| 96 | 91 | } | |
| @@ -99,8 +94,6 @@ var xSwipeTrackerGetAllowWindowHandle func(uintptr) bool | |||
| 99 | 94 | ||
| 100 | 95 | // Gets whether to allow touchscreen swiping from `GtkWindowHandle`. | |
| 101 | 96 | func (x *SwipeTracker) GetAllowWindowHandle() bool { | |
| 102 | - | core.LazyRegister(&xSwipeTrackerGetAllowWindowHandle, "ADW", "adw_swipe_tracker_get_allow_window_handle", false) | |
| 103 | - | ||
| 104 | 97 | cret := xSwipeTrackerGetAllowWindowHandle(x.GoPointer()) | |
| 105 | 98 | return cret | |
| 106 | 99 | } | |
| @@ -109,8 +102,6 @@ var xSwipeTrackerGetEnabled func(uintptr) bool | |||
| 109 | 102 | ||
| 110 | 103 | // Gets whether @self is enabled. | |
| 111 | 104 | func (x *SwipeTracker) GetEnabled() bool { | |
| 112 | - | core.LazyRegister(&xSwipeTrackerGetEnabled, "ADW", "adw_swipe_tracker_get_enabled", false) | |
| 113 | - | ||
| 114 | 105 | cret := xSwipeTrackerGetEnabled(x.GoPointer()) | |
| 115 | 106 | return cret | |
| 116 | 107 | } | |
| @@ -119,8 +110,6 @@ var xSwipeTrackerGetLowerOvershoot func(uintptr) bool | |||
| 119 | 110 | ||
| 120 | 111 | // Gets whether to allow swiping past the first available snap point. | |
| 121 | 112 | func (x *SwipeTracker) GetLowerOvershoot() bool { | |
| 122 | - | core.LazyRegister(&xSwipeTrackerGetLowerOvershoot, "ADW", "adw_swipe_tracker_get_lower_overshoot", false) | |
| 123 | - | ||
| 124 | 113 | cret := xSwipeTrackerGetLowerOvershoot(x.GoPointer()) | |
| 125 | 114 | return cret | |
| 126 | 115 | } | |
| @@ -129,8 +118,6 @@ var xSwipeTrackerGetReversed func(uintptr) bool | |||
| 129 | 118 | ||
| 130 | 119 | // Gets whether @self is reversing the swipe direction. | |
| 131 | 120 | func (x *SwipeTracker) GetReversed() bool { | |
| 132 | - | core.LazyRegister(&xSwipeTrackerGetReversed, "ADW", "adw_swipe_tracker_get_reversed", false) | |
| 133 | - | ||
| 134 | 121 | cret := xSwipeTrackerGetReversed(x.GoPointer()) | |
| 135 | 122 | return cret | |
| 136 | 123 | } | |
| @@ -139,7 +126,6 @@ var xSwipeTrackerGetSwipeable func(uintptr) uintptr | |||
| 139 | 126 | ||
| 140 | 127 | // Get the widget @self is attached to. | |
| 141 | 128 | func (x *SwipeTracker) GetSwipeable() *SwipeableBase { | |
| 142 | - | core.LazyRegister(&xSwipeTrackerGetSwipeable, "ADW", "adw_swipe_tracker_get_swipeable", false) | |
| 143 | 129 | var cls *SwipeableBase | |
| 144 | 130 | ||
| 145 | 131 | cret := xSwipeTrackerGetSwipeable(x.GoPointer()) | |
| @@ -157,8 +143,6 @@ var xSwipeTrackerGetUpperOvershoot func(uintptr) bool | |||
| 157 | 143 | ||
| 158 | 144 | // Gets whether to allow swiping past the last available snap point. | |
| 159 | 145 | func (x *SwipeTracker) GetUpperOvershoot() bool { | |
| 160 | - | core.LazyRegister(&xSwipeTrackerGetUpperOvershoot, "ADW", "adw_swipe_tracker_get_upper_overshoot", false) | |
| 161 | - | ||
| 162 | 146 | cret := xSwipeTrackerGetUpperOvershoot(x.GoPointer()) | |
| 163 | 147 | return cret | |
| 164 | 148 | } | |
| @@ -170,8 +154,6 @@ var xSwipeTrackerSetAllowLongSwipes func(uintptr, bool) | |||
| 170 | 154 | // If the value is `FALSE`, each swipe can only move to the adjacent snap | |
| 171 | 155 | // points. | |
| 172 | 156 | func (x *SwipeTracker) SetAllowLongSwipes(AllowLongSwipesVar bool) { | |
| 173 | - | core.LazyRegister(&xSwipeTrackerSetAllowLongSwipes, "ADW", "adw_swipe_tracker_set_allow_long_swipes", false) | |
| 174 | - | ||
| 175 | 157 | xSwipeTrackerSetAllowLongSwipes(x.GoPointer(), AllowLongSwipesVar) | |
| 176 | 158 | } | |
| 177 | 159 | ||
| @@ -179,8 +161,6 @@ var xSwipeTrackerSetAllowMouseDrag func(uintptr, bool) | |||
| 179 | 161 | ||
| 180 | 162 | // Sets whether @self can be dragged with mouse pointer. | |
| 181 | 163 | func (x *SwipeTracker) SetAllowMouseDrag(AllowMouseDragVar bool) { | |
| 182 | - | core.LazyRegister(&xSwipeTrackerSetAllowMouseDrag, "ADW", "adw_swipe_tracker_set_allow_mouse_drag", false) | |
| 183 | - | ||
| 184 | 164 | xSwipeTrackerSetAllowMouseDrag(x.GoPointer(), AllowMouseDragVar) | |
| 185 | 165 | } | |
| 186 | 166 | ||
| @@ -190,8 +170,6 @@ var xSwipeTrackerSetAllowWindowHandle func(uintptr, bool) | |||
| 190 | 170 | // | |
| 191 | 171 | // Setting it to `TRUE` will make dragging the window impossible. | |
| 192 | 172 | func (x *SwipeTracker) SetAllowWindowHandle(AllowWindowHandleVar bool) { | |
| 193 | - | core.LazyRegister(&xSwipeTrackerSetAllowWindowHandle, "ADW", "adw_swipe_tracker_set_allow_window_handle", false) | |
| 194 | - | ||
| 195 | 173 | xSwipeTrackerSetAllowWindowHandle(x.GoPointer(), AllowWindowHandleVar) | |
| 196 | 174 | } | |
| 197 | 175 | ||
| @@ -202,8 +180,6 @@ var xSwipeTrackerSetEnabled func(uintptr, bool) | |||
| 202 | 180 | // When it's not enabled, no events will be processed. Usually widgets will want | |
| 203 | 181 | // to expose this via a property. | |
| 204 | 182 | func (x *SwipeTracker) SetEnabled(EnabledVar bool) { | |
| 205 | - | core.LazyRegister(&xSwipeTrackerSetEnabled, "ADW", "adw_swipe_tracker_set_enabled", false) | |
| 206 | - | ||
| 207 | 183 | xSwipeTrackerSetEnabled(x.GoPointer(), EnabledVar) | |
| 208 | 184 | } | |
| 209 | 185 | ||
| @@ -211,8 +187,6 @@ var xSwipeTrackerSetLowerOvershoot func(uintptr, bool) | |||
| 211 | 187 | ||
| 212 | 188 | // Sets whether to allow swiping past the first available snap point. | |
| 213 | 189 | func (x *SwipeTracker) SetLowerOvershoot(OvershootVar bool) { | |
| 214 | - | core.LazyRegister(&xSwipeTrackerSetLowerOvershoot, "ADW", "adw_swipe_tracker_set_lower_overshoot", false) | |
| 215 | - | ||
| 216 | 190 | xSwipeTrackerSetLowerOvershoot(x.GoPointer(), OvershootVar) | |
| 217 | 191 | } | |
| 218 | 192 | ||
| @@ -223,8 +197,6 @@ var xSwipeTrackerSetReversed func(uintptr, bool) | |||
| 223 | 197 | // If the swipe tracker is horizontal, it can be used for supporting RTL text | |
| 224 | 198 | // direction. | |
| 225 | 199 | func (x *SwipeTracker) SetReversed(ReversedVar bool) { | |
| 226 | - | core.LazyRegister(&xSwipeTrackerSetReversed, "ADW", "adw_swipe_tracker_set_reversed", false) | |
| 227 | - | ||
| 228 | 200 | xSwipeTrackerSetReversed(x.GoPointer(), ReversedVar) | |
| 229 | 201 | } | |
| 230 | 202 | ||
| @@ -232,8 +204,6 @@ var xSwipeTrackerSetUpperOvershoot func(uintptr, bool) | |||
| 232 | 204 | ||
| 233 | 205 | // Sets whether to allow swiping past the last available snap point. | |
| 234 | 206 | func (x *SwipeTracker) SetUpperOvershoot(OvershootVar bool) { | |
| 235 | - | core.LazyRegister(&xSwipeTrackerSetUpperOvershoot, "ADW", "adw_swipe_tracker_set_upper_overshoot", false) | |
| 236 | - | ||
| 237 | 207 | xSwipeTrackerSetUpperOvershoot(x.GoPointer(), OvershootVar) | |
| 238 | 208 | } | |
| 239 | 209 | ||
| @@ -244,8 +214,6 @@ var xSwipeTrackerShiftPosition func(uintptr, float64) | |||
| 244 | 214 | // This can be used to adjust the current position if snap points move during | |
| 245 | 215 | // the gesture. | |
| 246 | 216 | func (x *SwipeTracker) ShiftPosition(DeltaVar float64) { | |
| 247 | - | core.LazyRegister(&xSwipeTrackerShiftPosition, "ADW", "adw_swipe_tracker_shift_position", false) | |
| 248 | - | ||
| 249 | 217 | xSwipeTrackerShiftPosition(x.GoPointer(), DeltaVar) | |
| 250 | 218 | } | |
| 251 | 219 | ||
| @@ -516,4 +484,33 @@ func (x *SwipeTracker) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 516 | 484 | func init() { | |
| 517 | 485 | core.SetPackageName("ADW", "libadwaita-1") | |
| 518 | 486 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 487 | + | var libs []uintptr | |
| 488 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 489 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 490 | + | if err != nil { | |
| 491 | + | panic(err) | |
| 492 | + | } | |
| 493 | + | libs = append(libs, lib) | |
| 494 | + | } | |
| 495 | + | ||
| 496 | + | core.PuregoSafeRegister(&xSwipeTrackerGLibType, libs, "adw_swipe_tracker_get_type") | |
| 497 | + | ||
| 498 | + | core.PuregoSafeRegister(&xNewSwipeTracker, libs, "adw_swipe_tracker_new") | |
| 499 | + | ||
| 500 | + | core.PuregoSafeRegister(&xSwipeTrackerGetAllowLongSwipes, libs, "adw_swipe_tracker_get_allow_long_swipes") | |
| 501 | + | core.PuregoSafeRegister(&xSwipeTrackerGetAllowMouseDrag, libs, "adw_swipe_tracker_get_allow_mouse_drag") | |
| 502 | + | core.PuregoSafeRegister(&xSwipeTrackerGetAllowWindowHandle, libs, "adw_swipe_tracker_get_allow_window_handle") | |
| 503 | + | core.PuregoSafeRegister(&xSwipeTrackerGetEnabled, libs, "adw_swipe_tracker_get_enabled") | |
| 504 | + | core.PuregoSafeRegister(&xSwipeTrackerGetLowerOvershoot, libs, "adw_swipe_tracker_get_lower_overshoot") | |
| 505 | + | core.PuregoSafeRegister(&xSwipeTrackerGetReversed, libs, "adw_swipe_tracker_get_reversed") | |
| 506 | + | core.PuregoSafeRegister(&xSwipeTrackerGetSwipeable, libs, "adw_swipe_tracker_get_swipeable") | |
| 507 | + | core.PuregoSafeRegister(&xSwipeTrackerGetUpperOvershoot, libs, "adw_swipe_tracker_get_upper_overshoot") | |
| 508 | + | core.PuregoSafeRegister(&xSwipeTrackerSetAllowLongSwipes, libs, "adw_swipe_tracker_set_allow_long_swipes") | |
| 509 | + | core.PuregoSafeRegister(&xSwipeTrackerSetAllowMouseDrag, libs, "adw_swipe_tracker_set_allow_mouse_drag") | |
| 510 | + | core.PuregoSafeRegister(&xSwipeTrackerSetAllowWindowHandle, libs, "adw_swipe_tracker_set_allow_window_handle") | |
| 511 | + | core.PuregoSafeRegister(&xSwipeTrackerSetEnabled, libs, "adw_swipe_tracker_set_enabled") | |
| 512 | + | core.PuregoSafeRegister(&xSwipeTrackerSetLowerOvershoot, libs, "adw_swipe_tracker_set_lower_overshoot") | |
| 513 | + | core.PuregoSafeRegister(&xSwipeTrackerSetReversed, libs, "adw_swipe_tracker_set_reversed") | |
| 514 | + | core.PuregoSafeRegister(&xSwipeTrackerSetUpperOvershoot, libs, "adw_swipe_tracker_set_upper_overshoot") | |
| 515 | + | core.PuregoSafeRegister(&xSwipeTrackerShiftPosition, libs, "adw_swipe_tracker_shift_position") | |
| 519 | 516 | } | |
| @@ -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/glib" | 10 | "github.com/bnema/puregotk/v4/glib" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject" | 11 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -48,7 +49,6 @@ type SwipeTracker struct { | |||||
| 48 | var xSwipeTrackerGLibType func() types.GType | 49 | var xSwipeTrackerGLibType func() types.GType | ||
| 49 | 50 | ||||
| 50 | func SwipeTrackerGLibType() types.GType { | 51 | func SwipeTrackerGLibType() types.GType { | ||
| 51 | - | core.LazyRegister(&xSwipeTrackerGLibType, "ADW", "adw_swipe_tracker_get_type", false) | |||
| 52 | return xSwipeTrackerGLibType() | 52 | return xSwipeTrackerGLibType() | ||
| 53 | } | 53 | } | ||
| 54 | 54 | ||||
| @@ -62,7 +62,6 @@ var xNewSwipeTracker func(uintptr) uintptr | |||||
| 62 | 62 | ||||
| 63 | // Creates a new `AdwSwipeTracker` for @widget. | 63 | // Creates a new `AdwSwipeTracker` for @widget. | ||
| 64 | func NewSwipeTracker(SwipeableVar Swipeable) *SwipeTracker { | 64 | func NewSwipeTracker(SwipeableVar Swipeable) *SwipeTracker { | ||
| 65 | - | core.LazyRegister(&xNewSwipeTracker, "ADW", "adw_swipe_tracker_new", false) | |||
| 66 | var cls *SwipeTracker | 65 | var cls *SwipeTracker | ||
| 67 | 66 | ||||
| 68 | cret := xNewSwipeTracker(SwipeableVar.GoPointer()) | 67 | cret := xNewSwipeTracker(SwipeableVar.GoPointer()) | ||
| @@ -79,8 +78,6 @@ var xSwipeTrackerGetAllowLongSwipes func(uintptr) bool | |||||
| 79 | 78 | ||||
| 80 | // Gets whether to allow swiping for more than one snap point at a time. | 79 | // Gets whether to allow swiping for more than one snap point at a time. | ||
| 81 | func (x *SwipeTracker) GetAllowLongSwipes() bool { | 80 | func (x *SwipeTracker) GetAllowLongSwipes() bool { | ||
| 82 | - | core.LazyRegister(&xSwipeTrackerGetAllowLongSwipes, "ADW", "adw_swipe_tracker_get_allow_long_swipes", false) | |||
| 83 | - | ||||
| 84 | cret := xSwipeTrackerGetAllowLongSwipes(x.GoPointer()) | 81 | cret := xSwipeTrackerGetAllowLongSwipes(x.GoPointer()) | ||
| 85 | return cret | 82 | return cret | ||
| 86 | } | 83 | } | ||
| @@ -89,8 +86,6 @@ var xSwipeTrackerGetAllowMouseDrag func(uintptr) bool | |||||
| 89 | 86 | ||||
| 90 | // Gets whether @self can be dragged with mouse pointer. | 87 | // Gets whether @self can be dragged with mouse pointer. | ||
| 91 | func (x *SwipeTracker) GetAllowMouseDrag() bool { | 88 | func (x *SwipeTracker) GetAllowMouseDrag() bool { | ||
| 92 | - | core.LazyRegister(&xSwipeTrackerGetAllowMouseDrag, "ADW", "adw_swipe_tracker_get_allow_mouse_drag", false) | |||
| 93 | - | ||||
| 94 | cret := xSwipeTrackerGetAllowMouseDrag(x.GoPointer()) | 89 | cret := xSwipeTrackerGetAllowMouseDrag(x.GoPointer()) | ||
| 95 | return cret | 90 | return cret | ||
| 96 | } | 91 | } | ||
| @@ -99,8 +94,6 @@ var xSwipeTrackerGetAllowWindowHandle func(uintptr) bool | |||||
| 99 | 94 | ||||
| 100 | // Gets whether to allow touchscreen swiping from `GtkWindowHandle`. | 95 | // Gets whether to allow touchscreen swiping from `GtkWindowHandle`. | ||
| 101 | func (x *SwipeTracker) GetAllowWindowHandle() bool { | 96 | func (x *SwipeTracker) GetAllowWindowHandle() bool { | ||
| 102 | - | core.LazyRegister(&xSwipeTrackerGetAllowWindowHandle, "ADW", "adw_swipe_tracker_get_allow_window_handle", false) | |||
| 103 | - | ||||
| 104 | cret := xSwipeTrackerGetAllowWindowHandle(x.GoPointer()) | 97 | cret := xSwipeTrackerGetAllowWindowHandle(x.GoPointer()) | ||
| 105 | return cret | 98 | return cret | ||
| 106 | } | 99 | } | ||
| @@ -109,8 +102,6 @@ var xSwipeTrackerGetEnabled func(uintptr) bool | |||||
| 109 | 102 | ||||
| 110 | // Gets whether @self is enabled. | 103 | // Gets whether @self is enabled. | ||
| 111 | func (x *SwipeTracker) GetEnabled() bool { | 104 | func (x *SwipeTracker) GetEnabled() bool { | ||
| 112 | - | core.LazyRegister(&xSwipeTrackerGetEnabled, "ADW", "adw_swipe_tracker_get_enabled", false) | |||
| 113 | - | ||||
| 114 | cret := xSwipeTrackerGetEnabled(x.GoPointer()) | 105 | cret := xSwipeTrackerGetEnabled(x.GoPointer()) | ||
| 115 | return cret | 106 | return cret | ||
| 116 | } | 107 | } | ||
| @@ -119,8 +110,6 @@ var xSwipeTrackerGetLowerOvershoot func(uintptr) bool | |||||
| 119 | 110 | ||||
| 120 | // Gets whether to allow swiping past the first available snap point. | 111 | // Gets whether to allow swiping past the first available snap point. | ||
| 121 | func (x *SwipeTracker) GetLowerOvershoot() bool { | 112 | func (x *SwipeTracker) GetLowerOvershoot() bool { | ||
| 122 | - | core.LazyRegister(&xSwipeTrackerGetLowerOvershoot, "ADW", "adw_swipe_tracker_get_lower_overshoot", false) | |||
| 123 | - | ||||
| 124 | cret := xSwipeTrackerGetLowerOvershoot(x.GoPointer()) | 113 | cret := xSwipeTrackerGetLowerOvershoot(x.GoPointer()) | ||
| 125 | return cret | 114 | return cret | ||
| 126 | } | 115 | } | ||
| @@ -129,8 +118,6 @@ var xSwipeTrackerGetReversed func(uintptr) bool | |||||
| 129 | 118 | ||||
| 130 | // Gets whether @self is reversing the swipe direction. | 119 | // Gets whether @self is reversing the swipe direction. | ||
| 131 | func (x *SwipeTracker) GetReversed() bool { | 120 | func (x *SwipeTracker) GetReversed() bool { | ||
| 132 | - | core.LazyRegister(&xSwipeTrackerGetReversed, "ADW", "adw_swipe_tracker_get_reversed", false) | |||
| 133 | - | ||||
| 134 | cret := xSwipeTrackerGetReversed(x.GoPointer()) | 121 | cret := xSwipeTrackerGetReversed(x.GoPointer()) | ||
| 135 | return cret | 122 | return cret | ||
| 136 | } | 123 | } | ||
| @@ -139,7 +126,6 @@ var xSwipeTrackerGetSwipeable func(uintptr) uintptr | |||||
| 139 | 126 | ||||
| 140 | // Get the widget @self is attached to. | 127 | // Get the widget @self is attached to. | ||
| 141 | func (x *SwipeTracker) GetSwipeable() *SwipeableBase { | 128 | func (x *SwipeTracker) GetSwipeable() *SwipeableBase { | ||
| 142 | - | core.LazyRegister(&xSwipeTrackerGetSwipeable, "ADW", "adw_swipe_tracker_get_swipeable", false) | |||
| 143 | var cls *SwipeableBase | 129 | var cls *SwipeableBase | ||
| 144 | 130 | ||||
| 145 | cret := xSwipeTrackerGetSwipeable(x.GoPointer()) | 131 | cret := xSwipeTrackerGetSwipeable(x.GoPointer()) | ||
| @@ -157,8 +143,6 @@ var xSwipeTrackerGetUpperOvershoot func(uintptr) bool | |||||
| 157 | 143 | ||||
| 158 | // Gets whether to allow swiping past the last available snap point. | 144 | // Gets whether to allow swiping past the last available snap point. | ||
| 159 | func (x *SwipeTracker) GetUpperOvershoot() bool { | 145 | func (x *SwipeTracker) GetUpperOvershoot() bool { | ||
| 160 | - | core.LazyRegister(&xSwipeTrackerGetUpperOvershoot, "ADW", "adw_swipe_tracker_get_upper_overshoot", false) | |||
| 161 | - | ||||
| 162 | cret := xSwipeTrackerGetUpperOvershoot(x.GoPointer()) | 146 | cret := xSwipeTrackerGetUpperOvershoot(x.GoPointer()) | ||
| 163 | return cret | 147 | return cret | ||
| 164 | } | 148 | } | ||
| @@ -170,8 +154,6 @@ var xSwipeTrackerSetAllowLongSwipes func(uintptr, bool) | |||||
| 170 | // If the value is `FALSE`, each swipe can only move to the adjacent snap | 154 | // If the value is `FALSE`, each swipe can only move to the adjacent snap | ||
| 171 | // points. | 155 | // points. | ||
| 172 | func (x *SwipeTracker) SetAllowLongSwipes(AllowLongSwipesVar bool) { | 156 | func (x *SwipeTracker) SetAllowLongSwipes(AllowLongSwipesVar bool) { | ||
| 173 | - | core.LazyRegister(&xSwipeTrackerSetAllowLongSwipes, "ADW", "adw_swipe_tracker_set_allow_long_swipes", false) | |||
| 174 | - | ||||
| 175 | xSwipeTrackerSetAllowLongSwipes(x.GoPointer(), AllowLongSwipesVar) | 157 | xSwipeTrackerSetAllowLongSwipes(x.GoPointer(), AllowLongSwipesVar) | ||
| 176 | } | 158 | } | ||
| 177 | 159 | ||||
| @@ -179,8 +161,6 @@ var xSwipeTrackerSetAllowMouseDrag func(uintptr, bool) | |||||
| 179 | 161 | ||||
| 180 | // Sets whether @self can be dragged with mouse pointer. | 162 | // Sets whether @self can be dragged with mouse pointer. | ||
| 181 | func (x *SwipeTracker) SetAllowMouseDrag(AllowMouseDragVar bool) { | 163 | func (x *SwipeTracker) SetAllowMouseDrag(AllowMouseDragVar bool) { | ||
| 182 | - | core.LazyRegister(&xSwipeTrackerSetAllowMouseDrag, "ADW", "adw_swipe_tracker_set_allow_mouse_drag", false) | |||
| 183 | - | ||||
| 184 | xSwipeTrackerSetAllowMouseDrag(x.GoPointer(), AllowMouseDragVar) | 164 | xSwipeTrackerSetAllowMouseDrag(x.GoPointer(), AllowMouseDragVar) | ||
| 185 | } | 165 | } | ||
| 186 | 166 | ||||
| @@ -190,8 +170,6 @@ var xSwipeTrackerSetAllowWindowHandle func(uintptr, bool) | |||||
| 190 | // | 170 | // | ||
| 191 | // Setting it to `TRUE` will make dragging the window impossible. | 171 | // Setting it to `TRUE` will make dragging the window impossible. | ||
| 192 | func (x *SwipeTracker) SetAllowWindowHandle(AllowWindowHandleVar bool) { | 172 | func (x *SwipeTracker) SetAllowWindowHandle(AllowWindowHandleVar bool) { | ||
| 193 | - | core.LazyRegister(&xSwipeTrackerSetAllowWindowHandle, "ADW", "adw_swipe_tracker_set_allow_window_handle", false) | |||
| 194 | - | ||||
| 195 | xSwipeTrackerSetAllowWindowHandle(x.GoPointer(), AllowWindowHandleVar) | 173 | xSwipeTrackerSetAllowWindowHandle(x.GoPointer(), AllowWindowHandleVar) | ||
| 196 | } | 174 | } | ||
| 197 | 175 | ||||
| @@ -202,8 +180,6 @@ var xSwipeTrackerSetEnabled func(uintptr, bool) | |||||
| 202 | // When it's not enabled, no events will be processed. Usually widgets will want | 180 | // When it's not enabled, no events will be processed. Usually widgets will want | ||
| 203 | // to expose this via a property. | 181 | // to expose this via a property. | ||
| 204 | func (x *SwipeTracker) SetEnabled(EnabledVar bool) { | 182 | func (x *SwipeTracker) SetEnabled(EnabledVar bool) { | ||
| 205 | - | core.LazyRegister(&xSwipeTrackerSetEnabled, "ADW", "adw_swipe_tracker_set_enabled", false) | |||
| 206 | - | ||||
| 207 | xSwipeTrackerSetEnabled(x.GoPointer(), EnabledVar) | 183 | xSwipeTrackerSetEnabled(x.GoPointer(), EnabledVar) | ||
| 208 | } | 184 | } | ||
| 209 | 185 | ||||
| @@ -211,8 +187,6 @@ var xSwipeTrackerSetLowerOvershoot func(uintptr, bool) | |||||
| 211 | 187 | ||||
| 212 | // Sets whether to allow swiping past the first available snap point. | 188 | // Sets whether to allow swiping past the first available snap point. | ||
| 213 | func (x *SwipeTracker) SetLowerOvershoot(OvershootVar bool) { | 189 | func (x *SwipeTracker) SetLowerOvershoot(OvershootVar bool) { | ||
| 214 | - | core.LazyRegister(&xSwipeTrackerSetLowerOvershoot, "ADW", "adw_swipe_tracker_set_lower_overshoot", false) | |||
| 215 | - | ||||
| 216 | xSwipeTrackerSetLowerOvershoot(x.GoPointer(), OvershootVar) | 190 | xSwipeTrackerSetLowerOvershoot(x.GoPointer(), OvershootVar) | ||
| 217 | } | 191 | } | ||
| 218 | 192 | ||||
| @@ -223,8 +197,6 @@ var xSwipeTrackerSetReversed func(uintptr, bool) | |||||
| 223 | // If the swipe tracker is horizontal, it can be used for supporting RTL text | 197 | // If the swipe tracker is horizontal, it can be used for supporting RTL text | ||
| 224 | // direction. | 198 | // direction. | ||
| 225 | func (x *SwipeTracker) SetReversed(ReversedVar bool) { | 199 | func (x *SwipeTracker) SetReversed(ReversedVar bool) { | ||
| 226 | - | core.LazyRegister(&xSwipeTrackerSetReversed, "ADW", "adw_swipe_tracker_set_reversed", false) | |||
| 227 | - | ||||
| 228 | xSwipeTrackerSetReversed(x.GoPointer(), ReversedVar) | 200 | xSwipeTrackerSetReversed(x.GoPointer(), ReversedVar) | ||
| 229 | } | 201 | } | ||
| 230 | 202 | ||||
| @@ -232,8 +204,6 @@ var xSwipeTrackerSetUpperOvershoot func(uintptr, bool) | |||||
| 232 | 204 | ||||
| 233 | // Sets whether to allow swiping past the last available snap point. | 205 | // Sets whether to allow swiping past the last available snap point. | ||
| 234 | func (x *SwipeTracker) SetUpperOvershoot(OvershootVar bool) { | 206 | func (x *SwipeTracker) SetUpperOvershoot(OvershootVar bool) { | ||
| 235 | - | core.LazyRegister(&xSwipeTrackerSetUpperOvershoot, "ADW", "adw_swipe_tracker_set_upper_overshoot", false) | |||
| 236 | - | ||||
| 237 | xSwipeTrackerSetUpperOvershoot(x.GoPointer(), OvershootVar) | 207 | xSwipeTrackerSetUpperOvershoot(x.GoPointer(), OvershootVar) | ||
| 238 | } | 208 | } | ||
| 239 | 209 | ||||
| @@ -244,8 +214,6 @@ var xSwipeTrackerShiftPosition func(uintptr, float64) | |||||
| 244 | // This can be used to adjust the current position if snap points move during | 214 | // This can be used to adjust the current position if snap points move during | ||
| 245 | // the gesture. | 215 | // the gesture. | ||
| 246 | func (x *SwipeTracker) ShiftPosition(DeltaVar float64) { | 216 | func (x *SwipeTracker) ShiftPosition(DeltaVar float64) { | ||
| 247 | - | core.LazyRegister(&xSwipeTrackerShiftPosition, "ADW", "adw_swipe_tracker_shift_position", false) | |||
| 248 | - | ||||
| 249 | xSwipeTrackerShiftPosition(x.GoPointer(), DeltaVar) | 217 | xSwipeTrackerShiftPosition(x.GoPointer(), DeltaVar) | ||
| 250 | } | 218 | } | ||
| 251 | 219 | ||||
| @@ -516,4 +484,33 @@ func (x *SwipeTracker) SetOrientation(OrientationVar gtk.Orientation) { | |||||
| 516 | func init() { | 484 | func init() { | ||
| 517 | core.SetPackageName("ADW", "libadwaita-1") | 485 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 518 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 486 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 487 | + | var libs []uintptr | |||
| 488 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 489 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 490 | + | if err != nil { | |||
| 491 | + | panic(err) | |||
| 492 | + | } | |||
| 493 | + | libs = append(libs, lib) | |||
| 494 | + | } | |||
| 495 | + | ||||
| 496 | + | core.PuregoSafeRegister(&xSwipeTrackerGLibType, libs, "adw_swipe_tracker_get_type") | |||
| 497 | + | ||||
| 498 | + | core.PuregoSafeRegister(&xNewSwipeTracker, libs, "adw_swipe_tracker_new") | |||
| 499 | + | ||||
| 500 | + | core.PuregoSafeRegister(&xSwipeTrackerGetAllowLongSwipes, libs, "adw_swipe_tracker_get_allow_long_swipes") | |||
| 501 | + | core.PuregoSafeRegister(&xSwipeTrackerGetAllowMouseDrag, libs, "adw_swipe_tracker_get_allow_mouse_drag") | |||
| 502 | + | core.PuregoSafeRegister(&xSwipeTrackerGetAllowWindowHandle, libs, "adw_swipe_tracker_get_allow_window_handle") | |||
| 503 | + | core.PuregoSafeRegister(&xSwipeTrackerGetEnabled, libs, "adw_swipe_tracker_get_enabled") | |||
| 504 | + | core.PuregoSafeRegister(&xSwipeTrackerGetLowerOvershoot, libs, "adw_swipe_tracker_get_lower_overshoot") | |||
| 505 | + | core.PuregoSafeRegister(&xSwipeTrackerGetReversed, libs, "adw_swipe_tracker_get_reversed") | |||
| 506 | + | core.PuregoSafeRegister(&xSwipeTrackerGetSwipeable, libs, "adw_swipe_tracker_get_swipeable") | |||
| 507 | + | core.PuregoSafeRegister(&xSwipeTrackerGetUpperOvershoot, libs, "adw_swipe_tracker_get_upper_overshoot") | |||
| 508 | + | core.PuregoSafeRegister(&xSwipeTrackerSetAllowLongSwipes, libs, "adw_swipe_tracker_set_allow_long_swipes") | |||
| 509 | + | core.PuregoSafeRegister(&xSwipeTrackerSetAllowMouseDrag, libs, "adw_swipe_tracker_set_allow_mouse_drag") | |||
| 510 | + | core.PuregoSafeRegister(&xSwipeTrackerSetAllowWindowHandle, libs, "adw_swipe_tracker_set_allow_window_handle") | |||
| 511 | + | core.PuregoSafeRegister(&xSwipeTrackerSetEnabled, libs, "adw_swipe_tracker_set_enabled") | |||
| 512 | + | core.PuregoSafeRegister(&xSwipeTrackerSetLowerOvershoot, libs, "adw_swipe_tracker_set_lower_overshoot") | |||
| 513 | + | core.PuregoSafeRegister(&xSwipeTrackerSetReversed, libs, "adw_swipe_tracker_set_reversed") | |||
| 514 | + | core.PuregoSafeRegister(&xSwipeTrackerSetUpperOvershoot, libs, "adw_swipe_tracker_set_upper_overshoot") | |||
| 515 | + | core.PuregoSafeRegister(&xSwipeTrackerShiftPosition, libs, "adw_swipe_tracker_shift_position") | |||
| 519 | } | 516 | } | ||