diff options
| author | Isaac Freund <ifreund@ifreund.xyz> | 2020-03-24 19:40:47 +0100 |
|---|---|---|
| committer | Isaac Freund <ifreund@ifreund.xyz> | 2020-03-24 19:44:56 +0100 |
| commit | e01a150f6d53108f8dad29f7a4e4a275b616c351 (patch) | |
| tree | 551ad98caa8f6daf08a965f2c8c19bc11020f9b5 /src/server.zig | |
| parent | a5a84d816468fa255a4dd30b5dadf026ba29594f (diff) | |
| download | river-e01a150f6d53108f8dad29f7a4e4a275b616c351.tar.gz river-e01a150f6d53108f8dad29f7a4e4a275b616c351.tar.xz | |
Get rid of [*c] pointers
Diffstat (limited to 'src/server.zig')
| -rw-r--r-- | src/server.zig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server.zig b/src/server.zig index 7cdedff..0703e78 100644 --- a/src/server.zig +++ b/src/server.zig @@ -143,8 +143,8 @@ pub const Server = struct { return true; } - fn handle_new_output(listener: [*c]c.wl_listener, data: ?*c_void) callconv(.C) void { - var server = @fieldParentPtr(Server, "listen_new_output", listener); + fn handle_new_output(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { + var server = @fieldParentPtr(Server, "listen_new_output", listener.?); var wlr_output = @ptrCast(*c.wlr_output, @alignCast(@alignOf(*c.wlr_output), data)); // TODO: Handle failure @@ -153,10 +153,10 @@ pub const Server = struct { server.outputs.append(node); } - fn handle_new_xdg_surface(listener: [*c]c.wl_listener, data: ?*c_void) callconv(.C) void { + fn handle_new_xdg_surface(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { // This event is raised when wlr_xdg_shell receives a new xdg surface from a // client, either a toplevel (application window) or popup. - var server = @fieldParentPtr(Server, "listen_new_xdg_surface", listener); + var server = @fieldParentPtr(Server, "listen_new_xdg_surface", listener.?); var wlr_xdg_surface = @ptrCast(*c.wlr_xdg_surface, @alignCast(@alignOf(*c.wlr_xdg_surface), data)); if (wlr_xdg_surface.role != c.enum_wlr_xdg_surface_role.WLR_XDG_SURFACE_ROLE_TOPLEVEL) { |
