Don't convert enum/flags to ptrs in signal callbacks

frmdstryr · Jan 13, 2024 · 712f693 · 712f693
1 parent 7816bb0
commit 712f693
Show file tree

Hide file tree

Showing 139 changed files with 942 additions and 939 deletions.
diff --git a/gen.py b/gen.py
@@ -441,8 +441,11 @@ def func_arg_type(func, arg, imports: set[str]) -> Optional[str]:
             it = f"*{it}"  # Arg is modification?
         if it.startswith("*") and arg.may_be_null():
             return f"?{it}"
-        # Hack??
+        # Hack, why does is_pointer not work ??
         if not it.startswith("*") and str(func).startswith("gi.SignalInfo"):
+            i = str(atype.get_interface())
+            if i.startswith("gi.EnumInfo") or i.startswith("gi.FlagInfo"):
+                return it
             return f"*{it}"
         return it
     if t == "array" and (at := array_type_to_string(atype, imports)):

diff --git a/src/gdk/drag.zig b/src/gdk/drag.zig
@@ -133,7 +133,7 @@ pub const Drag = extern struct {
     pub inline fn connectCancel(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, reason: *gdk.DragCancelReason, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, reason: gdk.DragCancelReason, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -143,7 +143,7 @@ pub const Drag = extern struct {
     pub inline fn connectCancelSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, reason: *gdk.DragCancelReason) callconv(.C) void,
+        callback: *const fn (data: *T, reason: gdk.DragCancelReason) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {

diff --git a/src/gio/dtls_connection.zig b/src/gio/dtls_connection.zig
@@ -99,7 +99,7 @@ pub const DtlsConnection = extern struct {
     pub inline fn connectAcceptCertificate(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, peer_cert: *gio.TlsCertificate, errors: *gio.TlsCertificateFlags, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, peer_cert: *gio.TlsCertificate, errors: gio.TlsCertificateFlags, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -109,7 +109,7 @@ pub const DtlsConnection = extern struct {
     pub inline fn connectAcceptCertificateSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, peer_cert: *gio.TlsCertificate, errors: *gio.TlsCertificateFlags) callconv(.C) void,
+        callback: *const fn (data: *T, peer_cert: *gio.TlsCertificate, errors: gio.TlsCertificateFlags) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {

diff --git a/src/gio/file_monitor.zig b/src/gio/file_monitor.zig
@@ -114,7 +114,7 @@ pub const FileMonitor = extern struct {
     pub inline fn connectChanged(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, file: *gio.File, other_file: *gio.File, event_type: *gio.FileMonitorEvent, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, file: *gio.File, other_file: *gio.File, event_type: gio.FileMonitorEvent, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -124,7 +124,7 @@ pub const FileMonitor = extern struct {
     pub inline fn connectChangedSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, file: *gio.File, other_file: *gio.File, event_type: *gio.FileMonitorEvent) callconv(.C) void,
+        callback: *const fn (data: *T, file: *gio.File, other_file: *gio.File, event_type: gio.FileMonitorEvent) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {

diff --git a/src/gio/memory_monitor.zig b/src/gio/memory_monitor.zig
@@ -21,7 +21,7 @@ pub const MemoryMonitor = extern struct {
     pub inline fn connectLowMemoryWarning(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, level: *gio.MemoryMonitorWarningLevel, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, level: gio.MemoryMonitorWarningLevel, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -31,7 +31,7 @@ pub const MemoryMonitor = extern struct {
     pub inline fn connectLowMemoryWarningSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, level: *gio.MemoryMonitorWarningLevel) callconv(.C) void,
+        callback: *const fn (data: *T, level: gio.MemoryMonitorWarningLevel) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {

diff --git a/src/gio/mount_operation.zig b/src/gio/mount_operation.zig
@@ -182,7 +182,7 @@ pub const MountOperation = extern struct {
     pub inline fn connectAskPassword(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, message: [*c]const u8, default_user: [*c]const u8, default_domain: [*c]const u8, flags: *gio.AskPasswordFlags, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, message: [*c]const u8, default_user: [*c]const u8, default_domain: [*c]const u8, flags: gio.AskPasswordFlags, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -192,7 +192,7 @@ pub const MountOperation = extern struct {
     pub inline fn connectAskPasswordSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, message: [*c]const u8, default_user: [*c]const u8, default_domain: [*c]const u8, flags: *gio.AskPasswordFlags) callconv(.C) void,
+        callback: *const fn (data: *T, message: [*c]const u8, default_user: [*c]const u8, default_domain: [*c]const u8, flags: gio.AskPasswordFlags) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -222,7 +222,7 @@ pub const MountOperation = extern struct {
     pub inline fn connectReply(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, result: *gio.MountOperationResult, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, result: gio.MountOperationResult, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -232,7 +232,7 @@ pub const MountOperation = extern struct {
     pub inline fn connectReplySwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, result: *gio.MountOperationResult) callconv(.C) void,
+        callback: *const fn (data: *T, result: gio.MountOperationResult) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {

diff --git a/src/gio/socket_client.zig b/src/gio/socket_client.zig
@@ -198,7 +198,7 @@ pub const SocketClient = extern struct {
     pub inline fn connectEvent(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, event: *gio.SocketClientEvent, connectable: *gio.SocketConnectable, connection: *gio.IOStream, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, event: gio.SocketClientEvent, connectable: *gio.SocketConnectable, connection: *gio.IOStream, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -208,7 +208,7 @@ pub const SocketClient = extern struct {
     pub inline fn connectEventSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, event: *gio.SocketClientEvent, connectable: *gio.SocketConnectable, connection: *gio.IOStream) callconv(.C) void,
+        callback: *const fn (data: *T, event: gio.SocketClientEvent, connectable: *gio.SocketConnectable, connection: *gio.IOStream) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {

diff --git a/src/gio/socket_listener.zig b/src/gio/socket_listener.zig
@@ -141,7 +141,7 @@ pub const SocketListener = extern struct {
     pub inline fn connectEvent(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, event: *gio.SocketListenerEvent, socket: *gio.Socket, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, event: gio.SocketListenerEvent, socket: *gio.Socket, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -151,7 +151,7 @@ pub const SocketListener = extern struct {
     pub inline fn connectEventSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, event: *gio.SocketListenerEvent, socket: *gio.Socket) callconv(.C) void,
+        callback: *const fn (data: *T, event: gio.SocketListenerEvent, socket: *gio.Socket) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {

diff --git a/src/gio/socket_service.zig b/src/gio/socket_service.zig
@@ -170,7 +170,7 @@ pub const SocketService = extern struct {
     pub inline fn connectEvent(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, event: *gio.SocketListenerEvent, socket: *gio.Socket, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, event: gio.SocketListenerEvent, socket: *gio.Socket, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -180,7 +180,7 @@ pub const SocketService = extern struct {
     pub inline fn connectEventSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, event: *gio.SocketListenerEvent, socket: *gio.Socket) callconv(.C) void,
+        callback: *const fn (data: *T, event: gio.SocketListenerEvent, socket: *gio.Socket) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {

diff --git a/src/gio/threaded_socket_service.zig b/src/gio/threaded_socket_service.zig
@@ -190,7 +190,7 @@ pub const ThreadedSocketService = extern struct {
     pub inline fn connectEvent(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, event: *gio.SocketListenerEvent, socket: *gio.Socket, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, event: gio.SocketListenerEvent, socket: *gio.Socket, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -200,7 +200,7 @@ pub const ThreadedSocketService = extern struct {
     pub inline fn connectEventSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, event: *gio.SocketListenerEvent, socket: *gio.Socket) callconv(.C) void,
+        callback: *const fn (data: *T, event: gio.SocketListenerEvent, socket: *gio.Socket) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {

diff --git a/src/gio/tls_connection.zig b/src/gio/tls_connection.zig
@@ -204,7 +204,7 @@ pub const TlsConnection = extern struct {
     pub inline fn connectAcceptCertificate(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, peer_cert: *gio.TlsCertificate, errors: *gio.TlsCertificateFlags, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, peer_cert: *gio.TlsCertificate, errors: gio.TlsCertificateFlags, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -214,7 +214,7 @@ pub const TlsConnection = extern struct {
     pub inline fn connectAcceptCertificateSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, peer_cert: *gio.TlsCertificate, errors: *gio.TlsCertificateFlags) callconv(.C) void,
+        callback: *const fn (data: *T, peer_cert: *gio.TlsCertificate, errors: gio.TlsCertificateFlags) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {

diff --git a/src/gtk/about_dialog.zig b/src/gtk/about_dialog.zig
@@ -1018,7 +1018,7 @@ pub const AboutDialog = extern struct {
     pub inline fn connectDirectionChanged(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, previous_direction: *gtk.TextDirection, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, previous_direction: gtk.TextDirection, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -1028,7 +1028,7 @@ pub const AboutDialog = extern struct {
     pub inline fn connectDirectionChangedSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, previous_direction: *gtk.TextDirection) callconv(.C) void,
+        callback: *const fn (data: *T, previous_direction: gtk.TextDirection) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -1058,7 +1058,7 @@ pub const AboutDialog = extern struct {
     pub inline fn connectKeynavFailed(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, direction: *gtk.DirectionType, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, direction: gtk.DirectionType, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -1068,7 +1068,7 @@ pub const AboutDialog = extern struct {
     pub inline fn connectKeynavFailedSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, direction: *gtk.DirectionType) callconv(.C) void,
+        callback: *const fn (data: *T, direction: gtk.DirectionType) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -1118,7 +1118,7 @@ pub const AboutDialog = extern struct {
     pub inline fn connectMoveFocus(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, direction: *gtk.DirectionType, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, direction: gtk.DirectionType, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -1128,7 +1128,7 @@ pub const AboutDialog = extern struct {
     pub inline fn connectMoveFocusSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, direction: *gtk.DirectionType) callconv(.C) void,
+        callback: *const fn (data: *T, direction: gtk.DirectionType) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -1198,7 +1198,7 @@ pub const AboutDialog = extern struct {
     pub inline fn connectStateFlagsChanged(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, flags: *gtk.StateFlags, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, flags: gtk.StateFlags, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -1208,7 +1208,7 @@ pub const AboutDialog = extern struct {
     pub inline fn connectStateFlagsChangedSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, flags: *gtk.StateFlags) callconv(.C) void,
+        callback: *const fn (data: *T, flags: gtk.StateFlags) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {

diff --git a/src/gtk/action_bar.zig b/src/gtk/action_bar.zig
@@ -640,7 +640,7 @@ pub const ActionBar = extern struct {
     pub inline fn connectDirectionChanged(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, previous_direction: *gtk.TextDirection, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, previous_direction: gtk.TextDirection, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -650,7 +650,7 @@ pub const ActionBar = extern struct {
     pub inline fn connectDirectionChangedSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, previous_direction: *gtk.TextDirection) callconv(.C) void,
+        callback: *const fn (data: *T, previous_direction: gtk.TextDirection) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -680,7 +680,7 @@ pub const ActionBar = extern struct {
     pub inline fn connectKeynavFailed(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, direction: *gtk.DirectionType, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, direction: gtk.DirectionType, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -690,7 +690,7 @@ pub const ActionBar = extern struct {
     pub inline fn connectKeynavFailedSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, direction: *gtk.DirectionType) callconv(.C) void,
+        callback: *const fn (data: *T, direction: gtk.DirectionType) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -740,7 +740,7 @@ pub const ActionBar = extern struct {
     pub inline fn connectMoveFocus(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, direction: *gtk.DirectionType, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, direction: gtk.DirectionType, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -750,7 +750,7 @@ pub const ActionBar = extern struct {
     pub inline fn connectMoveFocusSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, direction: *gtk.DirectionType) callconv(.C) void,
+        callback: *const fn (data: *T, direction: gtk.DirectionType) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -820,7 +820,7 @@ pub const ActionBar = extern struct {
     pub inline fn connectStateFlagsChanged(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, flags: *gtk.StateFlags, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, flags: gtk.StateFlags, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -830,7 +830,7 @@ pub const ActionBar = extern struct {
     pub inline fn connectStateFlagsChangedSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, flags: *gtk.StateFlags) callconv(.C) void,
+        callback: *const fn (data: *T, flags: gtk.StateFlags) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {

diff --git a/src/gtk/any_filter.zig b/src/gtk/any_filter.zig
@@ -120,7 +120,7 @@ pub const AnyFilter = extern struct {
     pub inline fn connectChanged(
         self: *Self,
         comptime T: type,
-        callback: *const fn (self: *Self, change: *gtk.FilterChange, data: ?*T) callconv(.C) void,
+        callback: *const fn (self: *Self, change: gtk.FilterChange, data: ?*T) callconv(.C) void,
         data: ?*T,
         flags: gobject.ConnectFlags
     ) u64 {
@@ -130,7 +130,7 @@ pub const AnyFilter = extern struct {
     pub inline fn connectChangedSwapped(
         self: *Self,
         comptime T: type,
-        callback: *const fn (data: *T, change: *gtk.FilterChange) callconv(.C) void,
+        callback: *const fn (data: *T, change: gtk.FilterChange) callconv(.C) void,
         data: *T,
         flags: gobject.ConnectFlags
     ) u64 {