aboutsummaryrefslogtreecommitdiff
path: root/src/server.zig
diff options
context:
space:
mode:
authorIsaac Freund <ifreund@ifreund.xyz>2020-04-21 16:29:17 +0200
committerIsaac Freund <ifreund@ifreund.xyz>2020-04-21 16:29:17 +0200
commit94760394b4b57fec09f4fed214dd2bf70993c857 (patch)
treec8db1a2fd1bf333dbfb628c295773626744d4952 /src/server.zig
parent109a74400741f41d7eafcc5062f403cef32c4b46 (diff)
downloadriver-94760394b4b57fec09f4fed214dd2bf70993c857.tar.gz
river-94760394b4b57fec09f4fed214dd2bf70993c857.tar.xz
Bikeshed variable names
Diffstat (limited to 'src/server.zig')
-rw-r--r--src/server.zig12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server.zig b/src/server.zig
index 8371860..db00173 100644
--- a/src/server.zig
+++ b/src/server.zig
@@ -131,16 +131,16 @@ pub const Server = struct {
}
fn handleNewOutput(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
- const server = @fieldParentPtr(Server, "listen_new_output", listener.?);
+ const self = @fieldParentPtr(Self, "listen_new_output", listener.?);
const wlr_output = @ptrCast(*c.wlr_output, @alignCast(@alignOf(*c.wlr_output), data));
Log.Debug.log("New output {}", .{wlr_output.name});
- server.root.addOutput(wlr_output);
+ self.root.addOutput(wlr_output);
}
fn handleNewXdgSurface(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.
- const server = @fieldParentPtr(Server, "listen_new_xdg_surface", listener.?);
+ const self = @fieldParentPtr(Self, "listen_new_xdg_surface", listener.?);
const 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) {
@@ -148,12 +148,12 @@ pub const Server = struct {
return;
}
- server.input_manager.default_seat.focused_output.addView(wlr_xdg_surface);
+ self.input_manager.default_seat.focused_output.addView(wlr_xdg_surface);
}
/// This event is raised when the layer_shell recieves a new surface from a client.
fn handleNewLayerSurface(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
- const server = @fieldParentPtr(Server, "listen_new_layer_surface", listener.?);
+ const self = @fieldParentPtr(Self, "listen_new_layer_surface", listener.?);
const wlr_layer_surface = @ptrCast(
*c.wlr_layer_surface_v1,
@alignCast(@alignOf(*c.wlr_layer_surface_v1), data),
@@ -178,7 +178,7 @@ pub const Server = struct {
// If the new layer surface does not have an output assigned to it, use the
// first output or close the surface if none are available.
if (wlr_layer_surface.output == null) {
- if (server.root.outputs.first) |node| {
+ if (self.root.outputs.first) |node| {
const output = &node.data;
Log.Debug.log(
"New layer surface had null output, assigning it to output {}",