mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-10-06 01:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to latest zig which renames @min/@max

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-10-19 10:42:31 -07:00
parent 366ea2ff4c
commit 79f69885ca
8 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Window.zig
View File

@@ -605,7 +605,7 @@ fn queueWrite(self: *Window, data: []const u8) !void {
while (i < data.len) {
const req = try self.write_req_pool.get();
const buf = try self.write_buf_pool.get();
const end = @minimum(data.len, i + buf.len);
const end = @min(data.len, i + buf.len);
std.mem.copy(u8, buf, data[i..end]);
try self.pty_stream.write(
.{ .req = req },
@@ -1007,7 +1007,7 @@ fn scrollCallback(window: glfw.Window, xoff: f64, yoff: f64) void {
// Positive is up
const sign: isize = if (yoff > 0) -1 else 1;
const delta: isize = sign * @maximum(@divFloor(win.grid.size.rows, 15), 1);
const delta: isize = sign * @max(@divFloor(win.grid.size.rows, 15), 1);
log.info("scroll: delta={}", .{delta});
win.terminal.scrollViewport(.{ .delta = delta }) catch |err|
log.err("error scrolling viewport err={}", .{err});
@@ -1450,13 +1450,13 @@ fn posToViewport(self: Window, xpos: f64, ypos: f64) terminal.point.Viewport {
// Can be off the screen if the user drags it out, so max
// it out on our available columns
break :x @minimum(x, self.terminal.cols - 1);
break :x @min(x, self.terminal.cols - 1);
},
.y = if (ypos < 0) 0 else y: {
const cell_height = @floatCast(f64, self.grid.cell_size.height);
const y = @floatToInt(usize, ypos / cell_height);
break :y @minimum(y, self.terminal.rows - 1);
break :y @min(y, self.terminal.rows - 1);
},
};
}