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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +43 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +20 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +41 -53 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +28 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +14 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +18 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrop.go +24 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkenums.go +1 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkevents.go +118 -120 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframeclock.go +24 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframetimings.go +20 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkglcontext.go +36 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexture.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexturebuilder.go +35 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkkeys.go +22 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexture.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexturebuilder.go +35 -42 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmonitor.go +27 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpaintable.go +33 -63 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpango.go +12 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpixbuf.go +12 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopup.go +26 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopuplayout.go +32 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkrgba.go +21 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkseat.go +20 -11
| @@ -4,6 +4,7 @@ package gdk | |||
| 4 | 4 | import ( | |
| 5 | 5 | "unsafe" | |
| 6 | 6 | ||
| 7 | + | "github.com/bnema/purego" | |
| 7 | 8 | "github.com/bnema/puregotk/pkg/core" | |
| 8 | 9 | "github.com/bnema/puregotk/v4/glib" | |
| 9 | 10 | "github.com/bnema/puregotk/v4/gobject" | |
| @@ -16,7 +17,6 @@ type SeatCapabilities int | |||
| 16 | 17 | var xSeatCapabilitiesGLibType func() types.GType | |
| 17 | 18 | ||
| 18 | 19 | func SeatCapabilitiesGLibType() types.GType { | |
| 19 | - | core.LazyRegister(&xSeatCapabilitiesGLibType, "GDK", "gdk_seat_capabilities_get_type", false) | |
| 20 | 20 | return xSeatCapabilitiesGLibType() | |
| 21 | 21 | } | |
| 22 | 22 | ||
| @@ -48,7 +48,6 @@ type Seat struct { | |||
| 48 | 48 | var xSeatGLibType func() types.GType | |
| 49 | 49 | ||
| 50 | 50 | func SeatGLibType() types.GType { | |
| 51 | - | core.LazyRegister(&xSeatGLibType, "GDK", "gdk_seat_get_type", false) | |
| 52 | 51 | return xSeatGLibType() | |
| 53 | 52 | } | |
| 54 | 53 | ||
| @@ -62,8 +61,6 @@ var xSeatGetCapabilities func(uintptr) SeatCapabilities | |||
| 62 | 61 | ||
| 63 | 62 | // Returns the capabilities this `GdkSeat` currently has. | |
| 64 | 63 | func (x *Seat) GetCapabilities() SeatCapabilities { | |
| 65 | - | core.LazyRegister(&xSeatGetCapabilities, "GDK", "gdk_seat_get_capabilities", false) | |
| 66 | - | ||
| 67 | 64 | cret := xSeatGetCapabilities(x.GoPointer()) | |
| 68 | 65 | return cret | |
| 69 | 66 | } | |
| @@ -72,8 +69,6 @@ var xSeatGetDevices func(uintptr, SeatCapabilities) uintptr | |||
| 72 | 69 | ||
| 73 | 70 | // Returns the devices that match the given capabilities. | |
| 74 | 71 | func (x *Seat) GetDevices(CapabilitiesVar SeatCapabilities) *glib.List { | |
| 75 | - | core.LazyRegister(&xSeatGetDevices, "GDK", "gdk_seat_get_devices", false) | |
| 76 | - | ||
| 77 | 72 | cret := xSeatGetDevices(x.GoPointer(), CapabilitiesVar) | |
| 78 | 73 | if cret == 0 { | |
| 79 | 74 | return nil | |
| @@ -85,7 +80,6 @@ var xSeatGetDisplay func(uintptr) uintptr | |||
| 85 | 80 | ||
| 86 | 81 | // Returns the `GdkDisplay` this seat belongs to. | |
| 87 | 82 | func (x *Seat) GetDisplay() *Display { | |
| 88 | - | core.LazyRegister(&xSeatGetDisplay, "GDK", "gdk_seat_get_display", false) | |
| 89 | 83 | var cls *Display | |
| 90 | 84 | ||
| 91 | 85 | cret := xSeatGetDisplay(x.GoPointer()) | |
| @@ -103,7 +97,6 @@ var xSeatGetKeyboard func(uintptr) uintptr | |||
| 103 | 97 | ||
| 104 | 98 | // Returns the device that routes keyboard events. | |
| 105 | 99 | func (x *Seat) GetKeyboard() *Device { | |
| 106 | - | core.LazyRegister(&xSeatGetKeyboard, "GDK", "gdk_seat_get_keyboard", false) | |
| 107 | 100 | var cls *Device | |
| 108 | 101 | ||
| 109 | 102 | cret := xSeatGetKeyboard(x.GoPointer()) | |
| @@ -121,7 +114,6 @@ var xSeatGetPointer func(uintptr) uintptr | |||
| 121 | 114 | ||
| 122 | 115 | // Returns the device that routes pointer events. | |
| 123 | 116 | func (x *Seat) GetPointer() *Device { | |
| 124 | - | core.LazyRegister(&xSeatGetPointer, "GDK", "gdk_seat_get_pointer", false) | |
| 125 | 117 | var cls *Device | |
| 126 | 118 | ||
| 127 | 119 | cret := xSeatGetPointer(x.GoPointer()) | |
| @@ -139,8 +131,6 @@ var xSeatGetTools func(uintptr) uintptr | |||
| 139 | 131 | ||
| 140 | 132 | // Returns all `GdkDeviceTools` that are known to the application. | |
| 141 | 133 | func (x *Seat) GetTools() *glib.List { | |
| 142 | - | core.LazyRegister(&xSeatGetTools, "GDK", "gdk_seat_get_tools", false) | |
| 143 | - | ||
| 144 | 134 | cret := xSeatGetTools(x.GoPointer()) | |
| 145 | 135 | if cret == 0 { | |
| 146 | 136 | return nil | |
| @@ -260,4 +250,23 @@ func (x *Seat) ConnectToolRemoved(cb *func(Seat, uintptr)) uint { | |||
| 260 | 250 | func init() { | |
| 261 | 251 | core.SetPackageName("GDK", "gtk4") | |
| 262 | 252 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | |
| 253 | + | var libs []uintptr | |
| 254 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 255 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 256 | + | if err != nil { | |
| 257 | + | panic(err) | |
| 258 | + | } | |
| 259 | + | libs = append(libs, lib) | |
| 260 | + | } | |
| 261 | + | ||
| 262 | + | core.PuregoSafeRegister(&xSeatCapabilitiesGLibType, libs, "gdk_seat_capabilities_get_type") | |
| 263 | + | ||
| 264 | + | core.PuregoSafeRegister(&xSeatGLibType, libs, "gdk_seat_get_type") | |
| 265 | + | ||
| 266 | + | core.PuregoSafeRegister(&xSeatGetCapabilities, libs, "gdk_seat_get_capabilities") | |
| 267 | + | core.PuregoSafeRegister(&xSeatGetDevices, libs, "gdk_seat_get_devices") | |
| 268 | + | core.PuregoSafeRegister(&xSeatGetDisplay, libs, "gdk_seat_get_display") | |
| 269 | + | core.PuregoSafeRegister(&xSeatGetKeyboard, libs, "gdk_seat_get_keyboard") | |
| 270 | + | core.PuregoSafeRegister(&xSeatGetPointer, libs, "gdk_seat_get_pointer") | |
| 271 | + | core.PuregoSafeRegister(&xSeatGetTools, libs, "gdk_seat_get_tools") | |
| 263 | 272 | } | |
| @@ -4,6 +4,7 @@ package gdk | |||||
| 4 | import ( | 4 | import ( | ||
| 5 | "unsafe" | 5 | "unsafe" | ||
| 6 | 6 | ||||
| 7 | + | "github.com/bnema/purego" | |||
| 7 | "github.com/bnema/puregotk/pkg/core" | 8 | "github.com/bnema/puregotk/pkg/core" | ||
| 8 | "github.com/bnema/puregotk/v4/glib" | 9 | "github.com/bnema/puregotk/v4/glib" | ||
| 9 | "github.com/bnema/puregotk/v4/gobject" | 10 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -16,7 +17,6 @@ type SeatCapabilities int | |||||
| 16 | var xSeatCapabilitiesGLibType func() types.GType | 17 | var xSeatCapabilitiesGLibType func() types.GType | ||
| 17 | 18 | ||||
| 18 | func SeatCapabilitiesGLibType() types.GType { | 19 | func SeatCapabilitiesGLibType() types.GType { | ||
| 19 | - | core.LazyRegister(&xSeatCapabilitiesGLibType, "GDK", "gdk_seat_capabilities_get_type", false) | |||
| 20 | return xSeatCapabilitiesGLibType() | 20 | return xSeatCapabilitiesGLibType() | ||
| 21 | } | 21 | } | ||
| 22 | 22 | ||||
| @@ -48,7 +48,6 @@ type Seat struct { | |||||
| 48 | var xSeatGLibType func() types.GType | 48 | var xSeatGLibType func() types.GType | ||
| 49 | 49 | ||||
| 50 | func SeatGLibType() types.GType { | 50 | func SeatGLibType() types.GType { | ||
| 51 | - | core.LazyRegister(&xSeatGLibType, "GDK", "gdk_seat_get_type", false) | |||
| 52 | return xSeatGLibType() | 51 | return xSeatGLibType() | ||
| 53 | } | 52 | } | ||
| 54 | 53 | ||||
| @@ -62,8 +61,6 @@ var xSeatGetCapabilities func(uintptr) SeatCapabilities | |||||
| 62 | 61 | ||||
| 63 | // Returns the capabilities this `GdkSeat` currently has. | 62 | // Returns the capabilities this `GdkSeat` currently has. | ||
| 64 | func (x *Seat) GetCapabilities() SeatCapabilities { | 63 | func (x *Seat) GetCapabilities() SeatCapabilities { | ||
| 65 | - | core.LazyRegister(&xSeatGetCapabilities, "GDK", "gdk_seat_get_capabilities", false) | |||
| 66 | - | ||||
| 67 | cret := xSeatGetCapabilities(x.GoPointer()) | 64 | cret := xSeatGetCapabilities(x.GoPointer()) | ||
| 68 | return cret | 65 | return cret | ||
| 69 | } | 66 | } | ||
| @@ -72,8 +69,6 @@ var xSeatGetDevices func(uintptr, SeatCapabilities) uintptr | |||||
| 72 | 69 | ||||
| 73 | // Returns the devices that match the given capabilities. | 70 | // Returns the devices that match the given capabilities. | ||
| 74 | func (x *Seat) GetDevices(CapabilitiesVar SeatCapabilities) *glib.List { | 71 | func (x *Seat) GetDevices(CapabilitiesVar SeatCapabilities) *glib.List { | ||
| 75 | - | core.LazyRegister(&xSeatGetDevices, "GDK", "gdk_seat_get_devices", false) | |||
| 76 | - | ||||
| 77 | cret := xSeatGetDevices(x.GoPointer(), CapabilitiesVar) | 72 | cret := xSeatGetDevices(x.GoPointer(), CapabilitiesVar) | ||
| 78 | if cret == 0 { | 73 | if cret == 0 { | ||
| 79 | return nil | 74 | return nil | ||
| @@ -85,7 +80,6 @@ var xSeatGetDisplay func(uintptr) uintptr | |||||
| 85 | 80 | ||||
| 86 | // Returns the `GdkDisplay` this seat belongs to. | 81 | // Returns the `GdkDisplay` this seat belongs to. | ||
| 87 | func (x *Seat) GetDisplay() *Display { | 82 | func (x *Seat) GetDisplay() *Display { | ||
| 88 | - | core.LazyRegister(&xSeatGetDisplay, "GDK", "gdk_seat_get_display", false) | |||
| 89 | var cls *Display | 83 | var cls *Display | ||
| 90 | 84 | ||||
| 91 | cret := xSeatGetDisplay(x.GoPointer()) | 85 | cret := xSeatGetDisplay(x.GoPointer()) | ||
| @@ -103,7 +97,6 @@ var xSeatGetKeyboard func(uintptr) uintptr | |||||
| 103 | 97 | ||||
| 104 | // Returns the device that routes keyboard events. | 98 | // Returns the device that routes keyboard events. | ||
| 105 | func (x *Seat) GetKeyboard() *Device { | 99 | func (x *Seat) GetKeyboard() *Device { | ||
| 106 | - | core.LazyRegister(&xSeatGetKeyboard, "GDK", "gdk_seat_get_keyboard", false) | |||
| 107 | var cls *Device | 100 | var cls *Device | ||
| 108 | 101 | ||||
| 109 | cret := xSeatGetKeyboard(x.GoPointer()) | 102 | cret := xSeatGetKeyboard(x.GoPointer()) | ||
| @@ -121,7 +114,6 @@ var xSeatGetPointer func(uintptr) uintptr | |||||
| 121 | 114 | ||||
| 122 | // Returns the device that routes pointer events. | 115 | // Returns the device that routes pointer events. | ||
| 123 | func (x *Seat) GetPointer() *Device { | 116 | func (x *Seat) GetPointer() *Device { | ||
| 124 | - | core.LazyRegister(&xSeatGetPointer, "GDK", "gdk_seat_get_pointer", false) | |||
| 125 | var cls *Device | 117 | var cls *Device | ||
| 126 | 118 | ||||
| 127 | cret := xSeatGetPointer(x.GoPointer()) | 119 | cret := xSeatGetPointer(x.GoPointer()) | ||
| @@ -139,8 +131,6 @@ var xSeatGetTools func(uintptr) uintptr | |||||
| 139 | 131 | ||||
| 140 | // Returns all `GdkDeviceTools` that are known to the application. | 132 | // Returns all `GdkDeviceTools` that are known to the application. | ||
| 141 | func (x *Seat) GetTools() *glib.List { | 133 | func (x *Seat) GetTools() *glib.List { | ||
| 142 | - | core.LazyRegister(&xSeatGetTools, "GDK", "gdk_seat_get_tools", false) | |||
| 143 | - | ||||
| 144 | cret := xSeatGetTools(x.GoPointer()) | 134 | cret := xSeatGetTools(x.GoPointer()) | ||
| 145 | if cret == 0 { | 135 | if cret == 0 { | ||
| 146 | return nil | 136 | return nil | ||
| @@ -260,4 +250,23 @@ func (x *Seat) ConnectToolRemoved(cb *func(Seat, uintptr)) uint { | |||||
| 260 | func init() { | 250 | func init() { | ||
| 261 | core.SetPackageName("GDK", "gtk4") | 251 | core.SetPackageName("GDK", "gtk4") | ||
| 262 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 252 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | ||
| 253 | + | var libs []uintptr | |||
| 254 | + | for _, libPath := range core.GetPaths("GDK") { | |||
| 255 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 256 | + | if err != nil { | |||
| 257 | + | panic(err) | |||
| 258 | + | } | |||
| 259 | + | libs = append(libs, lib) | |||
| 260 | + | } | |||
| 261 | + | ||||
| 262 | + | core.PuregoSafeRegister(&xSeatCapabilitiesGLibType, libs, "gdk_seat_capabilities_get_type") | |||
| 263 | + | ||||
| 264 | + | core.PuregoSafeRegister(&xSeatGLibType, libs, "gdk_seat_get_type") | |||
| 265 | + | ||||
| 266 | + | core.PuregoSafeRegister(&xSeatGetCapabilities, libs, "gdk_seat_get_capabilities") | |||
| 267 | + | core.PuregoSafeRegister(&xSeatGetDevices, libs, "gdk_seat_get_devices") | |||
| 268 | + | core.PuregoSafeRegister(&xSeatGetDisplay, libs, "gdk_seat_get_display") | |||
| 269 | + | core.PuregoSafeRegister(&xSeatGetKeyboard, libs, "gdk_seat_get_keyboard") | |||
| 270 | + | core.PuregoSafeRegister(&xSeatGetPointer, libs, "gdk_seat_get_pointer") | |||
| 271 | + | core.PuregoSafeRegister(&xSeatGetTools, libs, "gdk_seat_get_tools") | |||
| 263 | } | 272 | } | ||