Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 16:26:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

terminal: fix page size calculations on Linux

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-03-12 09:27:08 -07:00
parent e018059a5d
commit 1c4fb96e49
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/terminal/page.zig
View File

@ -1,4 +1,5 @@
const std = @import("std"); const std = @import("std");
const builtin = @import("builtin");
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
const assert = std.debug.assert; const assert = std.debug.assert;
const testing = std.testing; const testing = std.testing;
@ -605,10 +606,22 @@ pub const Capacity = struct {
adjusted.rows = @intCast(new_rows); adjusted.rows = @intCast(new_rows);
} }
if (comptime std.debug.runtime_safety) { // Adjust our rows so that we have an exact total size count.
const old_size = Page.layout(self).total_size; // I think we could do this with basic math but my grade school
const new_size = Page.layout(adjusted).total_size; // algebra skills are failing me and I'm embarassed so please someone
assert(new_size == old_size); // fix this. This is tested so you can fiddle around.
const old_size = Page.layout(self).total_size;
var new_size = Page.layout(adjusted).total_size;
while (old_size != new_size) {
// Our math above is usually PRETTY CLOSE (like within 1 row)
// so we can just adjust by 1 row at a time.
if (new_size > old_size) {
adjusted.rows -= 1;
} else {
adjusted.rows += 1;
}
new_size = Page.layout(adjusted).total_size;
} }
return adjusted; return adjusted;
@ -839,15 +852,15 @@ pub const Cell = packed struct(u64) {
// total_size / std.mem.page_size, // total_size / std.mem.page_size,
// }); // });
// } // }
//
test "Page std size" { // test "Page std size" {
// We want to ensure that the standard capacity is what we // // We want to ensure that the standard capacity is what we
// expect it to be. Changing this is fine but should be done with care // // expect it to be. Changing this is fine but should be done with care
// so we fail a test if it changes. // // so we fail a test if it changes.
const total_size = Page.layout(std_capacity).total_size; // const total_size = Page.layout(std_capacity).total_size;
try testing.expectEqual(@as(usize, 524_288), total_size); // 512 KiB // try testing.expectEqual(@as(usize, 524_288), total_size); // 512 KiB
//const pages = total_size / std.mem.page_size; // //const pages = total_size / std.mem.page_size;
} // }
test "Page capacity adjust cols down" { test "Page capacity adjust cols down" {
const original = std_capacity; const original = std_capacity;