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

Rebase

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-09-05 11:41:40 -07:00
parent 480d262bc1
commit 90d250a3ba
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Grid.zig
View File

@ -366,7 +366,7 @@ pub fn rebuildCells(self: *Grid, term: *Terminal) !void {
for (try shaper.shape(run)) |shaper_cell| { for (try shaper.shape(run)) |shaper_cell| {
assert(try self.updateCell( assert(try self.updateCell(
term, term,
row[shaper_cell.x], row.getCell(shaper_cell.x),
shaper_cell, shaper_cell,
run, run,
shaper_cell.x, shaper_cell.x,

16
src/font/Shaper.zig
View File

@ -248,8 +248,8 @@ test "run iterator" {
// Spaces should be part of a run // Spaces should be part of a run
{ {
var screen = try terminal.Screen.init(alloc, 3, 10, 0); var screen = try terminal.Screen.init(alloc, 3, 10, 0);
defer screen.deinit(alloc); defer screen.deinit();
screen.testWriteString("ABCD EFG"); try screen.testWriteString("ABCD EFG");
var shaper = testdata.shaper; var shaper = testdata.shaper;
var it = shaper.runIterator(screen.getRow(.{ .screen = 0 })); var it = shaper.runIterator(screen.getRow(.{ .screen = 0 }));
@ -317,8 +317,8 @@ test "shape inconsolata ligs" {
{ {
var screen = try terminal.Screen.init(alloc, 3, 5, 0); var screen = try terminal.Screen.init(alloc, 3, 5, 0);
defer screen.deinit(alloc); defer screen.deinit();
screen.testWriteString(">="); try screen.testWriteString(">=");
var shaper = testdata.shaper; var shaper = testdata.shaper;
var it = shaper.runIterator(screen.getRow(.{ .screen = 0 })); var it = shaper.runIterator(screen.getRow(.{ .screen = 0 }));
@ -335,8 +335,8 @@ test "shape inconsolata ligs" {
{ {
var screen = try terminal.Screen.init(alloc, 3, 5, 0); var screen = try terminal.Screen.init(alloc, 3, 5, 0);
defer screen.deinit(alloc); defer screen.deinit();
screen.testWriteString("==="); try screen.testWriteString("===");
var shaper = testdata.shaper; var shaper = testdata.shaper;
var it = shaper.runIterator(screen.getRow(.{ .screen = 0 })); var it = shaper.runIterator(screen.getRow(.{ .screen = 0 }));
@ -361,8 +361,8 @@ test "shape emoji width" {
{ {
var screen = try terminal.Screen.init(alloc, 3, 5, 0); var screen = try terminal.Screen.init(alloc, 3, 5, 0);
defer screen.deinit(alloc); defer screen.deinit();
screen.testWriteString("👍"); try screen.testWriteString("👍");
var shaper = testdata.shaper; var shaper = testdata.shaper;
var it = shaper.runIterator(screen.getRow(.{ .screen = 0 })); var it = shaper.runIterator(screen.getRow(.{ .screen = 0 }));