Wayland compositor (wlroots)
git clone https://git.lucas.co/cce-compositor.git
river: zig 0.15 fmt
river/Cursor.zig | 12 ++++++------
river/InputManager.zig | 4 ++--
river/LockManager.zig | 2 +-
river/LockSurface.zig | 4 ++--
river/OutputManager.zig | 6 +++---
river/PointerConstraint.zig | 14 +++++++-------
river/SceneNodeData.zig | 4 ++--
river/Seat.zig | 4 ++--
river/Server.zig | 2 +-
river/TabletTool.zig | 2 +-
river/TextInput.zig | 10 +++++-----
river/Window.zig | 2 +-
river/XdgDecoration.zig | 6 +++---
river/XdgToplevel.zig | 4 ++--
14 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/river/Cursor.zig b/river/Cursor.zig
index 1a6ec15..b9ac020 100644
--- a/river/Cursor.zig
+++ b/river/Cursor.zig
@@ -521,7 +521,7 @@ pub fn processButton(cursor: *Cursor, event: *const wlr.Pointer.event.Button) vo
}
pub fn processAxis(cursor: *Cursor, event: *const wlr.Pointer.event.Axis) void {
- const device: *InputDevice = @alignCast(@ptrCast(event.device.data));
+ const device: *InputDevice = @ptrCast(@alignCast(event.device.data));
cursor.seat.wlr_seat.pointerNotifyAxis(
event.time_msec,
event.orientation,
@@ -653,7 +653,7 @@ fn handleTabletToolAxis(
_: *wl.Listener(*wlr.Tablet.event.Axis),
event: *wlr.Tablet.event.Axis,
) void {
- const device: *InputDevice = @alignCast(@ptrCast(event.device.data));
+ const device: *InputDevice = @ptrCast(@alignCast(event.device.data));
const tablet: *Tablet = @fieldParentPtr("device", device);
device.seat.handleActivity();
@@ -667,7 +667,7 @@ fn handleTabletToolProximity(
_: *wl.Listener(*wlr.Tablet.event.Proximity),
event: *wlr.Tablet.event.Proximity,
) void {
- const device: *InputDevice = @alignCast(@ptrCast(event.device.data));
+ const device: *InputDevice = @ptrCast(@alignCast(event.device.data));
const tablet: *Tablet = @fieldParentPtr("device", device);
device.seat.handleActivity();
@@ -681,7 +681,7 @@ fn handleTabletToolTip(
_: *wl.Listener(*wlr.Tablet.event.Tip),
event: *wlr.Tablet.event.Tip,
) void {
- const device: *InputDevice = @alignCast(@ptrCast(event.device.data));
+ const device: *InputDevice = @ptrCast(@alignCast(event.device.data));
const tablet: *Tablet = @fieldParentPtr("device", device);
device.seat.handleActivity();
@@ -695,7 +695,7 @@ fn handleTabletToolButton(
_: *wl.Listener(*wlr.Tablet.event.Button),
event: *wlr.Tablet.event.Button,
) void {
- const device: *InputDevice = @alignCast(@ptrCast(event.device.data));
+ const device: *InputDevice = @ptrCast(@alignCast(event.device.data));
const tablet: *Tablet = @fieldParentPtr("device", device);
device.seat.handleActivity();
@@ -748,7 +748,7 @@ fn passthrough(cursor: *Cursor, time: u32) void {
fn updateDragIcons(cursor: *Cursor) void {
var it = server.scene.drag_icons.children.iterator(.forward);
while (it.next()) |node| {
- const icon = @as(*DragIcon, @alignCast(@ptrCast(node.data)));
+ const icon = @as(*DragIcon, @ptrCast(@alignCast(node.data)));
if (icon.wlr_drag_icon.drag.seat == cursor.seat.wlr_seat) {
icon.updatePosition(cursor);
diff --git a/river/InputManager.zig b/river/InputManager.zig
index 9c6b3a5..3025876 100644
--- a/river/InputManager.zig
+++ b/river/InputManager.zig
@@ -210,7 +210,7 @@ const NoKeymapVirtKeyboard = struct {
handleDestroy(&no_keymap.destroy, &virtual_keyboard.keyboard.base);
- const seat: *Seat = @alignCast(@ptrCast(virtual_keyboard.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(virtual_keyboard.seat.data));
seat.addDevice(&virtual_keyboard.keyboard.base, true);
}
};
@@ -226,7 +226,7 @@ fn handleNewConstraint(
}
fn handleNewInputMethod(_: *wl.Listener(*wlr.InputMethodV2), input_method: *wlr.InputMethodV2) void {
- const seat: *Seat = @alignCast(@ptrCast(input_method.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(input_method.seat.data));
log.debug("new input method on seat {s}", .{seat.wlr_seat.name});
diff --git a/river/LockManager.zig b/river/LockManager.zig
index 5603668..3e12242 100644
--- a/river/LockManager.zig
+++ b/river/LockManager.zig
@@ -243,7 +243,7 @@ pub fn lockSurfaceFromOutput(manager: *LockManager, output: *Output) ?*LockSurfa
var it = lock.surfaces.iterator(.forward);
while (it.next()) |wlr_lock_surface| {
- const lock_surface: *LockSurface = @alignCast(@ptrCast(wlr_lock_surface.data));
+ const lock_surface: *LockSurface = @ptrCast(@alignCast(wlr_lock_surface.data));
if (output == lock_surface.getOutput()) {
return lock_surface;
}
diff --git a/river/LockSurface.zig b/river/LockSurface.zig
index 0821db5..e453de2 100644
--- a/river/LockSurface.zig
+++ b/river/LockSurface.zig
@@ -64,7 +64,7 @@ pub fn destroy(lock_surface: *LockSurface) void {
var surface_it = lock_surface.lock.surfaces.iterator(.forward);
const new_focus: Seat.Focus = while (surface_it.next()) |surface| {
if (surface != lock_surface.wlr_lock_surface)
- break .{ .lock_surface = @alignCast(@ptrCast(surface.data)) };
+ break .{ .lock_surface = @ptrCast(@alignCast(surface.data)) };
} else .none;
var seat_it = server.input_manager.seats.iterator(.forward);
@@ -90,7 +90,7 @@ pub fn destroy(lock_surface: *LockSurface) void {
}
pub fn getOutput(lock_surface: *LockSurface) *Output {
- return @alignCast(@ptrCast(lock_surface.wlr_lock_surface.output.data));
+ return @ptrCast(@alignCast(lock_surface.wlr_lock_surface.output.data));
}
pub fn configure(lock_surface: *LockSurface) void {
diff --git a/river/OutputManager.zig b/river/OutputManager.zig
index ee63d3c..b45a48b 100644
--- a/river/OutputManager.zig
+++ b/river/OutputManager.zig
@@ -146,7 +146,7 @@ fn handleManagerApply(_: *wl.Listener(*wlr.OutputConfigurationV1), config: *wlr.
var it = config.heads.iterator(.forward);
while (it.next()) |head| {
- const output: *Output = @alignCast(@ptrCast(head.state.output.data));
+ const output: *Output = @ptrCast(@alignCast(head.state.output.data));
output.scheduled = .{
.state = if (head.state.enabled) .enabled else .disabled_hard,
@@ -201,7 +201,7 @@ fn handlePowerManagerSetMode(
event: *wlr.OutputPowerManagerV1.event.SetMode,
) void {
// The output may have been destroyed, in which case there is nothing to do
- const output = @as(?*Output, @alignCast(@ptrCast(event.output.data))) orelse return;
+ const output = @as(?*Output, @ptrCast(@alignCast(event.output.data))) orelse return;
log.debug("client requested dpms {s} for output {s}", .{
@tagName(event.mode),
@@ -352,7 +352,7 @@ pub fn commitOutputState(om: *OutputManager) void {
}
for (states.items) |*state| {
- const output: *Output = @alignCast(@ptrCast(state.output.data));
+ const output: *Output = @ptrCast(@alignCast(state.output.data));
if (!output.scene_output.?.buildState(&state.base, &.{
.swapchain = swapchain_manager.getSwapchain(state.output),
})) {
diff --git a/river/PointerConstraint.zig b/river/PointerConstraint.zig
index 95aa4f7..0b690b5 100644
--- a/river/PointerConstraint.zig
+++ b/river/PointerConstraint.zig
@@ -47,7 +47,7 @@ commit: wl.Listener(*wlr.Surface) = .init(handleCommit),
node_destroy: wl.Listener(void) = .init(handleNodeDestroy),
pub fn create(wlr_constraint: *wlr.PointerConstraintV1) error{OutOfMemory}!void {
- const seat: *Seat = @alignCast(@ptrCast(wlr_constraint.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(wlr_constraint.seat.data));
const constraint = try util.gpa.create(PointerConstraint);
errdefer util.gpa.destroy(constraint);
@@ -70,7 +70,7 @@ pub fn create(wlr_constraint: *wlr.PointerConstraintV1) error{OutOfMemory}!void
}
pub fn maybeActivate(constraint: *PointerConstraint) void {
- const seat: *Seat = @alignCast(@ptrCast(constraint.wlr_constraint.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(constraint.wlr_constraint.seat.data));
assert(seat.cursor.constraint == constraint);
@@ -102,7 +102,7 @@ pub fn maybeActivate(constraint: *PointerConstraint) void {
/// Called when the cursor position or content in the scene graph changes
pub fn updateState(constraint: *PointerConstraint) void {
- const seat: *Seat = @alignCast(@ptrCast(constraint.wlr_constraint.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(constraint.wlr_constraint.seat.data));
constraint.maybeActivate();
@@ -154,7 +154,7 @@ pub fn confine(constraint: *PointerConstraint, dx: *f64, dy: *f64) void {
}
pub fn deactivate(constraint: *PointerConstraint) void {
- const seat: *Seat = @alignCast(@ptrCast(constraint.wlr_constraint.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(constraint.wlr_constraint.seat.data));
assert(seat.cursor.constraint == constraint);
assert(constraint.state == .active);
@@ -167,7 +167,7 @@ pub fn deactivate(constraint: *PointerConstraint) void {
}
fn warpToHintIfSet(constraint: *PointerConstraint) void {
- const seat: *Seat = @alignCast(@ptrCast(constraint.wlr_constraint.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(constraint.wlr_constraint.seat.data));
if (constraint.wlr_constraint.current.cursor_hint.enabled) {
var lx: i32 = undefined;
@@ -190,7 +190,7 @@ fn handleNodeDestroy(listener: *wl.Listener(void)) void {
fn handleDestroy(listener: *wl.Listener(*wlr.PointerConstraintV1), _: *wlr.PointerConstraintV1) void {
const constraint: *PointerConstraint = @fieldParentPtr("destroy", listener);
- const seat: *Seat = @alignCast(@ptrCast(constraint.wlr_constraint.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(constraint.wlr_constraint.seat.data));
if (constraint.state == .active) {
// We can't simply call deactivate() here as it calls sendDeactivated(),
@@ -215,7 +215,7 @@ fn handleDestroy(listener: *wl.Listener(*wlr.PointerConstraintV1), _: *wlr.Point
// the surface changes.
fn handleCommit(listener: *wl.Listener(*wlr.Surface), _: *wlr.Surface) void {
const constraint: *PointerConstraint = @fieldParentPtr("commit", listener);
- const seat: *Seat = @alignCast(@ptrCast(constraint.wlr_constraint.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(constraint.wlr_constraint.seat.data));
switch (constraint.state) {
.active => |state| {
diff --git a/river/SceneNodeData.zig b/river/SceneNodeData.zig
index 5af3c05..324a410 100644
--- a/river/SceneNodeData.zig
+++ b/river/SceneNodeData.zig
@@ -54,7 +54,7 @@ pub fn attach(node: *wlr.SceneNode, data: Data) error{OutOfMemory}!void {
pub fn fromNode(node: *wlr.SceneNode) ?*SceneNodeData {
var n = node;
while (true) {
- if (@as(?*SceneNodeData, @alignCast(@ptrCast(n.data)))) |scene_node_data| {
+ if (@as(?*SceneNodeData, @ptrCast(@alignCast(n.data)))) |scene_node_data| {
return scene_node_data;
}
if (n.parent) |parent_tree| {
@@ -66,7 +66,7 @@ pub fn fromNode(node: *wlr.SceneNode) ?*SceneNodeData {
}
pub fn fromSurface(surface: *wlr.Surface) ?*SceneNodeData {
- if (@as(?*wlr.SceneNode, @alignCast(@ptrCast(surface.getRootSurface().data)))) |node| {
+ if (@as(?*wlr.SceneNode, @ptrCast(@alignCast(surface.getRootSurface().data)))) |node| {
return fromNode(node);
}
return null;
diff --git a/river/Seat.zig b/river/Seat.zig
index 27c8192..fc61808 100644
--- a/river/Seat.zig
+++ b/river/Seat.zig
@@ -555,7 +555,7 @@ pub fn focus(seat: *Seat, new_focus: Focus) void {
if (seat.cursor.constraint) |constraint| {
assert(constraint.wlr_constraint == wlr_constraint);
} else {
- seat.cursor.constraint = @alignCast(@ptrCast(wlr_constraint.data));
+ seat.cursor.constraint = @ptrCast(@alignCast(wlr_constraint.data));
assert(seat.cursor.constraint != null);
}
}
@@ -575,7 +575,7 @@ pub fn keyboardEnterOrLeave(seat: *Seat, target_surface: ?*wlr.Surface) void {
fn keyboardNotifyEnter(seat: *Seat, wlr_surface: *wlr.Surface) void {
if (seat.wlr_seat.getKeyboard()) |wlr_keyboard| {
- const group: *KeyboardGroup = @alignCast(@ptrCast(wlr_keyboard.data));
+ const group: *KeyboardGroup = @ptrCast(@alignCast(wlr_keyboard.data));
var buffer: [KeyboardGroup.pressed_count_max]u32 = undefined;
var keycodes: std.ArrayList(u32) = .initBuffer(&buffer);
diff --git a/river/Server.zig b/river/Server.zig
index cd3a9ea..e93f6b5 100644
--- a/river/Server.zig
+++ b/river/Server.zig
@@ -387,7 +387,7 @@ fn handleRequestSetCursorShape(
_: *wl.Listener(*wlr.CursorShapeManagerV1.event.RequestSetShape),
event: *wlr.CursorShapeManagerV1.event.RequestSetShape,
) void {
- const seat: *Seat = @alignCast(@ptrCast(event.seat_client.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(event.seat_client.seat.data));
if (event.tablet_tool) |wp_tool| {
assert(event.device_type == .tablet_tool);
diff --git a/river/TabletTool.zig b/river/TabletTool.zig
index c40312a..34b106d 100644
--- a/river/TabletTool.zig
+++ b/river/TabletTool.zig
@@ -58,7 +58,7 @@ destroy: wl.Listener(*wlr.TabletTool) = .init(handleDestroy),
set_cursor: wl.Listener(*wlr.TabletV2TabletTool.event.SetCursor) = .init(handleSetCursor),
pub fn get(wlr_seat: *wlr.Seat, wlr_tool: *wlr.TabletTool) error{OutOfMemory}!*TabletTool {
- if (@as(?*TabletTool, @alignCast(@ptrCast(wlr_tool.data)))) |tool| {
+ if (@as(?*TabletTool, @ptrCast(@alignCast(wlr_tool.data)))) |tool| {
return tool;
} else {
return TabletTool.create(wlr_seat, wlr_tool);
diff --git a/river/TextInput.zig b/river/TextInput.zig
index fcc1c73..fe8d7d7 100644
--- a/river/TextInput.zig
+++ b/river/TextInput.zig
@@ -39,7 +39,7 @@ disable: wl.Listener(*wlr.TextInputV3) = .init(handleDisable),
destroy: wl.Listener(*wlr.TextInputV3) = .init(handleDestroy),
pub fn create(wlr_text_input: *wlr.TextInputV3) !void {
- const seat: *Seat = @alignCast(@ptrCast(wlr_text_input.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(wlr_text_input.seat.data));
const text_input = try util.gpa.create(TextInput);
@@ -60,7 +60,7 @@ pub fn create(wlr_text_input: *wlr.TextInputV3) !void {
fn handleEnable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) void {
const text_input: *TextInput = @fieldParentPtr("enable", listener);
- const seat: *Seat = @alignCast(@ptrCast(text_input.wlr_text_input.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(text_input.wlr_text_input.seat.data));
if (text_input.wlr_text_input.focused_surface == null) {
log.err("client requested to enable text input without focus, ignoring request", .{});
@@ -87,7 +87,7 @@ fn handleEnable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) v
fn handleCommit(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) void {
const text_input: *TextInput = @fieldParentPtr("commit", listener);
- const seat: *Seat = @alignCast(@ptrCast(text_input.wlr_text_input.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(text_input.wlr_text_input.seat.data));
if (seat.relay.text_input != text_input) {
log.err("inactive text input tried to commit an update, client bug?", .{});
@@ -101,7 +101,7 @@ fn handleCommit(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) v
fn handleDisable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) void {
const text_input: *TextInput = @fieldParentPtr("disable", listener);
- const seat: *Seat = @alignCast(@ptrCast(text_input.wlr_text_input.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(text_input.wlr_text_input.seat.data));
if (seat.relay.text_input == text_input) {
seat.relay.disableTextInput();
@@ -110,7 +110,7 @@ fn handleDisable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3)
fn handleDestroy(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) void {
const text_input: *TextInput = @fieldParentPtr("destroy", listener);
- const seat: *Seat = @alignCast(@ptrCast(text_input.wlr_text_input.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(text_input.wlr_text_input.seat.data));
if (seat.relay.text_input == text_input) {
seat.relay.disableTextInput();
diff --git a/river/Window.zig b/river/Window.zig
index a2dc489..febd44e 100644
--- a/river/Window.zig
+++ b/river/Window.zig
@@ -891,7 +891,7 @@ pub fn getParent(window: *Window) ?*Window {
switch (window.impl) {
.toplevel => |toplevel| {
const wlr_parent = toplevel.wlr_toplevel.parent orelse return null;
- const parent: *XdgToplevel = @alignCast(@ptrCast(wlr_parent.base.data));
+ const parent: *XdgToplevel = @ptrCast(@alignCast(wlr_parent.base.data));
return parent.window;
},
.xwayland, .destroying => return null,
diff --git a/river/XdgDecoration.zig b/river/XdgDecoration.zig
index 9b3fd40..9687620 100644
--- a/river/XdgDecoration.zig
+++ b/river/XdgDecoration.zig
@@ -32,7 +32,7 @@ destroy: wl.Listener(*wlr.XdgToplevelDecorationV1) = wl.Listener(*wlr.XdgTopleve
request_mode: wl.Listener(*wlr.XdgToplevelDecorationV1) = wl.Listener(*wlr.XdgToplevelDecorationV1).init(handleRequestMode),
pub fn init(wlr_decoration: *wlr.XdgToplevelDecorationV1) void {
- const toplevel: *XdgToplevel = @alignCast(@ptrCast(wlr_decoration.toplevel.base.data));
+ const toplevel: *XdgToplevel = @ptrCast(@alignCast(wlr_decoration.toplevel.base.data));
toplevel.decoration = .{ .wlr_decoration = wlr_decoration };
const decoration = &toplevel.decoration.?;
@@ -46,7 +46,7 @@ pub fn init(wlr_decoration: *wlr.XdgToplevelDecorationV1) void {
}
pub fn deinit(decoration: *XdgDecoration) void {
- const toplevel: *XdgToplevel = @alignCast(@ptrCast(decoration.wlr_decoration.toplevel.base.data));
+ const toplevel: *XdgToplevel = @ptrCast(@alignCast(decoration.wlr_decoration.toplevel.base.data));
decoration.destroy.link.remove();
decoration.request_mode.link.remove();
@@ -70,7 +70,7 @@ fn handleRequestMode(
) void {
const decoration: *XdgDecoration = @fieldParentPtr("request_mode", listener);
- const toplevel: *XdgToplevel = @alignCast(@ptrCast(decoration.wlr_decoration.toplevel.base.data));
+ const toplevel: *XdgToplevel = @ptrCast(@alignCast(decoration.wlr_decoration.toplevel.base.data));
const window = toplevel.window;
window.setDecorationHint(switch (decoration.wlr_decoration.requested_mode) {
diff --git a/river/XdgToplevel.zig b/river/XdgToplevel.zig
index dbe43d6..2f20000 100644
--- a/river/XdgToplevel.zig
+++ b/river/XdgToplevel.zig
@@ -423,7 +423,7 @@ fn handleRequestMove(
event: *wlr.XdgToplevel.event.Move,
) void {
const toplevel: *XdgToplevel = @fieldParentPtr("request_move", listener);
- const seat: *Seat = @alignCast(@ptrCast(event.seat.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(event.seat.seat.data));
// Moving windows with touch or tablet tool is not yet supported.
if (seat.wlr_seat.validatePointerGrabSerial(null, event.serial)) {
@@ -434,7 +434,7 @@ fn handleRequestMove(
fn handleRequestResize(listener: *wl.Listener(*wlr.XdgToplevel.event.Resize), event: *wlr.XdgToplevel.event.Resize) void {
const toplevel: *XdgToplevel = @fieldParentPtr("request_resize", listener);
- const seat: *Seat = @alignCast(@ptrCast(event.seat.seat.data));
+ const seat: *Seat = @ptrCast(@alignCast(event.seat.seat.data));
// Resizing windows with touch or tablet tool is not yet supported.
if (seat.wlr_seat.validatePointerGrabSerial(null, event.serial)) {