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

code: refactor layoutExternal

Browse Source 
- Use an arena allocator, cleaner and should be faster.
- Simplify construction of the command to be run
This commit is contained in:
Isaac Freund 2020-06-19 14:20:29 +02:00
parent 37a98e1a7a
commit aae89356a1
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
river/Output.zig
View File

@ -228,44 +228,34 @@ test "parse window configuration" {
/// Execute an external layout function, parse its output and apply the layout /// Execute an external layout function, parse its output and apply the layout
/// to the output. /// to the output.
fn layoutExternal(self: *Self, visible_count: u32, output_tags: u32) !void { fn layoutExternal(self: *Self, visible_count: u32, output_tags: u32) !void {
const border_width = self.root.server.config.border_width; const config = self.root.server.config;
const view_padding = self.root.server.config.view_padding; const xy_offset = @intCast(i32, config.border_width + config.outer_padding + config.view_padding);
const outer_padding = self.root.server.config.outer_padding; const delta_size = (config.border_width + config.view_padding) * 2;
const xy_offset = @intCast(i32, border_width + outer_padding + view_padding); const layout_width = @intCast(u32, self.usable_box.width) - config.outer_padding * 2;
const delta_size = (border_width + view_padding) * 2; const layout_height = @intCast(u32, self.usable_box.height) - config.outer_padding * 2;
const layout_width = @intCast(u32, self.usable_box.width) - outer_padding * 2;
const layout_height = @intCast(u32, self.usable_box.height) - outer_padding * 2; var arena = std.heap.ArenaAllocator.init(util.allocator);
defer arena.deinit();
// Assemble command // Assemble command
const parameters = std.fmt.allocPrint(util.allocator, "{} {} {d} {} {}", .{ const layout_command = std.fmt.allocPrint(&arena.allocator, "{} {} {} {d} {} {}", .{
self.layout,
visible_count, visible_count,
self.master_count, self.master_count,
self.master_factor, self.master_factor,
layout_width, layout_width,
layout_height, layout_height,
}) catch @panic("Out of memory."); }) catch @panic("Out of memory.");
defer util.allocator.free(parameters); const cmd = [_][]const u8{ "/bin/sh", "-c", layout_command };
const layout_command = try std.mem.join(util.allocator, " ", &[_][]const u8{
self.layout,
parameters,
});
defer util.allocator.free(layout_command);
const cmd = [_][]const u8{
"/bin/sh",
"-c",
layout_command,
};
// Execute layout executable // Execute layout executable
// TODO abort after 1 second // TODO abort after 1 second
const child = try std.ChildProcess.init(&cmd, util.allocator); const child = try std.ChildProcess.init(&cmd, &arena.allocator);
defer child.deinit();
child.stdin_behavior = .Ignore; child.stdin_behavior = .Ignore;
child.stdout_behavior = .Pipe; child.stdout_behavior = .Pipe;
try std.ChildProcess.spawn(child); try std.ChildProcess.spawn(child);
const max_output_size = 400 * 1024; const max_output_size = 400 * 1024;
const buffer = try child.stdout.?.inStream().readAllAlloc(util.allocator, max_output_size); const buffer = try child.stdout.?.inStream().readAllAlloc(&arena.allocator, max_output_size);
defer util.allocator.free(buffer);
const term = try child.wait(); const term = try child.wait();
switch (term) { switch (term) {
.Exited, .Signal, .Stopped, .Unknown => |code| { .Exited, .Signal, .Stopped, .Unknown => |code| {
@ -276,8 +266,7 @@ fn layoutExternal(self: *Self, visible_count: u32, output_tags: u32) !void {
} }
// Parse layout command output // Parse layout command output
var view_boxen = std.ArrayList(Box).init(util.allocator); var view_boxen = std.ArrayList(Box).init(&arena.allocator);
defer view_boxen.deinit();
var parse_it = std.mem.split(buffer, "\n"); var parse_it = std.mem.split(buffer, "\n");
while (parse_it.next()) |token| { while (parse_it.next()) |token| {
if (std.mem.eql(u8, token, "")) break; if (std.mem.eql(u8, token, "")) break;