Merge pull request #350 from bnema/fix/repin-fixed-puregotk
fix(deps): validate puregotk lazy registration fix
907 files · +27874 -25296
M go.mod +3 -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.0 | |
| 14 | + | github.com/bnema/puregotk v0.7.1-0.20260714200603-7370c78950ef | |
| 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 | |
| @@ -47,6 +47,7 @@ require ( | |||
| 47 | 47 | github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect | |
| 48 | 48 | github.com/fatih/color v1.19.0 // indirect | |
| 49 | 49 | github.com/go-viper/mapstructure/v2 v2.5.0 // indirect | |
| 50 | + | github.com/google/go-cmp v0.7.0 // indirect | |
| 50 | 51 | github.com/inconshreveable/mousetrap v1.1.0 // indirect | |
| 51 | 52 | github.com/lucasb-eyer/go-colorful v1.4.0 // indirect | |
| 52 | 53 | github.com/mattn/go-colorable v0.1.14 // indirect | |
| @@ -80,6 +81,7 @@ require ( | |||
| 80 | 81 | golang.org/x/text v0.40.0 // indirect | |
| 81 | 82 | golang.org/x/tools v0.47.0 // indirect | |
| 82 | 83 | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | |
| 84 | + | mvdan.cc/gofumpt v0.9.2 // indirect | |
| 83 | 85 | ) | |
| 84 | 86 | ||
| 85 | 87 | tool github.com/a-h/templ/cmd/templ | |
| @@ -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.0 | 14 | + | github.com/bnema/puregotk v0.7.1-0.20260714200603-7370c78950ef |
| 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 | ||
| @@ -47,6 +47,7 @@ require ( | |||||
| 47 | github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect | 47 | github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect | ||
| 48 | github.com/fatih/color v1.19.0 // indirect | 48 | github.com/fatih/color v1.19.0 // indirect | ||
| 49 | github.com/go-viper/mapstructure/v2 v2.5.0 // indirect | 49 | github.com/go-viper/mapstructure/v2 v2.5.0 // indirect | ||
| 50 | + | github.com/google/go-cmp v0.7.0 // indirect | |||
| 50 | github.com/inconshreveable/mousetrap v1.1.0 // indirect | 51 | github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||
| 51 | github.com/lucasb-eyer/go-colorful v1.4.0 // indirect | 52 | github.com/lucasb-eyer/go-colorful v1.4.0 // indirect | ||
| 52 | github.com/mattn/go-colorable v0.1.14 // indirect | 53 | github.com/mattn/go-colorable v0.1.14 // indirect | ||
| @@ -80,6 +81,7 @@ require ( | |||||
| 80 | golang.org/x/text v0.40.0 // indirect | 81 | golang.org/x/text v0.40.0 // indirect | ||
| 81 | golang.org/x/tools v0.47.0 // indirect | 82 | golang.org/x/tools v0.47.0 // indirect | ||
| 82 | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | 83 | gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | ||
| 84 | + | mvdan.cc/gofumpt v0.9.2 // indirect | |||
| 83 | ) | 85 | ) | ||
| 84 | 86 | ||||
| 85 | tool github.com/a-h/templ/cmd/templ | 87 | tool github.com/a-h/templ/cmd/templ | ||
M go.sum +4 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +197 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +10 -0 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +99 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +95 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +7 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +33 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +66 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +10 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +4 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +3 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +22 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +23 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +47 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +10 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +33 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +47 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +14 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +17 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +34 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +45 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +13 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +40 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +61 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +18 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +7 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +69 -56 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +5 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +5 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +63 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +17 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +10 -1 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +36 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +60 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +48 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +24 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +38 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +18 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +31 -29 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +4 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +8 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +24 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +41 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +40 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +2 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +39 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +34 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +17 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +49 -44 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +20 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +25 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +33 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +33 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +6 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +35 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +5 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +45 -37 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +123 -87 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +30 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +41 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +64 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +40 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +7 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +78 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +9 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +15 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +19 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +10 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +10 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +14 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +66 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +57 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +36 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +10 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +3 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +20 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +34 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +12 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +28 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +23 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +26 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +12 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +36 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +27 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +10 -18
| @@ -2,7 +2,6 @@ | |||
| 2 | 2 | package gdk | |
| 3 | 3 | ||
| 4 | 4 | import ( | |
| 5 | - | "github.com/bnema/purego" | |
| 6 | 5 | "github.com/bnema/puregotk/pkg/core" | |
| 7 | 6 | "github.com/bnema/puregotk/v4/gobject" | |
| 8 | 7 | "github.com/bnema/puregotk/v4/gobject/types" | |
| @@ -15,6 +14,7 @@ type DeviceToolType int | |||
| 15 | 14 | var xDeviceToolTypeGLibType func() types.GType | |
| 16 | 15 | ||
| 17 | 16 | func DeviceToolTypeGLibType() types.GType { | |
| 17 | + | core.LazyRegister(&xDeviceToolTypeGLibType, "GDK", "gdk_device_tool_type_get_type", false) | |
| 18 | 18 | return xDeviceToolTypeGLibType() | |
| 19 | 19 | } | |
| 20 | 20 | ||
| @@ -46,6 +46,7 @@ type DeviceTool struct { | |||
| 46 | 46 | var xDeviceToolGLibType func() types.GType | |
| 47 | 47 | ||
| 48 | 48 | func DeviceToolGLibType() types.GType { | |
| 49 | + | core.LazyRegister(&xDeviceToolGLibType, "GDK", "gdk_device_tool_get_type", false) | |
| 49 | 50 | return xDeviceToolGLibType() | |
| 50 | 51 | } | |
| 51 | 52 | ||
| @@ -59,6 +60,8 @@ var xDeviceToolGetAxes func(uintptr) AxisFlags | |||
| 59 | 60 | ||
| 60 | 61 | // Gets the axes of the tool. | |
| 61 | 62 | func (x *DeviceTool) GetAxes() AxisFlags { | |
| 63 | + | core.LazyRegister(&xDeviceToolGetAxes, "GDK", "gdk_device_tool_get_axes", false) | |
| 64 | + | ||
| 62 | 65 | cret := xDeviceToolGetAxes(x.GoPointer()) | |
| 63 | 66 | return cret | |
| 64 | 67 | } | |
| @@ -77,6 +80,8 @@ var xDeviceToolGetHardwareId func(uintptr) uint64 | |||
| 77 | 80 | // as a tablet may support multiple devices with the same | |
| 78 | 81 | // `GdkDeviceToolType`, but different hardware identifiers. | |
| 79 | 82 | func (x *DeviceTool) GetHardwareId() uint64 { | |
| 83 | + | core.LazyRegister(&xDeviceToolGetHardwareId, "GDK", "gdk_device_tool_get_hardware_id", false) | |
| 84 | + | ||
| 80 | 85 | cret := xDeviceToolGetHardwareId(x.GoPointer()) | |
| 81 | 86 | return cret | |
| 82 | 87 | } | |
| @@ -88,6 +93,8 @@ var xDeviceToolGetSerial func(uintptr) uint64 | |||
| 88 | 93 | // This value can be used to identify a physical tool | |
| 89 | 94 | // (eg. a tablet pen) across program executions. | |
| 90 | 95 | func (x *DeviceTool) GetSerial() uint64 { | |
| 96 | + | core.LazyRegister(&xDeviceToolGetSerial, "GDK", "gdk_device_tool_get_serial", false) | |
| 97 | + | ||
| 91 | 98 | cret := xDeviceToolGetSerial(x.GoPointer()) | |
| 92 | 99 | return cret | |
| 93 | 100 | } | |
| @@ -96,6 +103,8 @@ var xDeviceToolGetToolType func(uintptr) DeviceToolType | |||
| 96 | 103 | ||
| 97 | 104 | // Gets the `GdkDeviceToolType` of the tool. | |
| 98 | 105 | func (x *DeviceTool) GetToolType() DeviceToolType { | |
| 106 | + | core.LazyRegister(&xDeviceToolGetToolType, "GDK", "gdk_device_tool_get_tool_type", false) | |
| 107 | + | ||
| 99 | 108 | cret := xDeviceToolGetToolType(x.GoPointer()) | |
| 100 | 109 | return cret | |
| 101 | 110 | } | |
| @@ -148,21 +157,4 @@ func (x *DeviceTool) GetPropertySerial() uint64 { | |||
| 148 | 157 | func init() { | |
| 149 | 158 | core.SetPackageName("GDK", "gtk4") | |
| 150 | 159 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | |
| 151 | - | var libs []uintptr | |
| 152 | - | for _, libPath := range core.GetPaths("GDK") { | |
| 153 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 154 | - | if err != nil { | |
| 155 | - | panic(err) | |
| 156 | - | } | |
| 157 | - | libs = append(libs, lib) | |
| 158 | - | } | |
| 159 | - | ||
| 160 | - | core.PuregoSafeRegister(&xDeviceToolTypeGLibType, libs, "gdk_device_tool_type_get_type") | |
| 161 | - | ||
| 162 | - | core.PuregoSafeRegister(&xDeviceToolGLibType, libs, "gdk_device_tool_get_type") | |
| 163 | - | ||
| 164 | - | core.PuregoSafeRegister(&xDeviceToolGetAxes, libs, "gdk_device_tool_get_axes") | |
| 165 | - | core.PuregoSafeRegister(&xDeviceToolGetHardwareId, libs, "gdk_device_tool_get_hardware_id") | |
| 166 | - | core.PuregoSafeRegister(&xDeviceToolGetSerial, libs, "gdk_device_tool_get_serial") | |
| 167 | - | core.PuregoSafeRegister(&xDeviceToolGetToolType, libs, "gdk_device_tool_get_tool_type") | |
| 168 | 160 | } | |
| @@ -2,7 +2,6 @@ | |||||
| 2 | package gdk | 2 | package gdk | ||
| 3 | 3 | ||||
| 4 | import ( | 4 | import ( | ||
| 5 | - | "github.com/bnema/purego" | |||
| 6 | "github.com/bnema/puregotk/pkg/core" | 5 | "github.com/bnema/puregotk/pkg/core" | ||
| 7 | "github.com/bnema/puregotk/v4/gobject" | 6 | "github.com/bnema/puregotk/v4/gobject" | ||
| 8 | "github.com/bnema/puregotk/v4/gobject/types" | 7 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| @@ -15,6 +14,7 @@ type DeviceToolType int | |||||
| 15 | var xDeviceToolTypeGLibType func() types.GType | 14 | var xDeviceToolTypeGLibType func() types.GType | ||
| 16 | 15 | ||||
| 17 | func DeviceToolTypeGLibType() types.GType { | 16 | func DeviceToolTypeGLibType() types.GType { | ||
| 17 | + | core.LazyRegister(&xDeviceToolTypeGLibType, "GDK", "gdk_device_tool_type_get_type", false) | |||
| 18 | return xDeviceToolTypeGLibType() | 18 | return xDeviceToolTypeGLibType() | ||
| 19 | } | 19 | } | ||
| 20 | 20 | ||||
| @@ -46,6 +46,7 @@ type DeviceTool struct { | |||||
| 46 | var xDeviceToolGLibType func() types.GType | 46 | var xDeviceToolGLibType func() types.GType | ||
| 47 | 47 | ||||
| 48 | func DeviceToolGLibType() types.GType { | 48 | func DeviceToolGLibType() types.GType { | ||
| 49 | + | core.LazyRegister(&xDeviceToolGLibType, "GDK", "gdk_device_tool_get_type", false) | |||
| 49 | return xDeviceToolGLibType() | 50 | return xDeviceToolGLibType() | ||
| 50 | } | 51 | } | ||
| 51 | 52 | ||||
| @@ -59,6 +60,8 @@ var xDeviceToolGetAxes func(uintptr) AxisFlags | |||||
| 59 | 60 | ||||
| 60 | // Gets the axes of the tool. | 61 | // Gets the axes of the tool. | ||
| 61 | func (x *DeviceTool) GetAxes() AxisFlags { | 62 | func (x *DeviceTool) GetAxes() AxisFlags { | ||
| 63 | + | core.LazyRegister(&xDeviceToolGetAxes, "GDK", "gdk_device_tool_get_axes", false) | |||
| 64 | + | ||||
| 62 | cret := xDeviceToolGetAxes(x.GoPointer()) | 65 | cret := xDeviceToolGetAxes(x.GoPointer()) | ||
| 63 | return cret | 66 | return cret | ||
| 64 | } | 67 | } | ||
| @@ -77,6 +80,8 @@ var xDeviceToolGetHardwareId func(uintptr) uint64 | |||||
| 77 | // as a tablet may support multiple devices with the same | 80 | // as a tablet may support multiple devices with the same | ||
| 78 | // `GdkDeviceToolType`, but different hardware identifiers. | 81 | // `GdkDeviceToolType`, but different hardware identifiers. | ||
| 79 | func (x *DeviceTool) GetHardwareId() uint64 { | 82 | func (x *DeviceTool) GetHardwareId() uint64 { | ||
| 83 | + | core.LazyRegister(&xDeviceToolGetHardwareId, "GDK", "gdk_device_tool_get_hardware_id", false) | |||
| 84 | + | ||||
| 80 | cret := xDeviceToolGetHardwareId(x.GoPointer()) | 85 | cret := xDeviceToolGetHardwareId(x.GoPointer()) | ||
| 81 | return cret | 86 | return cret | ||
| 82 | } | 87 | } | ||
| @@ -88,6 +93,8 @@ var xDeviceToolGetSerial func(uintptr) uint64 | |||||
| 88 | // This value can be used to identify a physical tool | 93 | // This value can be used to identify a physical tool | ||
| 89 | // (eg. a tablet pen) across program executions. | 94 | // (eg. a tablet pen) across program executions. | ||
| 90 | func (x *DeviceTool) GetSerial() uint64 { | 95 | func (x *DeviceTool) GetSerial() uint64 { | ||
| 96 | + | core.LazyRegister(&xDeviceToolGetSerial, "GDK", "gdk_device_tool_get_serial", false) | |||
| 97 | + | ||||
| 91 | cret := xDeviceToolGetSerial(x.GoPointer()) | 98 | cret := xDeviceToolGetSerial(x.GoPointer()) | ||
| 92 | return cret | 99 | return cret | ||
| 93 | } | 100 | } | ||
| @@ -96,6 +103,8 @@ var xDeviceToolGetToolType func(uintptr) DeviceToolType | |||||
| 96 | 103 | ||||
| 97 | // Gets the `GdkDeviceToolType` of the tool. | 104 | // Gets the `GdkDeviceToolType` of the tool. | ||
| 98 | func (x *DeviceTool) GetToolType() DeviceToolType { | 105 | func (x *DeviceTool) GetToolType() DeviceToolType { | ||
| 106 | + | core.LazyRegister(&xDeviceToolGetToolType, "GDK", "gdk_device_tool_get_tool_type", false) | |||
| 107 | + | ||||
| 99 | cret := xDeviceToolGetToolType(x.GoPointer()) | 108 | cret := xDeviceToolGetToolType(x.GoPointer()) | ||
| 100 | return cret | 109 | return cret | ||
| 101 | } | 110 | } | ||
| @@ -148,21 +157,4 @@ func (x *DeviceTool) GetPropertySerial() uint64 { | |||||
| 148 | func init() { | 157 | func init() { | ||
| 149 | core.SetPackageName("GDK", "gtk4") | 158 | core.SetPackageName("GDK", "gtk4") | ||
| 150 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 159 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | ||
| 151 | - | var libs []uintptr | |||
| 152 | - | for _, libPath := range core.GetPaths("GDK") { | |||
| 153 | - | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 154 | - | if err != nil { | |||
| 155 | - | panic(err) | |||
| 156 | - | } | |||
| 157 | - | libs = append(libs, lib) | |||
| 158 | - | } | |||
| 159 | - | ||||
| 160 | - | core.PuregoSafeRegister(&xDeviceToolTypeGLibType, libs, "gdk_device_tool_type_get_type") | |||
| 161 | - | ||||
| 162 | - | core.PuregoSafeRegister(&xDeviceToolGLibType, libs, "gdk_device_tool_get_type") | |||
| 163 | - | ||||
| 164 | - | core.PuregoSafeRegister(&xDeviceToolGetAxes, libs, "gdk_device_tool_get_axes") | |||
| 165 | - | core.PuregoSafeRegister(&xDeviceToolGetHardwareId, libs, "gdk_device_tool_get_hardware_id") | |||
| 166 | - | core.PuregoSafeRegister(&xDeviceToolGetSerial, libs, "gdk_device_tool_get_serial") | |||
| 167 | - | core.PuregoSafeRegister(&xDeviceToolGetToolType, libs, "gdk_device_tool_get_tool_type") | |||
| 168 | } | 160 | } | ||