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
| @@ -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" | |
| @@ -34,7 +35,6 @@ type SubpixelLayout int | |||
| 34 | 35 | var xSubpixelLayoutGLibType func() types.GType | |
| 35 | 36 | ||
| 36 | 37 | func SubpixelLayoutGLibType() types.GType { | |
| 37 | - | core.LazyRegister(&xSubpixelLayoutGLibType, "GDK", "gdk_subpixel_layout_get_type", false) | |
| 38 | 38 | return xSubpixelLayoutGLibType() | |
| 39 | 39 | } | |
| 40 | 40 | ||
| @@ -67,7 +67,6 @@ type Monitor struct { | |||
| 67 | 67 | var xMonitorGLibType func() types.GType | |
| 68 | 68 | ||
| 69 | 69 | func MonitorGLibType() types.GType { | |
| 70 | - | core.LazyRegister(&xMonitorGLibType, "GDK", "gdk_monitor_get_type", false) | |
| 71 | 70 | return xMonitorGLibType() | |
| 72 | 71 | } | |
| 73 | 72 | ||
| @@ -85,8 +84,6 @@ var xMonitorGetConnector func(uintptr) string | |||
| 85 | 84 | // on software and hardware configuration, and should not be | |
| 86 | 85 | // relied on as stable identifiers of a specific monitor. | |
| 87 | 86 | func (x *Monitor) GetConnector() string { | |
| 88 | - | core.LazyRegister(&xMonitorGetConnector, "GDK", "gdk_monitor_get_connector", false) | |
| 89 | - | ||
| 90 | 87 | cret := xMonitorGetConnector(x.GoPointer()) | |
| 91 | 88 | return cret | |
| 92 | 89 | } | |
| @@ -97,8 +94,6 @@ var xMonitorGetDescription func(uintptr) string | |||
| 97 | 94 | // | |
| 98 | 95 | // This can be used to identify a monitor in the UI. | |
| 99 | 96 | func (x *Monitor) GetDescription() string { | |
| 100 | - | core.LazyRegister(&xMonitorGetDescription, "GDK", "gdk_monitor_get_description", false) | |
| 101 | - | ||
| 102 | 97 | cret := xMonitorGetDescription(x.GoPointer()) | |
| 103 | 98 | return cret | |
| 104 | 99 | } | |
| @@ -107,7 +102,6 @@ var xMonitorGetDisplay func(uintptr) uintptr | |||
| 107 | 102 | ||
| 108 | 103 | // Gets the display that this monitor belongs to. | |
| 109 | 104 | func (x *Monitor) GetDisplay() *Display { | |
| 110 | - | core.LazyRegister(&xMonitorGetDisplay, "GDK", "gdk_monitor_get_display", false) | |
| 111 | 105 | var cls *Display | |
| 112 | 106 | ||
| 113 | 107 | cret := xMonitorGetDisplay(x.GoPointer()) | |
| @@ -129,8 +123,6 @@ var xMonitorGetGeometry func(uintptr, *Rectangle) | |||
| 129 | 123 | // The returned geometry is in ”application pixels”, not in | |
| 130 | 124 | // ”device pixels” (see [method@Gdk.Monitor.get_scale]). | |
| 131 | 125 | func (x *Monitor) GetGeometry(GeometryVar *Rectangle) { | |
| 132 | - | core.LazyRegister(&xMonitorGetGeometry, "GDK", "gdk_monitor_get_geometry", false) | |
| 133 | - | ||
| 134 | 126 | xMonitorGetGeometry(x.GoPointer(), GeometryVar) | |
| 135 | 127 | } | |
| 136 | 128 | ||
| @@ -138,8 +130,6 @@ var xMonitorGetHeightMm func(uintptr) int | |||
| 138 | 130 | ||
| 139 | 131 | // Gets the height in millimeters of the monitor. | |
| 140 | 132 | func (x *Monitor) GetHeightMm() int { | |
| 141 | - | core.LazyRegister(&xMonitorGetHeightMm, "GDK", "gdk_monitor_get_height_mm", false) | |
| 142 | - | ||
| 143 | 133 | cret := xMonitorGetHeightMm(x.GoPointer()) | |
| 144 | 134 | return cret | |
| 145 | 135 | } | |
| @@ -154,8 +144,6 @@ var xMonitorGetManufacturer func(uintptr) string | |||
| 154 | 144 | // The PNP ID registry is located at | |
| 155 | 145 | // [https://uefi.org/pnp_id_list](https://uefi.org/pnp_id_list). | |
| 156 | 146 | func (x *Monitor) GetManufacturer() string { | |
| 157 | - | core.LazyRegister(&xMonitorGetManufacturer, "GDK", "gdk_monitor_get_manufacturer", false) | |
| 158 | - | ||
| 159 | 147 | cret := xMonitorGetManufacturer(x.GoPointer()) | |
| 160 | 148 | return cret | |
| 161 | 149 | } | |
| @@ -164,8 +152,6 @@ var xMonitorGetModel func(uintptr) string | |||
| 164 | 152 | ||
| 165 | 153 | // Gets the string identifying the monitor model, if available. | |
| 166 | 154 | func (x *Monitor) GetModel() string { | |
| 167 | - | core.LazyRegister(&xMonitorGetModel, "GDK", "gdk_monitor_get_model", false) | |
| 168 | - | ||
| 169 | 155 | cret := xMonitorGetModel(x.GoPointer()) | |
| 170 | 156 | return cret | |
| 171 | 157 | } | |
| @@ -177,8 +163,6 @@ var xMonitorGetRefreshRate func(uintptr) int | |||
| 177 | 163 | // The value is in milli-Hertz, so a refresh rate of 60Hz | |
| 178 | 164 | // is returned as 60000. | |
| 179 | 165 | func (x *Monitor) GetRefreshRate() int { | |
| 180 | - | core.LazyRegister(&xMonitorGetRefreshRate, "GDK", "gdk_monitor_get_refresh_rate", false) | |
| 181 | - | ||
| 182 | 166 | cret := xMonitorGetRefreshRate(x.GoPointer()) | |
| 183 | 167 | return cret | |
| 184 | 168 | } | |
| @@ -192,8 +176,6 @@ var xMonitorGetScale func(uintptr) float64 | |||
| 192 | 176 | // particular monitor, but most of the time you’re drawing to a surface | |
| 193 | 177 | // where it is better to use [method@Gdk.Surface.get_scale] instead. | |
| 194 | 178 | func (x *Monitor) GetScale() float64 { | |
| 195 | - | core.LazyRegister(&xMonitorGetScale, "GDK", "gdk_monitor_get_scale", false) | |
| 196 | - | ||
| 197 | 179 | cret := xMonitorGetScale(x.GoPointer()) | |
| 198 | 180 | return cret | |
| 199 | 181 | } | |
| @@ -210,8 +192,6 @@ var xMonitorGetScaleFactor func(uintptr) int | |||
| 210 | 192 | // particular monitor, but most of the time you’re drawing to a surface | |
| 211 | 193 | // where it is better to use [method@Gdk.Surface.get_scale_factor] instead. | |
| 212 | 194 | func (x *Monitor) GetScaleFactor() int { | |
| 213 | - | core.LazyRegister(&xMonitorGetScaleFactor, "GDK", "gdk_monitor_get_scale_factor", false) | |
| 214 | - | ||
| 215 | 195 | cret := xMonitorGetScaleFactor(x.GoPointer()) | |
| 216 | 196 | return cret | |
| 217 | 197 | } | |
| @@ -221,8 +201,6 @@ var xMonitorGetSubpixelLayout func(uintptr) SubpixelLayout | |||
| 221 | 201 | // Gets information about the layout of red, green and blue | |
| 222 | 202 | // primaries for pixels. | |
| 223 | 203 | func (x *Monitor) GetSubpixelLayout() SubpixelLayout { | |
| 224 | - | core.LazyRegister(&xMonitorGetSubpixelLayout, "GDK", "gdk_monitor_get_subpixel_layout", false) | |
| 225 | - | ||
| 226 | 204 | cret := xMonitorGetSubpixelLayout(x.GoPointer()) | |
| 227 | 205 | return cret | |
| 228 | 206 | } | |
| @@ -231,8 +209,6 @@ var xMonitorGetWidthMm func(uintptr) int | |||
| 231 | 209 | ||
| 232 | 210 | // Gets the width in millimeters of the monitor. | |
| 233 | 211 | func (x *Monitor) GetWidthMm() int { | |
| 234 | - | core.LazyRegister(&xMonitorGetWidthMm, "GDK", "gdk_monitor_get_width_mm", false) | |
| 235 | - | ||
| 236 | 212 | cret := xMonitorGetWidthMm(x.GoPointer()) | |
| 237 | 213 | return cret | |
| 238 | 214 | } | |
| @@ -245,8 +221,6 @@ var xMonitorIsValid func(uintptr) bool | |||
| 245 | 221 | // The @monitor becomes invalid when the physical monitor | |
| 246 | 222 | // is unplugged or removed. | |
| 247 | 223 | func (x *Monitor) IsValid() bool { | |
| 248 | - | core.LazyRegister(&xMonitorIsValid, "GDK", "gdk_monitor_is_valid", false) | |
| 249 | - | ||
| 250 | 224 | cret := xMonitorIsValid(x.GoPointer()) | |
| 251 | 225 | return cret | |
| 252 | 226 | } | |
| @@ -379,4 +353,30 @@ func (x *Monitor) ConnectInvalidate(cb *func(Monitor)) uint { | |||
| 379 | 353 | func init() { | |
| 380 | 354 | core.SetPackageName("GDK", "gtk4") | |
| 381 | 355 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | |
| 356 | + | var libs []uintptr | |
| 357 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 358 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 359 | + | if err != nil { | |
| 360 | + | panic(err) | |
| 361 | + | } | |
| 362 | + | libs = append(libs, lib) | |
| 363 | + | } | |
| 364 | + | ||
| 365 | + | core.PuregoSafeRegister(&xSubpixelLayoutGLibType, libs, "gdk_subpixel_layout_get_type") | |
| 366 | + | ||
| 367 | + | core.PuregoSafeRegister(&xMonitorGLibType, libs, "gdk_monitor_get_type") | |
| 368 | + | ||
| 369 | + | core.PuregoSafeRegister(&xMonitorGetConnector, libs, "gdk_monitor_get_connector") | |
| 370 | + | core.PuregoSafeRegister(&xMonitorGetDescription, libs, "gdk_monitor_get_description") | |
| 371 | + | core.PuregoSafeRegister(&xMonitorGetDisplay, libs, "gdk_monitor_get_display") | |
| 372 | + | core.PuregoSafeRegister(&xMonitorGetGeometry, libs, "gdk_monitor_get_geometry") | |
| 373 | + | core.PuregoSafeRegister(&xMonitorGetHeightMm, libs, "gdk_monitor_get_height_mm") | |
| 374 | + | core.PuregoSafeRegister(&xMonitorGetManufacturer, libs, "gdk_monitor_get_manufacturer") | |
| 375 | + | core.PuregoSafeRegister(&xMonitorGetModel, libs, "gdk_monitor_get_model") | |
| 376 | + | core.PuregoSafeRegister(&xMonitorGetRefreshRate, libs, "gdk_monitor_get_refresh_rate") | |
| 377 | + | core.PuregoSafeRegister(&xMonitorGetScale, libs, "gdk_monitor_get_scale") | |
| 378 | + | core.PuregoSafeRegister(&xMonitorGetScaleFactor, libs, "gdk_monitor_get_scale_factor") | |
| 379 | + | core.PuregoSafeRegister(&xMonitorGetSubpixelLayout, libs, "gdk_monitor_get_subpixel_layout") | |
| 380 | + | core.PuregoSafeRegister(&xMonitorGetWidthMm, libs, "gdk_monitor_get_width_mm") | |
| 381 | + | core.PuregoSafeRegister(&xMonitorIsValid, libs, "gdk_monitor_is_valid") | |
| 382 | 382 | } | |
| @@ -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" | 11 | "github.com/bnema/puregotk/v4/gobject" | ||
| @@ -34,7 +35,6 @@ type SubpixelLayout int | |||||
| 34 | var xSubpixelLayoutGLibType func() types.GType | 35 | var xSubpixelLayoutGLibType func() types.GType | ||
| 35 | 36 | ||||
| 36 | func SubpixelLayoutGLibType() types.GType { | 37 | func SubpixelLayoutGLibType() types.GType { | ||
| 37 | - | core.LazyRegister(&xSubpixelLayoutGLibType, "GDK", "gdk_subpixel_layout_get_type", false) | |||
| 38 | return xSubpixelLayoutGLibType() | 38 | return xSubpixelLayoutGLibType() | ||
| 39 | } | 39 | } | ||
| 40 | 40 | ||||
| @@ -67,7 +67,6 @@ type Monitor struct { | |||||
| 67 | var xMonitorGLibType func() types.GType | 67 | var xMonitorGLibType func() types.GType | ||
| 68 | 68 | ||||
| 69 | func MonitorGLibType() types.GType { | 69 | func MonitorGLibType() types.GType { | ||
| 70 | - | core.LazyRegister(&xMonitorGLibType, "GDK", "gdk_monitor_get_type", false) | |||
| 71 | return xMonitorGLibType() | 70 | return xMonitorGLibType() | ||
| 72 | } | 71 | } | ||
| 73 | 72 | ||||
| @@ -85,8 +84,6 @@ var xMonitorGetConnector func(uintptr) string | |||||
| 85 | // on software and hardware configuration, and should not be | 84 | // on software and hardware configuration, and should not be | ||
| 86 | // relied on as stable identifiers of a specific monitor. | 85 | // relied on as stable identifiers of a specific monitor. | ||
| 87 | func (x *Monitor) GetConnector() string { | 86 | func (x *Monitor) GetConnector() string { | ||
| 88 | - | core.LazyRegister(&xMonitorGetConnector, "GDK", "gdk_monitor_get_connector", false) | |||
| 89 | - | ||||
| 90 | cret := xMonitorGetConnector(x.GoPointer()) | 87 | cret := xMonitorGetConnector(x.GoPointer()) | ||
| 91 | return cret | 88 | return cret | ||
| 92 | } | 89 | } | ||
| @@ -97,8 +94,6 @@ var xMonitorGetDescription func(uintptr) string | |||||
| 97 | // | 94 | // | ||
| 98 | // This can be used to identify a monitor in the UI. | 95 | // This can be used to identify a monitor in the UI. | ||
| 99 | func (x *Monitor) GetDescription() string { | 96 | func (x *Monitor) GetDescription() string { | ||
| 100 | - | core.LazyRegister(&xMonitorGetDescription, "GDK", "gdk_monitor_get_description", false) | |||
| 101 | - | ||||
| 102 | cret := xMonitorGetDescription(x.GoPointer()) | 97 | cret := xMonitorGetDescription(x.GoPointer()) | ||
| 103 | return cret | 98 | return cret | ||
| 104 | } | 99 | } | ||
| @@ -107,7 +102,6 @@ var xMonitorGetDisplay func(uintptr) uintptr | |||||
| 107 | 102 | ||||
| 108 | // Gets the display that this monitor belongs to. | 103 | // Gets the display that this monitor belongs to. | ||
| 109 | func (x *Monitor) GetDisplay() *Display { | 104 | func (x *Monitor) GetDisplay() *Display { | ||
| 110 | - | core.LazyRegister(&xMonitorGetDisplay, "GDK", "gdk_monitor_get_display", false) | |||
| 111 | var cls *Display | 105 | var cls *Display | ||
| 112 | 106 | ||||
| 113 | cret := xMonitorGetDisplay(x.GoPointer()) | 107 | cret := xMonitorGetDisplay(x.GoPointer()) | ||
| @@ -129,8 +123,6 @@ var xMonitorGetGeometry func(uintptr, *Rectangle) | |||||
| 129 | // The returned geometry is in ”application pixels”, not in | 123 | // The returned geometry is in ”application pixels”, not in | ||
| 130 | // ”device pixels” (see [method@Gdk.Monitor.get_scale]). | 124 | // ”device pixels” (see [method@Gdk.Monitor.get_scale]). | ||
| 131 | func (x *Monitor) GetGeometry(GeometryVar *Rectangle) { | 125 | func (x *Monitor) GetGeometry(GeometryVar *Rectangle) { | ||
| 132 | - | core.LazyRegister(&xMonitorGetGeometry, "GDK", "gdk_monitor_get_geometry", false) | |||
| 133 | - | ||||
| 134 | xMonitorGetGeometry(x.GoPointer(), GeometryVar) | 126 | xMonitorGetGeometry(x.GoPointer(), GeometryVar) | ||
| 135 | } | 127 | } | ||
| 136 | 128 | ||||
| @@ -138,8 +130,6 @@ var xMonitorGetHeightMm func(uintptr) int | |||||
| 138 | 130 | ||||
| 139 | // Gets the height in millimeters of the monitor. | 131 | // Gets the height in millimeters of the monitor. | ||
| 140 | func (x *Monitor) GetHeightMm() int { | 132 | func (x *Monitor) GetHeightMm() int { | ||
| 141 | - | core.LazyRegister(&xMonitorGetHeightMm, "GDK", "gdk_monitor_get_height_mm", false) | |||
| 142 | - | ||||
| 143 | cret := xMonitorGetHeightMm(x.GoPointer()) | 133 | cret := xMonitorGetHeightMm(x.GoPointer()) | ||
| 144 | return cret | 134 | return cret | ||
| 145 | } | 135 | } | ||
| @@ -154,8 +144,6 @@ var xMonitorGetManufacturer func(uintptr) string | |||||
| 154 | // The PNP ID registry is located at | 144 | // The PNP ID registry is located at | ||
| 155 | // [https://uefi.org/pnp_id_list](https://uefi.org/pnp_id_list). | 145 | // [https://uefi.org/pnp_id_list](https://uefi.org/pnp_id_list). | ||
| 156 | func (x *Monitor) GetManufacturer() string { | 146 | func (x *Monitor) GetManufacturer() string { | ||
| 157 | - | core.LazyRegister(&xMonitorGetManufacturer, "GDK", "gdk_monitor_get_manufacturer", false) | |||
| 158 | - | ||||
| 159 | cret := xMonitorGetManufacturer(x.GoPointer()) | 147 | cret := xMonitorGetManufacturer(x.GoPointer()) | ||
| 160 | return cret | 148 | return cret | ||
| 161 | } | 149 | } | ||
| @@ -164,8 +152,6 @@ var xMonitorGetModel func(uintptr) string | |||||
| 164 | 152 | ||||
| 165 | // Gets the string identifying the monitor model, if available. | 153 | // Gets the string identifying the monitor model, if available. | ||
| 166 | func (x *Monitor) GetModel() string { | 154 | func (x *Monitor) GetModel() string { | ||
| 167 | - | core.LazyRegister(&xMonitorGetModel, "GDK", "gdk_monitor_get_model", false) | |||
| 168 | - | ||||
| 169 | cret := xMonitorGetModel(x.GoPointer()) | 155 | cret := xMonitorGetModel(x.GoPointer()) | ||
| 170 | return cret | 156 | return cret | ||
| 171 | } | 157 | } | ||
| @@ -177,8 +163,6 @@ var xMonitorGetRefreshRate func(uintptr) int | |||||
| 177 | // The value is in milli-Hertz, so a refresh rate of 60Hz | 163 | // The value is in milli-Hertz, so a refresh rate of 60Hz | ||
| 178 | // is returned as 60000. | 164 | // is returned as 60000. | ||
| 179 | func (x *Monitor) GetRefreshRate() int { | 165 | func (x *Monitor) GetRefreshRate() int { | ||
| 180 | - | core.LazyRegister(&xMonitorGetRefreshRate, "GDK", "gdk_monitor_get_refresh_rate", false) | |||
| 181 | - | ||||
| 182 | cret := xMonitorGetRefreshRate(x.GoPointer()) | 166 | cret := xMonitorGetRefreshRate(x.GoPointer()) | ||
| 183 | return cret | 167 | return cret | ||
| 184 | } | 168 | } | ||
| @@ -192,8 +176,6 @@ var xMonitorGetScale func(uintptr) float64 | |||||
| 192 | // particular monitor, but most of the time you’re drawing to a surface | 176 | // particular monitor, but most of the time you’re drawing to a surface | ||
| 193 | // where it is better to use [method@Gdk.Surface.get_scale] instead. | 177 | // where it is better to use [method@Gdk.Surface.get_scale] instead. | ||
| 194 | func (x *Monitor) GetScale() float64 { | 178 | func (x *Monitor) GetScale() float64 { | ||
| 195 | - | core.LazyRegister(&xMonitorGetScale, "GDK", "gdk_monitor_get_scale", false) | |||
| 196 | - | ||||
| 197 | cret := xMonitorGetScale(x.GoPointer()) | 179 | cret := xMonitorGetScale(x.GoPointer()) | ||
| 198 | return cret | 180 | return cret | ||
| 199 | } | 181 | } | ||
| @@ -210,8 +192,6 @@ var xMonitorGetScaleFactor func(uintptr) int | |||||
| 210 | // particular monitor, but most of the time you’re drawing to a surface | 192 | // particular monitor, but most of the time you’re drawing to a surface | ||
| 211 | // where it is better to use [method@Gdk.Surface.get_scale_factor] instead. | 193 | // where it is better to use [method@Gdk.Surface.get_scale_factor] instead. | ||
| 212 | func (x *Monitor) GetScaleFactor() int { | 194 | func (x *Monitor) GetScaleFactor() int { | ||
| 213 | - | core.LazyRegister(&xMonitorGetScaleFactor, "GDK", "gdk_monitor_get_scale_factor", false) | |||
| 214 | - | ||||
| 215 | cret := xMonitorGetScaleFactor(x.GoPointer()) | 195 | cret := xMonitorGetScaleFactor(x.GoPointer()) | ||
| 216 | return cret | 196 | return cret | ||
| 217 | } | 197 | } | ||
| @@ -221,8 +201,6 @@ var xMonitorGetSubpixelLayout func(uintptr) SubpixelLayout | |||||
| 221 | // Gets information about the layout of red, green and blue | 201 | // Gets information about the layout of red, green and blue | ||
| 222 | // primaries for pixels. | 202 | // primaries for pixels. | ||
| 223 | func (x *Monitor) GetSubpixelLayout() SubpixelLayout { | 203 | func (x *Monitor) GetSubpixelLayout() SubpixelLayout { | ||
| 224 | - | core.LazyRegister(&xMonitorGetSubpixelLayout, "GDK", "gdk_monitor_get_subpixel_layout", false) | |||
| 225 | - | ||||
| 226 | cret := xMonitorGetSubpixelLayout(x.GoPointer()) | 204 | cret := xMonitorGetSubpixelLayout(x.GoPointer()) | ||
| 227 | return cret | 205 | return cret | ||
| 228 | } | 206 | } | ||
| @@ -231,8 +209,6 @@ var xMonitorGetWidthMm func(uintptr) int | |||||
| 231 | 209 | ||||
| 232 | // Gets the width in millimeters of the monitor. | 210 | // Gets the width in millimeters of the monitor. | ||
| 233 | func (x *Monitor) GetWidthMm() int { | 211 | func (x *Monitor) GetWidthMm() int { | ||
| 234 | - | core.LazyRegister(&xMonitorGetWidthMm, "GDK", "gdk_monitor_get_width_mm", false) | |||
| 235 | - | ||||
| 236 | cret := xMonitorGetWidthMm(x.GoPointer()) | 212 | cret := xMonitorGetWidthMm(x.GoPointer()) | ||
| 237 | return cret | 213 | return cret | ||
| 238 | } | 214 | } | ||
| @@ -245,8 +221,6 @@ var xMonitorIsValid func(uintptr) bool | |||||
| 245 | // The @monitor becomes invalid when the physical monitor | 221 | // The @monitor becomes invalid when the physical monitor | ||
| 246 | // is unplugged or removed. | 222 | // is unplugged or removed. | ||
| 247 | func (x *Monitor) IsValid() bool { | 223 | func (x *Monitor) IsValid() bool { | ||
| 248 | - | core.LazyRegister(&xMonitorIsValid, "GDK", "gdk_monitor_is_valid", false) | |||
| 249 | - | ||||
| 250 | cret := xMonitorIsValid(x.GoPointer()) | 224 | cret := xMonitorIsValid(x.GoPointer()) | ||
| 251 | return cret | 225 | return cret | ||
| 252 | } | 226 | } | ||
| @@ -379,4 +353,30 @@ func (x *Monitor) ConnectInvalidate(cb *func(Monitor)) uint { | |||||
| 379 | func init() { | 353 | func init() { | ||
| 380 | core.SetPackageName("GDK", "gtk4") | 354 | core.SetPackageName("GDK", "gtk4") | ||
| 381 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | 355 | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1", "libgtk-4.1.dylib"}) | ||
| 356 | + | var libs []uintptr | |||
| 357 | + | for _, libPath := range core.GetPaths("GDK") { | |||
| 358 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 359 | + | if err != nil { | |||
| 360 | + | panic(err) | |||
| 361 | + | } | |||
| 362 | + | libs = append(libs, lib) | |||
| 363 | + | } | |||
| 364 | + | ||||
| 365 | + | core.PuregoSafeRegister(&xSubpixelLayoutGLibType, libs, "gdk_subpixel_layout_get_type") | |||
| 366 | + | ||||
| 367 | + | core.PuregoSafeRegister(&xMonitorGLibType, libs, "gdk_monitor_get_type") | |||
| 368 | + | ||||
| 369 | + | core.PuregoSafeRegister(&xMonitorGetConnector, libs, "gdk_monitor_get_connector") | |||
| 370 | + | core.PuregoSafeRegister(&xMonitorGetDescription, libs, "gdk_monitor_get_description") | |||
| 371 | + | core.PuregoSafeRegister(&xMonitorGetDisplay, libs, "gdk_monitor_get_display") | |||
| 372 | + | core.PuregoSafeRegister(&xMonitorGetGeometry, libs, "gdk_monitor_get_geometry") | |||
| 373 | + | core.PuregoSafeRegister(&xMonitorGetHeightMm, libs, "gdk_monitor_get_height_mm") | |||
| 374 | + | core.PuregoSafeRegister(&xMonitorGetManufacturer, libs, "gdk_monitor_get_manufacturer") | |||
| 375 | + | core.PuregoSafeRegister(&xMonitorGetModel, libs, "gdk_monitor_get_model") | |||
| 376 | + | core.PuregoSafeRegister(&xMonitorGetRefreshRate, libs, "gdk_monitor_get_refresh_rate") | |||
| 377 | + | core.PuregoSafeRegister(&xMonitorGetScale, libs, "gdk_monitor_get_scale") | |||
| 378 | + | core.PuregoSafeRegister(&xMonitorGetScaleFactor, libs, "gdk_monitor_get_scale_factor") | |||
| 379 | + | core.PuregoSafeRegister(&xMonitorGetSubpixelLayout, libs, "gdk_monitor_get_subpixel_layout") | |||
| 380 | + | core.PuregoSafeRegister(&xMonitorGetWidthMm, libs, "gdk_monitor_get_width_mm") | |||
| 381 | + | core.PuregoSafeRegister(&xMonitorIsValid, libs, "gdk_monitor_is_valid") | |||
| 382 | } | 382 | } | ||