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
| @@ -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/types" | |
| @@ -33,7 +34,6 @@ type RGBA struct { | |||
| 33 | 34 | var xRGBAGLibType func() types.GType | |
| 34 | 35 | ||
| 35 | 36 | func RGBAGLibType() types.GType { | |
| 36 | - | core.LazyRegister(&xRGBAGLibType, "GDK", "gdk_rgba_get_type", false) | |
| 37 | 37 | return xRGBAGLibType() | |
| 38 | 38 | } | |
| 39 | 39 | ||
| @@ -55,8 +55,6 @@ var xRGBACopy func(uintptr) uintptr | |||
| 55 | 55 | // | |
| 56 | 56 | // The result must be freed through [method@Gdk.RGBA.free]. | |
| 57 | 57 | func (x *RGBA) Copy() *RGBA { | |
| 58 | - | core.LazyRegister(&xRGBACopy, "GDK", "gdk_rgba_copy", false) | |
| 59 | - | ||
| 60 | 58 | cret := xRGBACopy(x.GoPointer()) | |
| 61 | 59 | if cret == 0 { | |
| 62 | 60 | return nil | |
| @@ -68,8 +66,6 @@ var xRGBAEqual func(uintptr, uintptr) bool | |||
| 68 | 66 | ||
| 69 | 67 | // Compares two `GdkRGBA` colors. | |
| 70 | 68 | func (x *RGBA) Equal(P2Var uintptr) bool { | |
| 71 | - | core.LazyRegister(&xRGBAEqual, "GDK", "gdk_rgba_equal", false) | |
| 72 | - | ||
| 73 | 69 | cret := xRGBAEqual(x.GoPointer(), P2Var) | |
| 74 | 70 | return cret | |
| 75 | 71 | } | |
| @@ -78,8 +74,6 @@ var xRGBAFree func(uintptr) | |||
| 78 | 74 | ||
| 79 | 75 | // Frees a `GdkRGBA`. | |
| 80 | 76 | func (x *RGBA) Free() { | |
| 81 | - | core.LazyRegister(&xRGBAFree, "GDK", "gdk_rgba_free", false) | |
| 82 | - | ||
| 83 | 77 | xRGBAFree(x.GoPointer()) | |
| 84 | 78 | } | |
| 85 | 79 | ||
| @@ -88,8 +82,6 @@ var xRGBAHash func(uintptr) uint | |||
| 88 | 82 | // A hash function suitable for using for a hash | |
| 89 | 83 | // table that stores `GdkRGBA`s. | |
| 90 | 84 | func (x *RGBA) Hash() uint { | |
| 91 | - | core.LazyRegister(&xRGBAHash, "GDK", "gdk_rgba_hash", false) | |
| 92 | - | ||
| 93 | 85 | cret := xRGBAHash(x.GoPointer()) | |
| 94 | 86 | return cret | |
| 95 | 87 | } | |
| @@ -100,8 +92,6 @@ var xRGBAIsClear func(uintptr) bool | |||
| 100 | 92 | // | |
| 101 | 93 | // That is, drawing with the value would not produce any change. | |
| 102 | 94 | func (x *RGBA) IsClear() bool { | |
| 103 | - | core.LazyRegister(&xRGBAIsClear, "GDK", "gdk_rgba_is_clear", false) | |
| 104 | - | ||
| 105 | 95 | cret := xRGBAIsClear(x.GoPointer()) | |
| 106 | 96 | return cret | |
| 107 | 97 | } | |
| @@ -113,8 +103,6 @@ var xRGBAIsOpaque func(uintptr) bool | |||
| 113 | 103 | // That is, drawing with the value will not retain any results | |
| 114 | 104 | // from previous contents. | |
| 115 | 105 | func (x *RGBA) IsOpaque() bool { | |
| 116 | - | core.LazyRegister(&xRGBAIsOpaque, "GDK", "gdk_rgba_is_opaque", false) | |
| 117 | - | ||
| 118 | 106 | cret := xRGBAIsOpaque(x.GoPointer()) | |
| 119 | 107 | return cret | |
| 120 | 108 | } | |
| @@ -144,8 +132,6 @@ var xRGBAParse func(uintptr, string) bool | |||
| 144 | 132 | // “s”, “l” can be either numbers in the range 0 to 100 or | |
| 145 | 133 | // percentages. | |
| 146 | 134 | func (x *RGBA) Parse(SpecVar string) bool { | |
| 147 | - | core.LazyRegister(&xRGBAParse, "GDK", "gdk_rgba_parse", false) | |
| 148 | - | ||
| 149 | 135 | cret := xRGBAParse(x.GoPointer(), SpecVar) | |
| 150 | 136 | return cret | |
| 151 | 137 | } | |
| @@ -153,8 +139,6 @@ func (x *RGBA) Parse(SpecVar string) bool { | |||
| 153 | 139 | var xRGBAPrint func(uintptr, *glib.String) uintptr | |
| 154 | 140 | ||
| 155 | 141 | func (x *RGBA) Print(StringVar *glib.String) *glib.String { | |
| 156 | - | core.LazyRegister(&xRGBAPrint, "GDK", "gdk_rgba_print", false) | |
| 157 | - | ||
| 158 | 142 | cret := xRGBAPrint(x.GoPointer(), StringVar) | |
| 159 | 143 | if cret == 0 { | |
| 160 | 144 | return nil | |
| @@ -178,8 +162,6 @@ var xRGBAToString func(uintptr) string | |||
| 178 | 162 | // since “r”, “g” and “b” are represented as 8-bit integers. If | |
| 179 | 163 | // this is a concern, you should use a different representation. | |
| 180 | 164 | func (x *RGBA) ToString() string { | |
| 181 | - | core.LazyRegister(&xRGBAToString, "GDK", "gdk_rgba_to_string", false) | |
| 182 | - | ||
| 183 | 165 | cret := xRGBAToString(x.GoPointer()) | |
| 184 | 166 | return cret | |
| 185 | 167 | } | |
| @@ -187,4 +169,24 @@ func (x *RGBA) ToString() string { | |||
| 187 | 169 | func init() { | |
| 188 | 170 | core.SetPackageName("GDK", "gtk4") | |
| 189 | 171 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | |
| 172 | + | var libs []uintptr | |
| 173 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 174 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 175 | + | if err != nil { | |
| 176 | + | panic(err) | |
| 177 | + | } | |
| 178 | + | libs = append(libs, lib) | |
| 179 | + | } | |
| 180 | + | ||
| 181 | + | core.PuregoSafeRegister(&xRGBAGLibType, libs, "gdk_rgba_get_type") | |
| 182 | + | ||
| 183 | + | core.PuregoSafeRegister(&xRGBACopy, libs, "gdk_rgba_copy") | |
| 184 | + | core.PuregoSafeRegister(&xRGBAEqual, libs, "gdk_rgba_equal") | |
| 185 | + | core.PuregoSafeRegister(&xRGBAFree, libs, "gdk_rgba_free") | |
| 186 | + | core.PuregoSafeRegister(&xRGBAHash, libs, "gdk_rgba_hash") | |
| 187 | + | core.PuregoSafeRegister(&xRGBAIsClear, libs, "gdk_rgba_is_clear") | |
| 188 | + | core.PuregoSafeRegister(&xRGBAIsOpaque, libs, "gdk_rgba_is_opaque") | |
| 189 | + | core.PuregoSafeRegister(&xRGBAParse, libs, "gdk_rgba_parse") | |
| 190 | + | core.PuregoSafeRegister(&xRGBAPrint, libs, "gdk_rgba_print") | |
| 191 | + | core.PuregoSafeRegister(&xRGBAToString, libs, "gdk_rgba_to_string") | |
| 190 | 192 | } | |
| @@ -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/types" | 11 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| @@ -33,7 +34,6 @@ type RGBA struct { | |||||
| 33 | var xRGBAGLibType func() types.GType | 34 | var xRGBAGLibType func() types.GType | ||
| 34 | 35 | ||||
| 35 | func RGBAGLibType() types.GType { | 36 | func RGBAGLibType() types.GType { | ||
| 36 | - | core.LazyRegister(&xRGBAGLibType, "GDK", "gdk_rgba_get_type", false) | |||
| 37 | return xRGBAGLibType() | 37 | return xRGBAGLibType() | ||
| 38 | } | 38 | } | ||
| 39 | 39 | ||||
| @@ -55,8 +55,6 @@ var xRGBACopy func(uintptr) uintptr | |||||
| 55 | // | 55 | // | ||
| 56 | // The result must be freed through [method@Gdk.RGBA.free]. | 56 | // The result must be freed through [method@Gdk.RGBA.free]. | ||
| 57 | func (x *RGBA) Copy() *RGBA { | 57 | func (x *RGBA) Copy() *RGBA { | ||
| 58 | - | core.LazyRegister(&xRGBACopy, "GDK", "gdk_rgba_copy", false) | |||
| 59 | - | ||||
| 60 | cret := xRGBACopy(x.GoPointer()) | 58 | cret := xRGBACopy(x.GoPointer()) | ||
| 61 | if cret == 0 { | 59 | if cret == 0 { | ||
| 62 | return nil | 60 | return nil | ||
| @@ -68,8 +66,6 @@ var xRGBAEqual func(uintptr, uintptr) bool | |||||
| 68 | 66 | ||||
| 69 | // Compares two `GdkRGBA` colors. | 67 | // Compares two `GdkRGBA` colors. | ||
| 70 | func (x *RGBA) Equal(P2Var uintptr) bool { | 68 | func (x *RGBA) Equal(P2Var uintptr) bool { | ||
| 71 | - | core.LazyRegister(&xRGBAEqual, "GDK", "gdk_rgba_equal", false) | |||
| 72 | - | ||||
| 73 | cret := xRGBAEqual(x.GoPointer(), P2Var) | 69 | cret := xRGBAEqual(x.GoPointer(), P2Var) | ||
| 74 | return cret | 70 | return cret | ||
| 75 | } | 71 | } | ||
| @@ -78,8 +74,6 @@ var xRGBAFree func(uintptr) | |||||
| 78 | 74 | ||||
| 79 | // Frees a `GdkRGBA`. | 75 | // Frees a `GdkRGBA`. | ||
| 80 | func (x *RGBA) Free() { | 76 | func (x *RGBA) Free() { | ||
| 81 | - | core.LazyRegister(&xRGBAFree, "GDK", "gdk_rgba_free", false) | |||
| 82 | - | ||||
| 83 | xRGBAFree(x.GoPointer()) | 77 | xRGBAFree(x.GoPointer()) | ||
| 84 | } | 78 | } | ||
| 85 | 79 | ||||
| @@ -88,8 +82,6 @@ var xRGBAHash func(uintptr) uint | |||||
| 88 | // A hash function suitable for using for a hash | 82 | // A hash function suitable for using for a hash | ||
| 89 | // table that stores `GdkRGBA`s. | 83 | // table that stores `GdkRGBA`s. | ||
| 90 | func (x *RGBA) Hash() uint { | 84 | func (x *RGBA) Hash() uint { | ||
| 91 | - | core.LazyRegister(&xRGBAHash, "GDK", "gdk_rgba_hash", false) | |||
| 92 | - | ||||
| 93 | cret := xRGBAHash(x.GoPointer()) | 85 | cret := xRGBAHash(x.GoPointer()) | ||
| 94 | return cret | 86 | return cret | ||
| 95 | } | 87 | } | ||
| @@ -100,8 +92,6 @@ var xRGBAIsClear func(uintptr) bool | |||||
| 100 | // | 92 | // | ||
| 101 | // That is, drawing with the value would not produce any change. | 93 | // That is, drawing with the value would not produce any change. | ||
| 102 | func (x *RGBA) IsClear() bool { | 94 | func (x *RGBA) IsClear() bool { | ||
| 103 | - | core.LazyRegister(&xRGBAIsClear, "GDK", "gdk_rgba_is_clear", false) | |||
| 104 | - | ||||
| 105 | cret := xRGBAIsClear(x.GoPointer()) | 95 | cret := xRGBAIsClear(x.GoPointer()) | ||
| 106 | return cret | 96 | return cret | ||
| 107 | } | 97 | } | ||
| @@ -113,8 +103,6 @@ var xRGBAIsOpaque func(uintptr) bool | |||||
| 113 | // That is, drawing with the value will not retain any results | 103 | // That is, drawing with the value will not retain any results | ||
| 114 | // from previous contents. | 104 | // from previous contents. | ||
| 115 | func (x *RGBA) IsOpaque() bool { | 105 | func (x *RGBA) IsOpaque() bool { | ||
| 116 | - | core.LazyRegister(&xRGBAIsOpaque, "GDK", "gdk_rgba_is_opaque", false) | |||
| 117 | - | ||||
| 118 | cret := xRGBAIsOpaque(x.GoPointer()) | 106 | cret := xRGBAIsOpaque(x.GoPointer()) | ||
| 119 | return cret | 107 | return cret | ||
| 120 | } | 108 | } | ||
| @@ -144,8 +132,6 @@ var xRGBAParse func(uintptr, string) bool | |||||
| 144 | // “s”, “l” can be either numbers in the range 0 to 100 or | 132 | // “s”, “l” can be either numbers in the range 0 to 100 or | ||
| 145 | // percentages. | 133 | // percentages. | ||
| 146 | func (x *RGBA) Parse(SpecVar string) bool { | 134 | func (x *RGBA) Parse(SpecVar string) bool { | ||
| 147 | - | core.LazyRegister(&xRGBAParse, "GDK", "gdk_rgba_parse", false) | |||
| 148 | - | ||||
| 149 | cret := xRGBAParse(x.GoPointer(), SpecVar) | 135 | cret := xRGBAParse(x.GoPointer(), SpecVar) | ||
| 150 | return cret | 136 | return cret | ||
| 151 | } | 137 | } | ||
| @@ -153,8 +139,6 @@ func (x *RGBA) Parse(SpecVar string) bool { | |||||
| 153 | var xRGBAPrint func(uintptr, *glib.String) uintptr | 139 | var xRGBAPrint func(uintptr, *glib.String) uintptr | ||
| 154 | 140 | ||||
| 155 | func (x *RGBA) Print(StringVar *glib.String) *glib.String { | 141 | func (x *RGBA) Print(StringVar *glib.String) *glib.String { | ||
| 156 | - | core.LazyRegister(&xRGBAPrint, "GDK", "gdk_rgba_print", false) | |||
| 157 | - | ||||
| 158 | cret := xRGBAPrint(x.GoPointer(), StringVar) | 142 | cret := xRGBAPrint(x.GoPointer(), StringVar) | ||
| 159 | if cret == 0 { | 143 | if cret == 0 { | ||
| 160 | return nil | 144 | return nil | ||
| @@ -178,8 +162,6 @@ var xRGBAToString func(uintptr) string | |||||
| 178 | // since “r”, “g” and “b” are represented as 8-bit integers. If | 162 | // since “r”, “g” and “b” are represented as 8-bit integers. If | ||
| 179 | // this is a concern, you should use a different representation. | 163 | // this is a concern, you should use a different representation. | ||
| 180 | func (x *RGBA) ToString() string { | 164 | func (x *RGBA) ToString() string { | ||
| 181 | - | core.LazyRegister(&xRGBAToString, "GDK", "gdk_rgba_to_string", false) | |||
| 182 | - | ||||
| 183 | cret := xRGBAToString(x.GoPointer()) | 165 | cret := xRGBAToString(x.GoPointer()) | ||
| 184 | return cret | 166 | return cret | ||
| 185 | } | 167 | } | ||
| @@ -187,4 +169,24 @@ func (x *RGBA) ToString() string { | |||||
| 187 | func init() { | 169 | func init() { | ||
| 188 | core.SetPackageName("GDK", "gtk4") | 170 | core.SetPackageName("GDK", "gtk4") | ||
| 189 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 171 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | ||
| 172 | + | var libs []uintptr | |||
| 173 | + | for _, libPath := range core.GetPaths("GDK") { | |||
| 174 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 175 | + | if err != nil { | |||
| 176 | + | panic(err) | |||
| 177 | + | } | |||
| 178 | + | libs = append(libs, lib) | |||
| 179 | + | } | |||
| 180 | + | ||||
| 181 | + | core.PuregoSafeRegister(&xRGBAGLibType, libs, "gdk_rgba_get_type") | |||
| 182 | + | ||||
| 183 | + | core.PuregoSafeRegister(&xRGBACopy, libs, "gdk_rgba_copy") | |||
| 184 | + | core.PuregoSafeRegister(&xRGBAEqual, libs, "gdk_rgba_equal") | |||
| 185 | + | core.PuregoSafeRegister(&xRGBAFree, libs, "gdk_rgba_free") | |||
| 186 | + | core.PuregoSafeRegister(&xRGBAHash, libs, "gdk_rgba_hash") | |||
| 187 | + | core.PuregoSafeRegister(&xRGBAIsClear, libs, "gdk_rgba_is_clear") | |||
| 188 | + | core.PuregoSafeRegister(&xRGBAIsOpaque, libs, "gdk_rgba_is_opaque") | |||
| 189 | + | core.PuregoSafeRegister(&xRGBAParse, libs, "gdk_rgba_parse") | |||
| 190 | + | core.PuregoSafeRegister(&xRGBAPrint, libs, "gdk_rgba_print") | |||
| 191 | + | core.PuregoSafeRegister(&xRGBAToString, libs, "gdk_rgba_to_string") | |||
| 190 | } | 192 | } | ||