From 021fd8f3768b747997632ff9a437523e85c32762 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Tue, 8 Jun 2021 03:20:56 +0000 Subject: [PATCH] code: remove now unnecessary zig fmt directives zig fmt does what we want since zig 0.8.0 --- river/Cursor.zig | 2 -- river/Decoration.zig | 2 -- river/DecorationManager.zig | 2 -- river/InputManager.zig | 2 -- river/PointerConstraint.zig | 8 ++------ river/Root.zig | 2 -- river/Seat.zig | 2 -- river/View.zig | 2 -- river/XdgToplevel.zig | 2 -- river/XwaylandUnmanaged.zig | 2 -- river/XwaylandView.zig | 2 -- 11 files changed, 2 insertions(+), 26 deletions(-) diff --git a/river/Cursor.zig b/river/Cursor.zig index fa65849..888ab08 100644 --- a/river/Cursor.zig +++ b/river/Cursor.zig @@ -68,7 +68,6 @@ pressed_count: u32 = 0, axis: wl.Listener(*wlr.Pointer.event.Axis) = wl.Listener(*wlr.Pointer.event.Axis).init(handleAxis), frame: wl.Listener(*wlr.Cursor) = wl.Listener(*wlr.Cursor).init(handleFrame), -// zig fmt: off button: wl.Listener(*wlr.Pointer.event.Button) = wl.Listener(*wlr.Pointer.event.Button).init(handleButton), motion_absolute: wl.Listener(*wlr.Pointer.event.MotionAbsolute) = @@ -89,7 +88,6 @@ swipe_update: wl.Listener(*wlr.Pointer.event.SwipeUpdate) = wl.Listener(*wlr.Pointer.event.SwipeUpdate).init(handleSwipeUpdate), swipe_end: wl.Listener(*wlr.Pointer.event.SwipeEnd) = wl.Listener(*wlr.Pointer.event.SwipeEnd).init(handleSwipeEnd), -// zig fmt: on pub fn init(self: *Self, seat: *Seat) !void { const wlr_cursor = try wlr.Cursor.create(); diff --git a/river/Decoration.zig b/river/Decoration.zig index 70437e5..b2e1433 100644 --- a/river/Decoration.zig +++ b/river/Decoration.zig @@ -28,12 +28,10 @@ const Server = @import("Server.zig"); xdg_toplevel_decoration: *wlr.XdgToplevelDecorationV1, -// zig fmt: off destroy: wl.Listener(*wlr.XdgToplevelDecorationV1) = wl.Listener(*wlr.XdgToplevelDecorationV1).init(handleDestroy), request_mode: wl.Listener(*wlr.XdgToplevelDecorationV1) = wl.Listener(*wlr.XdgToplevelDecorationV1).init(handleRequestMode), -// zig fmt: on pub fn init(self: *Self, xdg_toplevel_decoration: *wlr.XdgToplevelDecorationV1) void { self.* = .{ .xdg_toplevel_decoration = xdg_toplevel_decoration }; diff --git a/river/DecorationManager.zig b/river/DecorationManager.zig index aec1328..54ac850 100644 --- a/river/DecorationManager.zig +++ b/river/DecorationManager.zig @@ -29,10 +29,8 @@ const Server = @import("Server.zig"); xdg_decoration_manager: *wlr.XdgDecorationManagerV1, -// zig fmt: off new_toplevel_decoration: wl.Listener(*wlr.XdgToplevelDecorationV1) = wl.Listener(*wlr.XdgToplevelDecorationV1).init(handleNewToplevelDecoration), -// zig fmt: on pub fn init(self: *Self) !void { self.* = .{ diff --git a/river/InputManager.zig b/river/InputManager.zig index 2eb0237..ed8a29e 100644 --- a/river/InputManager.zig +++ b/river/InputManager.zig @@ -47,7 +47,6 @@ seats: std.TailQueue(Seat) = .{}, exclusive_client: ?*wl.Client = null, -// zig fmt: off inhibit_activate: wl.Listener(*wlr.InputInhibitManager) = wl.Listener(*wlr.InputInhibitManager).init(handleInhibitActivate), inhibit_deactivate: wl.Listener(*wlr.InputInhibitManager) = @@ -58,7 +57,6 @@ new_virtual_pointer: wl.Listener(*wlr.VirtualPointerManagerV1.event.NewPointer) wl.Listener(*wlr.VirtualPointerManagerV1.event.NewPointer).init(handleNewVirtualPointer), new_virtual_keyboard: wl.Listener(*wlr.VirtualKeyboardV1) = wl.Listener(*wlr.VirtualKeyboardV1).init(handleNewVirtualKeyboard), -// zig fmt: on pub fn init(self: *Self) !void { const seat_node = try util.gpa.create(std.TailQueue(Seat).Node); diff --git a/river/PointerConstraint.zig b/river/PointerConstraint.zig index 3e9667f..7ab8ad5 100644 --- a/river/PointerConstraint.zig +++ b/river/PointerConstraint.zig @@ -33,12 +33,8 @@ const View = @import("View.zig"); constraint: *wlr.PointerConstraintV1, cursor: *Cursor, -// zig fmt: off -destroy: wl.Listener(*wlr.PointerConstraintV1) = - wl.Listener(*wlr.PointerConstraintV1).init(handleDestroy), -set_region: wl.Listener(void) = - wl.Listener(void).init(handleSetRegion), -// zig fmt: on +destroy: wl.Listener(*wlr.PointerConstraintV1) = wl.Listener(*wlr.PointerConstraintV1).init(handleDestroy), +set_region: wl.Listener(void) = wl.Listener(void).init(handleSetRegion), pub fn init(self: *Self, constraint: *wlr.PointerConstraintV1) void { const seat = @intToPtr(*Seat, constraint.seat.data); diff --git a/river/Root.zig b/river/Root.zig index 10adb66..2431bda 100644 --- a/river/Root.zig +++ b/river/Root.zig @@ -46,7 +46,6 @@ new_output: wl.Listener(*wlr.Output) = wl.Listener(*wlr.Output).init(handleNewOu output_layout: *wlr.OutputLayout, layout_change: wl.Listener(*wlr.OutputLayout) = wl.Listener(*wlr.OutputLayout).init(handleLayoutChange), -// zig fmt: off output_manager: *wlr.OutputManagerV1, manager_apply: wl.Listener(*wlr.OutputConfigurationV1) = wl.Listener(*wlr.OutputConfigurationV1).init(handleManagerApply), @@ -56,7 +55,6 @@ manager_test: wl.Listener(*wlr.OutputConfigurationV1) = power_manager: *wlr.OutputPowerManagerV1, power_manager_set_mode: wl.Listener(*wlr.OutputPowerManagerV1.event.SetMode) = wl.Listener(*wlr.OutputPowerManagerV1.event.SetMode).init(handlePowerManagerSetMode), -// zig fmt: on /// A list of all outputs all_outputs: std.TailQueue(*Output) = .{}, diff --git a/river/Seat.zig b/river/Seat.zig index 57ccef5..d71ac1a 100644 --- a/river/Seat.zig +++ b/river/Seat.zig @@ -74,7 +74,6 @@ focus_stack: ViewStack(*View) = .{}, /// List of status tracking objects relaying changes to this seat to clients. status_trackers: std.SinglyLinkedList(SeatStatus) = .{}, -// zig fmt: off request_set_selection: wl.Listener(*wlr.Seat.event.RequestSetSelection) = wl.Listener(*wlr.Seat.event.RequestSetSelection).init(handleRequestSetSelection), request_start_drag: wl.Listener(*wlr.Seat.event.RequestStartDrag) = @@ -82,7 +81,6 @@ request_start_drag: wl.Listener(*wlr.Seat.event.RequestStartDrag) = start_drag: wl.Listener(*wlr.Drag) = wl.Listener(*wlr.Drag).init(handleStartDrag), request_set_primary_selection: wl.Listener(*wlr.Seat.event.RequestSetPrimarySelection) = wl.Listener(*wlr.Seat.event.RequestSetPrimarySelection).init(handleRequestSetPrimarySelection), -// zig fmt: on pub fn init(self: *Self, name: [*:0]const u8) !void { self.* = .{ diff --git a/river/View.zig b/river/View.zig index 9329827..71707ba 100644 --- a/river/View.zig +++ b/river/View.zig @@ -133,14 +133,12 @@ draw_borders: bool = true, /// This is created when the view is mapped and destroyed with the view foreign_toplevel_handle: ?*wlr.ForeignToplevelHandleV1 = null, -// zig fmt: off foreign_activate: wl.Listener(*wlr.ForeignToplevelHandleV1.event.Activated) = wl.Listener(*wlr.ForeignToplevelHandleV1.event.Activated).init(handleForeignActivate), foreign_fullscreen: wl.Listener(*wlr.ForeignToplevelHandleV1.event.Fullscreen) = wl.Listener(*wlr.ForeignToplevelHandleV1.event.Fullscreen).init(handleForeignFullscreen), foreign_close: wl.Listener(*wlr.ForeignToplevelHandleV1) = wl.Listener(*wlr.ForeignToplevelHandleV1).init(handleForeignClose), -// zig fmt: on pub fn init(self: *Self, output: *Output, tags: u32, surface: anytype) void { self.* = .{ diff --git a/river/XdgToplevel.zig b/river/XdgToplevel.zig index e74fcb2..3870fa7 100644 --- a/river/XdgToplevel.zig +++ b/river/XdgToplevel.zig @@ -48,14 +48,12 @@ new_subsurface: wl.Listener(*wlr.Subsurface) = wl.Listener(*wlr.Subsurface).init // Listeners that are only active while the view is mapped commit: wl.Listener(*wlr.Surface) = wl.Listener(*wlr.Surface).init(handleCommit), -// zig fmt: off request_fullscreen: wl.Listener(*wlr.XdgToplevel.event.SetFullscreen) = wl.Listener(*wlr.XdgToplevel.event.SetFullscreen).init(handleRequestFullscreen), request_move: wl.Listener(*wlr.XdgToplevel.event.Move) = wl.Listener(*wlr.XdgToplevel.event.Move).init(handleRequestMove), request_resize: wl.Listener(*wlr.XdgToplevel.event.Resize) = wl.Listener(*wlr.XdgToplevel.event.Resize).init(handleRequestResize), -// zig fmt: on set_title: wl.Listener(*wlr.XdgSurface) = wl.Listener(*wlr.XdgSurface).init(handleSetTitle), set_app_id: wl.Listener(*wlr.XdgSurface) = wl.Listener(*wlr.XdgSurface).init(handleSetAppId), diff --git a/river/XwaylandUnmanaged.zig b/river/XwaylandUnmanaged.zig index 323ee8c..88f4f07 100644 --- a/river/XwaylandUnmanaged.zig +++ b/river/XwaylandUnmanaged.zig @@ -30,10 +30,8 @@ const Box = @import("Box.zig"); xwayland_surface: *wlr.XwaylandSurface, // Listeners that are always active over the view's lifetime -// zig fmt: off request_configure: wl.Listener(*wlr.XwaylandSurface.event.Configure) = wl.Listener(*wlr.XwaylandSurface.event.Configure).init(handleRequestConfigure), -// zig fmt: on destroy: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleDestroy), map: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleMap), unmap: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleUnmap), diff --git a/river/XwaylandView.zig b/river/XwaylandView.zig index b8af5a8..4f9cfab 100644 --- a/river/XwaylandView.zig +++ b/river/XwaylandView.zig @@ -39,10 +39,8 @@ xwayland_surface: *wlr.XwaylandSurface, destroy: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleDestroy), map: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleMap), unmap: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleUnmap), -// zig fmt: off request_configure: wl.Listener(*wlr.XwaylandSurface.event.Configure) = wl.Listener(*wlr.XwaylandSurface.event.Configure).init(handleRequestConfigure), -// zig fmt: on // Listeners that are only active while the view is mapped commit: wl.Listener(*wlr.Surface) = wl.Listener(*wlr.Surface).init(handleCommit),