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
| @@ -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/gobject" | |
| 10 | 11 | "github.com/bnema/puregotk/v4/gobject/types" | |
| @@ -48,7 +49,6 @@ type Popup interface { | |||
| 48 | 49 | var xPopupGLibType func() types.GType | |
| 49 | 50 | ||
| 50 | 51 | func PopupGLibType() types.GType { | |
| 51 | - | core.LazyRegister(&xPopupGLibType, "GDK", "gdk_popup_get_type", false) | |
| 52 | 52 | return xPopupGLibType() | |
| 53 | 53 | } | |
| 54 | 54 | ||
| @@ -159,56 +159,35 @@ func (x *PopupBase) GetPropertyAutohide() bool { | |||
| 159 | 159 | return v.GetBoolean() | |
| 160 | 160 | } | |
| 161 | 161 | ||
| 162 | - | var XGdkPopupGetAutohide func(uintptr) bool = func(instance uintptr) bool { | |
| 163 | - | core.LazyRegister(&xXGdkPopupGetAutohide, "GDK", "gdk_popup_get_autohide", false) | |
| 164 | - | return xXGdkPopupGetAutohide(instance) | |
| 165 | - | } | |
| 166 | - | ||
| 167 | - | var ( | |
| 168 | - | xXGdkPopupGetAutohide func(uintptr) bool | |
| 169 | - | XGdkPopupGetParent func(uintptr) uintptr = func(instance uintptr) uintptr { | |
| 170 | - | core.LazyRegister(&xXGdkPopupGetParent, "GDK", "gdk_popup_get_parent", false) | |
| 171 | - | return xXGdkPopupGetParent(instance) | |
| 172 | - | } | |
| 173 | - | ) | |
| 174 | 162 | var ( | |
| 175 | - | xXGdkPopupGetParent func(uintptr) uintptr | |
| 176 | - | XGdkPopupGetPositionX func(uintptr) int = func(instance uintptr) int { | |
| 177 | - | core.LazyRegister(&xXGdkPopupGetPositionX, "GDK", "gdk_popup_get_position_x", false) | |
| 178 | - | return xXGdkPopupGetPositionX(instance) | |
| 179 | - | } | |
| 163 | + | XGdkPopupGetAutohide func(uintptr) bool | |
| 164 | + | XGdkPopupGetParent func(uintptr) uintptr | |
| 165 | + | XGdkPopupGetPositionX func(uintptr) int | |
| 166 | + | XGdkPopupGetPositionY func(uintptr) int | |
| 167 | + | XGdkPopupGetRectAnchor func(uintptr) Gravity | |
| 168 | + | XGdkPopupGetSurfaceAnchor func(uintptr) Gravity | |
| 169 | + | XGdkPopupPresent func(uintptr, int, int, *PopupLayout) bool | |
| 180 | 170 | ) | |
| 181 | - | var ( | |
| 182 | - | xXGdkPopupGetPositionX func(uintptr) int | |
| 183 | - | XGdkPopupGetPositionY func(uintptr) int = func(instance uintptr) int { | |
| 184 | - | core.LazyRegister(&xXGdkPopupGetPositionY, "GDK", "gdk_popup_get_position_y", false) | |
| 185 | - | return xXGdkPopupGetPositionY(instance) | |
| 186 | - | } | |
| 187 | - | ) | |
| 188 | - | var ( | |
| 189 | - | xXGdkPopupGetPositionY func(uintptr) int | |
| 190 | - | XGdkPopupGetRectAnchor func(uintptr) Gravity = func(instance uintptr) Gravity { | |
| 191 | - | core.LazyRegister(&xXGdkPopupGetRectAnchor, "GDK", "gdk_popup_get_rect_anchor", false) | |
| 192 | - | return xXGdkPopupGetRectAnchor(instance) | |
| 193 | - | } | |
| 194 | - | ) | |
| 195 | - | var ( | |
| 196 | - | xXGdkPopupGetRectAnchor func(uintptr) Gravity | |
| 197 | - | XGdkPopupGetSurfaceAnchor func(uintptr) Gravity = func(instance uintptr) Gravity { | |
| 198 | - | core.LazyRegister(&xXGdkPopupGetSurfaceAnchor, "GDK", "gdk_popup_get_surface_anchor", false) | |
| 199 | - | return xXGdkPopupGetSurfaceAnchor(instance) | |
| 200 | - | } | |
| 201 | - | ) | |
| 202 | - | var ( | |
| 203 | - | xXGdkPopupGetSurfaceAnchor func(uintptr) Gravity | |
| 204 | - | XGdkPopupPresent func(uintptr, int, int, *PopupLayout) bool = func(instance uintptr, WidthVarp int, HeightVarp int, LayoutVarp *PopupLayout) bool { | |
| 205 | - | core.LazyRegister(&xXGdkPopupPresent, "GDK", "gdk_popup_present", false) | |
| 206 | - | return xXGdkPopupPresent(instance, WidthVarp, HeightVarp, LayoutVarp) | |
| 207 | - | } | |
| 208 | - | ) | |
| 209 | - | var xXGdkPopupPresent func(uintptr, int, int, *PopupLayout) bool | |
| 210 | 171 | ||
| 211 | 172 | func init() { | |
| 212 | 173 | core.SetPackageName("GDK", "gtk4") | |
| 213 | 174 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | |
| 175 | + | var libs []uintptr | |
| 176 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 177 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 178 | + | if err != nil { | |
| 179 | + | panic(err) | |
| 180 | + | } | |
| 181 | + | libs = append(libs, lib) | |
| 182 | + | } | |
| 183 | + | ||
| 184 | + | core.PuregoSafeRegister(&xPopupGLibType, libs, "gdk_popup_get_type") | |
| 185 | + | ||
| 186 | + | core.PuregoSafeRegister(&XGdkPopupGetAutohide, libs, "gdk_popup_get_autohide") | |
| 187 | + | core.PuregoSafeRegister(&XGdkPopupGetParent, libs, "gdk_popup_get_parent") | |
| 188 | + | core.PuregoSafeRegister(&XGdkPopupGetPositionX, libs, "gdk_popup_get_position_x") | |
| 189 | + | core.PuregoSafeRegister(&XGdkPopupGetPositionY, libs, "gdk_popup_get_position_y") | |
| 190 | + | core.PuregoSafeRegister(&XGdkPopupGetRectAnchor, libs, "gdk_popup_get_rect_anchor") | |
| 191 | + | core.PuregoSafeRegister(&XGdkPopupGetSurfaceAnchor, libs, "gdk_popup_get_surface_anchor") | |
| 192 | + | core.PuregoSafeRegister(&XGdkPopupPresent, libs, "gdk_popup_present") | |
| 214 | 193 | } | |
| @@ -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/gobject" | 10 | "github.com/bnema/puregotk/v4/gobject" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject/types" | 11 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| @@ -48,7 +49,6 @@ type Popup interface { | |||||
| 48 | var xPopupGLibType func() types.GType | 49 | var xPopupGLibType func() types.GType | ||
| 49 | 50 | ||||
| 50 | func PopupGLibType() types.GType { | 51 | func PopupGLibType() types.GType { | ||
| 51 | - | core.LazyRegister(&xPopupGLibType, "GDK", "gdk_popup_get_type", false) | |||
| 52 | return xPopupGLibType() | 52 | return xPopupGLibType() | ||
| 53 | } | 53 | } | ||
| 54 | 54 | ||||
| @@ -159,56 +159,35 @@ func (x *PopupBase) GetPropertyAutohide() bool { | |||||
| 159 | return v.GetBoolean() | 159 | return v.GetBoolean() | ||
| 160 | } | 160 | } | ||
| 161 | 161 | ||||
| 162 | - | var XGdkPopupGetAutohide func(uintptr) bool = func(instance uintptr) bool { | |||
| 163 | - | core.LazyRegister(&xXGdkPopupGetAutohide, "GDK", "gdk_popup_get_autohide", false) | |||
| 164 | - | return xXGdkPopupGetAutohide(instance) | |||
| 165 | - | } | |||
| 166 | - | ||||
| 167 | - | var ( | |||
| 168 | - | xXGdkPopupGetAutohide func(uintptr) bool | |||
| 169 | - | XGdkPopupGetParent func(uintptr) uintptr = func(instance uintptr) uintptr { | |||
| 170 | - | core.LazyRegister(&xXGdkPopupGetParent, "GDK", "gdk_popup_get_parent", false) | |||
| 171 | - | return xXGdkPopupGetParent(instance) | |||
| 172 | - | } | |||
| 173 | - | ) | |||
| 174 | var ( | 162 | var ( | ||
| 175 | - | xXGdkPopupGetParent func(uintptr) uintptr | 163 | + | XGdkPopupGetAutohide func(uintptr) bool |
| 176 | - | XGdkPopupGetPositionX func(uintptr) int = func(instance uintptr) int { | 164 | + | XGdkPopupGetParent func(uintptr) uintptr |
| 177 | - | core.LazyRegister(&xXGdkPopupGetPositionX, "GDK", "gdk_popup_get_position_x", false) | 165 | + | XGdkPopupGetPositionX func(uintptr) int |
| 178 | - | return xXGdkPopupGetPositionX(instance) | 166 | + | XGdkPopupGetPositionY func(uintptr) int |
| 179 | - | } | 167 | + | XGdkPopupGetRectAnchor func(uintptr) Gravity |
| 168 | + | XGdkPopupGetSurfaceAnchor func(uintptr) Gravity | |||
| 169 | + | XGdkPopupPresent func(uintptr, int, int, *PopupLayout) bool | |||
| 180 | ) | 170 | ) | ||
| 181 | - | var ( | |||
| 182 | - | xXGdkPopupGetPositionX func(uintptr) int | |||
| 183 | - | XGdkPopupGetPositionY func(uintptr) int = func(instance uintptr) int { | |||
| 184 | - | core.LazyRegister(&xXGdkPopupGetPositionY, "GDK", "gdk_popup_get_position_y", false) | |||
| 185 | - | return xXGdkPopupGetPositionY(instance) | |||
| 186 | - | } | |||
| 187 | - | ) | |||
| 188 | - | var ( | |||
| 189 | - | xXGdkPopupGetPositionY func(uintptr) int | |||
| 190 | - | XGdkPopupGetRectAnchor func(uintptr) Gravity = func(instance uintptr) Gravity { | |||
| 191 | - | core.LazyRegister(&xXGdkPopupGetRectAnchor, "GDK", "gdk_popup_get_rect_anchor", false) | |||
| 192 | - | return xXGdkPopupGetRectAnchor(instance) | |||
| 193 | - | } | |||
| 194 | - | ) | |||
| 195 | - | var ( | |||
| 196 | - | xXGdkPopupGetRectAnchor func(uintptr) Gravity | |||
| 197 | - | XGdkPopupGetSurfaceAnchor func(uintptr) Gravity = func(instance uintptr) Gravity { | |||
| 198 | - | core.LazyRegister(&xXGdkPopupGetSurfaceAnchor, "GDK", "gdk_popup_get_surface_anchor", false) | |||
| 199 | - | return xXGdkPopupGetSurfaceAnchor(instance) | |||
| 200 | - | } | |||
| 201 | - | ) | |||
| 202 | - | var ( | |||
| 203 | - | xXGdkPopupGetSurfaceAnchor func(uintptr) Gravity | |||
| 204 | - | XGdkPopupPresent func(uintptr, int, int, *PopupLayout) bool = func(instance uintptr, WidthVarp int, HeightVarp int, LayoutVarp *PopupLayout) bool { | |||
| 205 | - | core.LazyRegister(&xXGdkPopupPresent, "GDK", "gdk_popup_present", false) | |||
| 206 | - | return xXGdkPopupPresent(instance, WidthVarp, HeightVarp, LayoutVarp) | |||
| 207 | - | } | |||
| 208 | - | ) | |||
| 209 | - | var xXGdkPopupPresent func(uintptr, int, int, *PopupLayout) bool | |||
| 210 | 171 | ||||
| 211 | func init() { | 172 | func init() { | ||
| 212 | core.SetPackageName("GDK", "gtk4") | 173 | core.SetPackageName("GDK", "gtk4") | ||
| 213 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 174 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | ||
| 175 | + | var libs []uintptr | |||
| 176 | + | for _, libPath := range core.GetPaths("GDK") { | |||
| 177 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 178 | + | if err != nil { | |||
| 179 | + | panic(err) | |||
| 180 | + | } | |||
| 181 | + | libs = append(libs, lib) | |||
| 182 | + | } | |||
| 183 | + | ||||
| 184 | + | core.PuregoSafeRegister(&xPopupGLibType, libs, "gdk_popup_get_type") | |||
| 185 | + | ||||
| 186 | + | core.PuregoSafeRegister(&XGdkPopupGetAutohide, libs, "gdk_popup_get_autohide") | |||
| 187 | + | core.PuregoSafeRegister(&XGdkPopupGetParent, libs, "gdk_popup_get_parent") | |||
| 188 | + | core.PuregoSafeRegister(&XGdkPopupGetPositionX, libs, "gdk_popup_get_position_x") | |||
| 189 | + | core.PuregoSafeRegister(&XGdkPopupGetPositionY, libs, "gdk_popup_get_position_y") | |||
| 190 | + | core.PuregoSafeRegister(&XGdkPopupGetRectAnchor, libs, "gdk_popup_get_rect_anchor") | |||
| 191 | + | core.PuregoSafeRegister(&XGdkPopupGetSurfaceAnchor, libs, "gdk_popup_get_surface_anchor") | |||
| 192 | + | core.PuregoSafeRegister(&XGdkPopupPresent, libs, "gdk_popup_present") | |||
| 214 | } | 193 | } | ||