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
| @@ -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" | |
| @@ -46,8 +47,6 @@ var xSetAllowedBackends func(string) | |||
| 46 | 47 | // as [func@Gdk.Display.open], `gtk_init()`, or `gtk_init_check()` | |
| 47 | 48 | // in order to take effect. | |
| 48 | 49 | func SetAllowedBackends(BackendsVar string) { | |
| 49 | - | core.LazyRegister(&xSetAllowedBackends, "GDK", "gdk_set_allowed_backends", false) | |
| 50 | - | ||
| 51 | 50 | xSetAllowedBackends(BackendsVar) | |
| 52 | 51 | } | |
| 53 | 52 | ||
| @@ -107,7 +106,6 @@ type DisplayManager struct { | |||
| 107 | 106 | var xDisplayManagerGLibType func() types.GType | |
| 108 | 107 | ||
| 109 | 108 | func DisplayManagerGLibType() types.GType { | |
| 110 | - | core.LazyRegister(&xDisplayManagerGLibType, "GDK", "gdk_display_manager_get_type", false) | |
| 111 | 109 | return xDisplayManagerGLibType() | |
| 112 | 110 | } | |
| 113 | 111 | ||
| @@ -121,7 +119,6 @@ var xDisplayManagerGetDefaultDisplay func(uintptr) uintptr | |||
| 121 | 119 | ||
| 122 | 120 | // Gets the default `GdkDisplay`. | |
| 123 | 121 | func (x *DisplayManager) GetDefaultDisplay() *Display { | |
| 124 | - | core.LazyRegister(&xDisplayManagerGetDefaultDisplay, "GDK", "gdk_display_manager_get_default_display", false) | |
| 125 | 122 | var cls *Display | |
| 126 | 123 | ||
| 127 | 124 | cret := xDisplayManagerGetDefaultDisplay(x.GoPointer()) | |
| @@ -139,8 +136,6 @@ var xDisplayManagerListDisplays func(uintptr) uintptr | |||
| 139 | 136 | ||
| 140 | 137 | // List all currently open displays. | |
| 141 | 138 | func (x *DisplayManager) ListDisplays() *glib.SList { | |
| 142 | - | core.LazyRegister(&xDisplayManagerListDisplays, "GDK", "gdk_display_manager_list_displays", false) | |
| 143 | - | ||
| 144 | 139 | cret := xDisplayManagerListDisplays(x.GoPointer()) | |
| 145 | 140 | if cret == 0 { | |
| 146 | 141 | return nil | |
| @@ -152,7 +147,6 @@ var xDisplayManagerOpenDisplay func(uintptr, uintptr) uintptr | |||
| 152 | 147 | ||
| 153 | 148 | // Opens a display. | |
| 154 | 149 | func (x *DisplayManager) OpenDisplay(NameVar *string) *Display { | |
| 155 | - | core.LazyRegister(&xDisplayManagerOpenDisplay, "GDK", "gdk_display_manager_open_display", false) | |
| 156 | 150 | var cls *Display | |
| 157 | 151 | ||
| 158 | 152 | NameVarPtr := core.GStrdupNullable(NameVar) | |
| @@ -173,8 +167,6 @@ var xDisplayManagerSetDefaultDisplay func(uintptr, uintptr) | |||
| 173 | 167 | ||
| 174 | 168 | // Sets @display as the default display. | |
| 175 | 169 | func (x *DisplayManager) SetDefaultDisplay(DisplayVar *Display) { | |
| 176 | - | core.LazyRegister(&xDisplayManagerSetDefaultDisplay, "GDK", "gdk_display_manager_set_default_display", false) | |
| 177 | - | ||
| 178 | 170 | xDisplayManagerSetDefaultDisplay(x.GoPointer(), DisplayVar.GoPointer()) | |
| 179 | 171 | } | |
| 180 | 172 | ||
| @@ -224,7 +216,6 @@ var xDisplayManagerGet func() uintptr | |||
| 224 | 216 | // Applications can use [func@set_allowed_backends] to limit what | |
| 225 | 217 | // backends will be used. | |
| 226 | 218 | func DisplayManagerGet() *DisplayManager { | |
| 227 | - | core.LazyRegister(&xDisplayManagerGet, "GDK", "gdk_display_manager_get", false) | |
| 228 | 219 | var cls *DisplayManager | |
| 229 | 220 | ||
| 230 | 221 | cret := xDisplayManagerGet() | |
| @@ -241,4 +232,23 @@ func DisplayManagerGet() *DisplayManager { | |||
| 241 | 232 | func init() { | |
| 242 | 233 | core.SetPackageName("GDK", "gtk4") | |
| 243 | 234 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | |
| 235 | + | var libs []uintptr | |
| 236 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 237 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 238 | + | if err != nil { | |
| 239 | + | panic(err) | |
| 240 | + | } | |
| 241 | + | libs = append(libs, lib) | |
| 242 | + | } | |
| 243 | + | ||
| 244 | + | core.PuregoSafeRegister(&xSetAllowedBackends, libs, "gdk_set_allowed_backends") | |
| 245 | + | ||
| 246 | + | core.PuregoSafeRegister(&xDisplayManagerGLibType, libs, "gdk_display_manager_get_type") | |
| 247 | + | ||
| 248 | + | core.PuregoSafeRegister(&xDisplayManagerGetDefaultDisplay, libs, "gdk_display_manager_get_default_display") | |
| 249 | + | core.PuregoSafeRegister(&xDisplayManagerListDisplays, libs, "gdk_display_manager_list_displays") | |
| 250 | + | core.PuregoSafeRegister(&xDisplayManagerOpenDisplay, libs, "gdk_display_manager_open_display") | |
| 251 | + | core.PuregoSafeRegister(&xDisplayManagerSetDefaultDisplay, libs, "gdk_display_manager_set_default_display") | |
| 252 | + | ||
| 253 | + | core.PuregoSafeRegister(&xDisplayManagerGet, libs, "gdk_display_manager_get") | |
| 244 | 254 | } | |
| @@ -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" | ||
| @@ -46,8 +47,6 @@ var xSetAllowedBackends func(string) | |||||
| 46 | // as [func@Gdk.Display.open], `gtk_init()`, or `gtk_init_check()` | 47 | // as [func@Gdk.Display.open], `gtk_init()`, or `gtk_init_check()` | ||
| 47 | // in order to take effect. | 48 | // in order to take effect. | ||
| 48 | func SetAllowedBackends(BackendsVar string) { | 49 | func SetAllowedBackends(BackendsVar string) { | ||
| 49 | - | core.LazyRegister(&xSetAllowedBackends, "GDK", "gdk_set_allowed_backends", false) | |||
| 50 | - | ||||
| 51 | xSetAllowedBackends(BackendsVar) | 50 | xSetAllowedBackends(BackendsVar) | ||
| 52 | } | 51 | } | ||
| 53 | 52 | ||||
| @@ -107,7 +106,6 @@ type DisplayManager struct { | |||||
| 107 | var xDisplayManagerGLibType func() types.GType | 106 | var xDisplayManagerGLibType func() types.GType | ||
| 108 | 107 | ||||
| 109 | func DisplayManagerGLibType() types.GType { | 108 | func DisplayManagerGLibType() types.GType { | ||
| 110 | - | core.LazyRegister(&xDisplayManagerGLibType, "GDK", "gdk_display_manager_get_type", false) | |||
| 111 | return xDisplayManagerGLibType() | 109 | return xDisplayManagerGLibType() | ||
| 112 | } | 110 | } | ||
| 113 | 111 | ||||
| @@ -121,7 +119,6 @@ var xDisplayManagerGetDefaultDisplay func(uintptr) uintptr | |||||
| 121 | 119 | ||||
| 122 | // Gets the default `GdkDisplay`. | 120 | // Gets the default `GdkDisplay`. | ||
| 123 | func (x *DisplayManager) GetDefaultDisplay() *Display { | 121 | func (x *DisplayManager) GetDefaultDisplay() *Display { | ||
| 124 | - | core.LazyRegister(&xDisplayManagerGetDefaultDisplay, "GDK", "gdk_display_manager_get_default_display", false) | |||
| 125 | var cls *Display | 122 | var cls *Display | ||
| 126 | 123 | ||||
| 127 | cret := xDisplayManagerGetDefaultDisplay(x.GoPointer()) | 124 | cret := xDisplayManagerGetDefaultDisplay(x.GoPointer()) | ||
| @@ -139,8 +136,6 @@ var xDisplayManagerListDisplays func(uintptr) uintptr | |||||
| 139 | 136 | ||||
| 140 | // List all currently open displays. | 137 | // List all currently open displays. | ||
| 141 | func (x *DisplayManager) ListDisplays() *glib.SList { | 138 | func (x *DisplayManager) ListDisplays() *glib.SList { | ||
| 142 | - | core.LazyRegister(&xDisplayManagerListDisplays, "GDK", "gdk_display_manager_list_displays", false) | |||
| 143 | - | ||||
| 144 | cret := xDisplayManagerListDisplays(x.GoPointer()) | 139 | cret := xDisplayManagerListDisplays(x.GoPointer()) | ||
| 145 | if cret == 0 { | 140 | if cret == 0 { | ||
| 146 | return nil | 141 | return nil | ||
| @@ -152,7 +147,6 @@ var xDisplayManagerOpenDisplay func(uintptr, uintptr) uintptr | |||||
| 152 | 147 | ||||
| 153 | // Opens a display. | 148 | // Opens a display. | ||
| 154 | func (x *DisplayManager) OpenDisplay(NameVar *string) *Display { | 149 | func (x *DisplayManager) OpenDisplay(NameVar *string) *Display { | ||
| 155 | - | core.LazyRegister(&xDisplayManagerOpenDisplay, "GDK", "gdk_display_manager_open_display", false) | |||
| 156 | var cls *Display | 150 | var cls *Display | ||
| 157 | 151 | ||||
| 158 | NameVarPtr := core.GStrdupNullable(NameVar) | 152 | NameVarPtr := core.GStrdupNullable(NameVar) | ||
| @@ -173,8 +167,6 @@ var xDisplayManagerSetDefaultDisplay func(uintptr, uintptr) | |||||
| 173 | 167 | ||||
| 174 | // Sets @display as the default display. | 168 | // Sets @display as the default display. | ||
| 175 | func (x *DisplayManager) SetDefaultDisplay(DisplayVar *Display) { | 169 | func (x *DisplayManager) SetDefaultDisplay(DisplayVar *Display) { | ||
| 176 | - | core.LazyRegister(&xDisplayManagerSetDefaultDisplay, "GDK", "gdk_display_manager_set_default_display", false) | |||
| 177 | - | ||||
| 178 | xDisplayManagerSetDefaultDisplay(x.GoPointer(), DisplayVar.GoPointer()) | 170 | xDisplayManagerSetDefaultDisplay(x.GoPointer(), DisplayVar.GoPointer()) | ||
| 179 | } | 171 | } | ||
| 180 | 172 | ||||
| @@ -224,7 +216,6 @@ var xDisplayManagerGet func() uintptr | |||||
| 224 | // Applications can use [func@set_allowed_backends] to limit what | 216 | // Applications can use [func@set_allowed_backends] to limit what | ||
| 225 | // backends will be used. | 217 | // backends will be used. | ||
| 226 | func DisplayManagerGet() *DisplayManager { | 218 | func DisplayManagerGet() *DisplayManager { | ||
| 227 | - | core.LazyRegister(&xDisplayManagerGet, "GDK", "gdk_display_manager_get", false) | |||
| 228 | var cls *DisplayManager | 219 | var cls *DisplayManager | ||
| 229 | 220 | ||||
| 230 | cret := xDisplayManagerGet() | 221 | cret := xDisplayManagerGet() | ||
| @@ -241,4 +232,23 @@ func DisplayManagerGet() *DisplayManager { | |||||
| 241 | func init() { | 232 | func init() { | ||
| 242 | core.SetPackageName("GDK", "gtk4") | 233 | core.SetPackageName("GDK", "gtk4") | ||
| 243 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 234 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | ||
| 235 | + | var libs []uintptr | |||
| 236 | + | for _, libPath := range core.GetPaths("GDK") { | |||
| 237 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 238 | + | if err != nil { | |||
| 239 | + | panic(err) | |||
| 240 | + | } | |||
| 241 | + | libs = append(libs, lib) | |||
| 242 | + | } | |||
| 243 | + | ||||
| 244 | + | core.PuregoSafeRegister(&xSetAllowedBackends, libs, "gdk_set_allowed_backends") | |||
| 245 | + | ||||
| 246 | + | core.PuregoSafeRegister(&xDisplayManagerGLibType, libs, "gdk_display_manager_get_type") | |||
| 247 | + | ||||
| 248 | + | core.PuregoSafeRegister(&xDisplayManagerGetDefaultDisplay, libs, "gdk_display_manager_get_default_display") | |||
| 249 | + | core.PuregoSafeRegister(&xDisplayManagerListDisplays, libs, "gdk_display_manager_list_displays") | |||
| 250 | + | core.PuregoSafeRegister(&xDisplayManagerOpenDisplay, libs, "gdk_display_manager_open_display") | |||
| 251 | + | core.PuregoSafeRegister(&xDisplayManagerSetDefaultDisplay, libs, "gdk_display_manager_set_default_display") | |||
| 252 | + | ||||
| 253 | + | core.PuregoSafeRegister(&xDisplayManagerGet, libs, "gdk_display_manager_get") | |||
| 244 | } | 254 | } | ||