Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Server a toplevel struct

Browse Source
This commit is contained in:
Isaac Freund 2020-05-02 16:20:32 +02:00
parent ce05dddea3
commit 5dbff2c018
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
6 changed files with 167 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/decoration_manager.zig
View File

@ -2,7 +2,7 @@ const std = @import("std");
const c = @import("c.zig"); const c = @import("c.zig");
const Decoration = @import("decoration.zig").Decoration; const Decoration = @import("decoration.zig").Decoration;
const Server = @import("server.zig").Server; const Server = @import("server.zig");
pub const DecorationManager = struct { pub const DecorationManager = struct {
const Self = @This(); const Self = @This();

2
src/input_manager.zig
View File

@ -3,7 +3,7 @@ const c = @import("c.zig");
const Log = @import("log.zig").Log; const Log = @import("log.zig").Log;
const Seat = @import("seat.zig").Seat; const Seat = @import("seat.zig").Seat;
const Server = @import("server.zig").Server; const Server = @import("server.zig");
pub const InputManager = struct { pub const InputManager = struct {
const Self = @This(); const Self = @This();

2
src/main.zig
View File

@ -2,7 +2,7 @@ const std = @import("std");
const c = @import("c.zig"); const c = @import("c.zig");
const Log = @import("log.zig").Log; const Log = @import("log.zig").Log;
const Server = @import("server.zig").Server; const Server = @import("server.zig");
pub fn main() !void { pub fn main() !void {
Log.init(Log.Debug); Log.init(Log.Debug);

2
src/render.zig
View File

@ -4,7 +4,7 @@ const c = @import("c.zig");
const Box = @import("box.zig"); const Box = @import("box.zig");
const LayerSurface = @import("layer_surface.zig").LayerSurface; const LayerSurface = @import("layer_surface.zig").LayerSurface;
const Output = @import("output.zig").Output; const Output = @import("output.zig").Output;
const Server = @import("server.zig").Server; const Server = @import("server.zig");
const View = @import("view.zig").View; const View = @import("view.zig").View;
const ViewStack = @import("view_stack.zig").ViewStack; const ViewStack = @import("view_stack.zig").ViewStack;

2
src/root.zig
View File

@ -5,7 +5,7 @@ const util = @import("util.zig");
const Box = @import("box.zig").Box; const Box = @import("box.zig").Box;
const Log = @import("log.zig").Log; const Log = @import("log.zig").Log;
const Output = @import("output.zig").Output; const Output = @import("output.zig").Output;
const Server = @import("server.zig").Server; const Server = @import("server.zig");
const Seat = @import("seat.zig").Seat; const Seat = @import("seat.zig").Seat;
const View = @import("view.zig").View; const View = @import("view.zig").View;
const ViewStack = @import("view_stack.zig").ViewStack; const ViewStack = @import("view_stack.zig").ViewStack;

7
src/server.zig
View File

@ -1,4 +1,7 @@
const Self = @This();
const std = @import("std"); const std = @import("std");
const c = @import("c.zig"); const c = @import("c.zig");
const Config = @import("config.zig").Config; const Config = @import("config.zig").Config;
@ -10,9 +13,6 @@ const Root = @import("root.zig").Root;
const View = @import("view.zig").View; const View = @import("view.zig").View;
const ViewStack = @import("view_stack.zig").ViewStack; const ViewStack = @import("view_stack.zig").ViewStack;
pub const Server = struct {
const Self = @This();
allocator: *std.mem.Allocator, allocator: *std.mem.Allocator,
wl_display: *c.wl_display, wl_display: *c.wl_display,
@ -202,4 +202,3 @@ pub const Server = struct {
const output = @ptrCast(*Output, @alignCast(@alignOf(*Output), wlr_layer_surface.output.*.data)); const output = @ptrCast(*Output, @alignCast(@alignOf(*Output), wlr_layer_surface.output.*.data));
output.addLayerSurface(wlr_layer_surface) catch unreachable; output.addLayerSurface(wlr_layer_surface) catch unreachable;
} }
};