aboutsummaryrefslogtreecommitdiff
path: root/src/keyboard.zig
diff options
context:
space:
mode:
authorIsaac Freund <ifreund@ifreund.xyz>2020-03-24 19:40:47 +0100
committerIsaac Freund <ifreund@ifreund.xyz>2020-03-24 19:44:56 +0100
commite01a150f6d53108f8dad29f7a4e4a275b616c351 (patch)
tree551ad98caa8f6daf08a965f2c8c19bc11020f9b5 /src/keyboard.zig
parenta5a84d816468fa255a4dd30b5dadf026ba29594f (diff)
downloadriver-e01a150f6d53108f8dad29f7a4e4a275b616c351.tar.gz
river-e01a150f6d53108f8dad29f7a4e4a275b616c351.tar.xz
Get rid of [*c] pointers
Diffstat (limited to 'src/keyboard.zig')
-rw-r--r--src/keyboard.zig8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/keyboard.zig b/src/keyboard.zig
index 0077c6e..1a86a02 100644
--- a/src/keyboard.zig
+++ b/src/keyboard.zig
@@ -48,10 +48,10 @@ pub const Keyboard = struct {
c.wl_signal_add(&keyboard_device.*.events.key, &self.listen_key);
}
- fn handle_modifiers(listener: [*c]c.wl_listener, data: ?*c_void) callconv(.C) void {
+ fn handle_modifiers(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
// This event is raised when a modifier key, such as shift or alt, is
// pressed. We simply communicate this to the client. */
- var keyboard = @fieldParentPtr(Keyboard, "listen_modifiers", listener);
+ var keyboard = @fieldParentPtr(Keyboard, "listen_modifiers", listener.?);
// A seat can only have one keyboard, but this is a limitation of the
// Wayland protocol - not wlroots. We assign all connected keyboards to the
@@ -63,9 +63,9 @@ pub const Keyboard = struct {
c.wlr_seat_keyboard_notify_modifiers(keyboard.seat.wlr_seat, &keyboard.*.device.*.unnamed_37.keyboard.*.modifiers);
}
- fn handle_key(listener: [*c]c.wl_listener, data: ?*c_void) callconv(.C) void {
+ fn handle_key(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
// This event is raised when a key is pressed or released.
- const keyboard = @fieldParentPtr(Keyboard, "listen_key", listener);
+ const keyboard = @fieldParentPtr(Keyboard, "listen_key", listener.?);
const event = @ptrCast(
*c.wlr_event_keyboard_key,
@alignCast(@alignOf(*c.wlr_event_keyboard_key), data),