Revert "chore(deps): pin puregotk nil-signal fix"
This reverts commit a161e348e2093172038390b0906448f0ae979a0d.
- commit
- 40378d5e4fd2372d054e49168ab2a6f67aedd0fd
- author
- brice · · 2026-07-14 17:59 UTC
- parent
- 8d647bb
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +18 -10
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | package gdk | |
| 3 | 3 | ||
| 4 | 4 | import ( | |
| 5 | + | "github.com/bnema/purego" | |
| 5 | 6 | "github.com/bnema/puregotk/pkg/core" | |
| 6 | 7 | "github.com/bnema/puregotk/v4/gobject" | |
| 7 | 8 | "github.com/bnema/puregotk/v4/gobject/types" | |
| @@ -14,7 +15,6 @@ type DeviceToolType int | |||
| 14 | 15 | var xDeviceToolTypeGLibType func() types.GType | |
| 15 | 16 | ||
| 16 | 17 | 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,7 +46,6 @@ 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) | |
| 50 | 49 | return xDeviceToolGLibType() | |
| 51 | 50 | } | |
| 52 | 51 | ||
| @@ -60,8 +59,6 @@ var xDeviceToolGetAxes func(uintptr) AxisFlags | |||
| 60 | 59 | ||
| 61 | 60 | // Gets the axes of the tool. | |
| 62 | 61 | func (x *DeviceTool) GetAxes() AxisFlags { | |
| 63 | - | core.LazyRegister(&xDeviceToolGetAxes, "GDK", "gdk_device_tool_get_axes", false) | |
| 64 | - | ||
| 65 | 62 | cret := xDeviceToolGetAxes(x.GoPointer()) | |
| 66 | 63 | return cret | |
| 67 | 64 | } | |
| @@ -80,8 +77,6 @@ var xDeviceToolGetHardwareId func(uintptr) uint64 | |||
| 80 | 77 | // as a tablet may support multiple devices with the same | |
| 81 | 78 | // `GdkDeviceToolType`, but different hardware identifiers. | |
| 82 | 79 | func (x *DeviceTool) GetHardwareId() uint64 { | |
| 83 | - | core.LazyRegister(&xDeviceToolGetHardwareId, "GDK", "gdk_device_tool_get_hardware_id", false) | |
| 84 | - | ||
| 85 | 80 | cret := xDeviceToolGetHardwareId(x.GoPointer()) | |
| 86 | 81 | return cret | |
| 87 | 82 | } | |
| @@ -93,8 +88,6 @@ var xDeviceToolGetSerial func(uintptr) uint64 | |||
| 93 | 88 | // This value can be used to identify a physical tool | |
| 94 | 89 | // (eg. a tablet pen) across program executions. | |
| 95 | 90 | func (x *DeviceTool) GetSerial() uint64 { | |
| 96 | - | core.LazyRegister(&xDeviceToolGetSerial, "GDK", "gdk_device_tool_get_serial", false) | |
| 97 | - | ||
| 98 | 91 | cret := xDeviceToolGetSerial(x.GoPointer()) | |
| 99 | 92 | return cret | |
| 100 | 93 | } | |
| @@ -103,8 +96,6 @@ var xDeviceToolGetToolType func(uintptr) DeviceToolType | |||
| 103 | 96 | ||
| 104 | 97 | // Gets the `GdkDeviceToolType` of the tool. | |
| 105 | 98 | func (x *DeviceTool) GetToolType() DeviceToolType { | |
| 106 | - | core.LazyRegister(&xDeviceToolGetToolType, "GDK", "gdk_device_tool_get_tool_type", false) | |
| 107 | - | ||
| 108 | 99 | cret := xDeviceToolGetToolType(x.GoPointer()) | |
| 109 | 100 | return cret | |
| 110 | 101 | } | |
| @@ -157,4 +148,21 @@ func (x *DeviceTool) GetPropertySerial() uint64 { | |||
| 157 | 148 | func init() { | |
| 158 | 149 | core.SetPackageName("GDK", "gtk4") | |
| 159 | 150 | 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") | |
| 160 | 168 | } | |
| @@ -2,6 +2,7 @@ | |||||
| 2 | package gdk | 2 | package gdk | ||
| 3 | 3 | ||||
| 4 | import ( | 4 | import ( | ||
| 5 | + | "github.com/bnema/purego" | |||
| 5 | "github.com/bnema/puregotk/pkg/core" | 6 | "github.com/bnema/puregotk/pkg/core" | ||
| 6 | "github.com/bnema/puregotk/v4/gobject" | 7 | "github.com/bnema/puregotk/v4/gobject" | ||
| 7 | "github.com/bnema/puregotk/v4/gobject/types" | 8 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| @@ -14,7 +15,6 @@ type DeviceToolType int | |||||
| 14 | var xDeviceToolTypeGLibType func() types.GType | 15 | var xDeviceToolTypeGLibType func() types.GType | ||
| 15 | 16 | ||||
| 16 | func DeviceToolTypeGLibType() types.GType { | 17 | 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,7 +46,6 @@ 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) | |||
| 50 | return xDeviceToolGLibType() | 49 | return xDeviceToolGLibType() | ||
| 51 | } | 50 | } | ||
| 52 | 51 | ||||
| @@ -60,8 +59,6 @@ var xDeviceToolGetAxes func(uintptr) AxisFlags | |||||
| 60 | 59 | ||||
| 61 | // Gets the axes of the tool. | 60 | // Gets the axes of the tool. | ||
| 62 | func (x *DeviceTool) GetAxes() AxisFlags { | 61 | func (x *DeviceTool) GetAxes() AxisFlags { | ||
| 63 | - | core.LazyRegister(&xDeviceToolGetAxes, "GDK", "gdk_device_tool_get_axes", false) | |||
| 64 | - | ||||
| 65 | cret := xDeviceToolGetAxes(x.GoPointer()) | 62 | cret := xDeviceToolGetAxes(x.GoPointer()) | ||
| 66 | return cret | 63 | return cret | ||
| 67 | } | 64 | } | ||
| @@ -80,8 +77,6 @@ var xDeviceToolGetHardwareId func(uintptr) uint64 | |||||
| 80 | // as a tablet may support multiple devices with the same | 77 | // as a tablet may support multiple devices with the same | ||
| 81 | // `GdkDeviceToolType`, but different hardware identifiers. | 78 | // `GdkDeviceToolType`, but different hardware identifiers. | ||
| 82 | func (x *DeviceTool) GetHardwareId() uint64 { | 79 | func (x *DeviceTool) GetHardwareId() uint64 { | ||
| 83 | - | core.LazyRegister(&xDeviceToolGetHardwareId, "GDK", "gdk_device_tool_get_hardware_id", false) | |||
| 84 | - | ||||
| 85 | cret := xDeviceToolGetHardwareId(x.GoPointer()) | 80 | cret := xDeviceToolGetHardwareId(x.GoPointer()) | ||
| 86 | return cret | 81 | return cret | ||
| 87 | } | 82 | } | ||
| @@ -93,8 +88,6 @@ var xDeviceToolGetSerial func(uintptr) uint64 | |||||
| 93 | // This value can be used to identify a physical tool | 88 | // This value can be used to identify a physical tool | ||
| 94 | // (eg. a tablet pen) across program executions. | 89 | // (eg. a tablet pen) across program executions. | ||
| 95 | func (x *DeviceTool) GetSerial() uint64 { | 90 | func (x *DeviceTool) GetSerial() uint64 { | ||
| 96 | - | core.LazyRegister(&xDeviceToolGetSerial, "GDK", "gdk_device_tool_get_serial", false) | |||
| 97 | - | ||||
| 98 | cret := xDeviceToolGetSerial(x.GoPointer()) | 91 | cret := xDeviceToolGetSerial(x.GoPointer()) | ||
| 99 | return cret | 92 | return cret | ||
| 100 | } | 93 | } | ||
| @@ -103,8 +96,6 @@ var xDeviceToolGetToolType func(uintptr) DeviceToolType | |||||
| 103 | 96 | ||||
| 104 | // Gets the `GdkDeviceToolType` of the tool. | 97 | // Gets the `GdkDeviceToolType` of the tool. | ||
| 105 | func (x *DeviceTool) GetToolType() DeviceToolType { | 98 | func (x *DeviceTool) GetToolType() DeviceToolType { | ||
| 106 | - | core.LazyRegister(&xDeviceToolGetToolType, "GDK", "gdk_device_tool_get_tool_type", false) | |||
| 107 | - | ||||
| 108 | cret := xDeviceToolGetToolType(x.GoPointer()) | 99 | cret := xDeviceToolGetToolType(x.GoPointer()) | ||
| 109 | return cret | 100 | return cret | ||
| 110 | } | 101 | } | ||
| @@ -157,4 +148,21 @@ func (x *DeviceTool) GetPropertySerial() uint64 { | |||||
| 157 | func init() { | 148 | func init() { | ||
| 158 | core.SetPackageName("GDK", "gtk4") | 149 | core.SetPackageName("GDK", "gtk4") | ||
| 159 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 150 | 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") | |||
| 160 | } | 168 | } | ||