From 760f0c057c9c2e5acb5ab45821c73398551f07f1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 6 Dec 2022 13:25:52 -0800
Subject: [PATCH] renderer: use new shaper structs

---
 src/renderer/Metal.zig  | 8 ++++----
 src/renderer/OpenGL.zig | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/renderer/Metal.zig b/src/renderer/Metal.zig
index dd5cd0ab4..6c5bb601f 100644
--- a/src/renderer/Metal.zig
+++ b/src/renderer/Metal.zig
@@ -178,7 +178,7 @@ pub fn init(alloc: Allocator, options: renderer.Options) !Metal {
     // Create the font shaper. We initially create a shaper that can support
     // a width of 160 which is a common width for modern screens to help
     // avoid allocations later.
-    var shape_buf = try alloc.alloc(font.Shaper.Cell, 160);
+    var shape_buf = try alloc.alloc(font.shape.Cell, 160);
     errdefer alloc.free(shape_buf);
     var font_shaper = try font.Shaper.init(shape_buf);
     errdefer font_shaper.deinit();
@@ -691,7 +691,7 @@ pub fn setScreenSize(self: *Metal, _: renderer.ScreenSize) !void {
 
     // Update our shaper
     // TODO: don't reallocate if it is close enough (but bigger)
-    var shape_buf = try self.alloc.alloc(font.Shaper.Cell, grid_size.columns * 2);
+    var shape_buf = try self.alloc.alloc(font.shape.Cell, grid_size.columns * 2);
     errdefer self.alloc.free(shape_buf);
     self.alloc.free(self.font_shaper.cell_buf);
     self.font_shaper.cell_buf = shape_buf;
@@ -817,8 +817,8 @@ pub fn updateCell(
     selection: ?terminal.Selection,
     screen: *terminal.Screen,
     cell: terminal.Screen.Cell,
-    shaper_cell: font.Shaper.Cell,
-    shaper_run: font.Shaper.TextRun,
+    shaper_cell: font.shape.Cell,
+    shaper_run: font.shape.TextRun,
     x: usize,
     y: usize,
 ) !bool {
diff --git a/src/renderer/OpenGL.zig b/src/renderer/OpenGL.zig
index 3116a325f..84ac20dd5 100644
--- a/src/renderer/OpenGL.zig
+++ b/src/renderer/OpenGL.zig
@@ -160,7 +160,7 @@ const GPUCellMode = enum(u8) {
 
 pub fn init(alloc: Allocator, options: renderer.Options) !OpenGL {
     // Create the initial font shaper
-    var shape_buf = try alloc.alloc(font.Shaper.Cell, 1);
+    var shape_buf = try alloc.alloc(font.shape.Cell, 1);
     errdefer alloc.free(shape_buf);
     var shaper = try font.Shaper.init(shape_buf);
     errdefer shaper.deinit();
@@ -863,8 +863,8 @@ pub fn updateCell(
     selection: ?terminal.Selection,
     screen: *terminal.Screen,
     cell: terminal.Screen.Cell,
-    shaper_cell: font.Shaper.Cell,
-    shaper_run: font.Shaper.TextRun,
+    shaper_cell: font.shape.Cell,
+    shaper_run: font.shape.TextRun,
     x: usize,
     y: usize,
 ) !bool {
@@ -1101,7 +1101,7 @@ pub fn setScreenSize(self: *OpenGL, dim: renderer.ScreenSize) !void {
     }
 
     // Update our shaper
-    var shape_buf = try self.alloc.alloc(font.Shaper.Cell, grid_size.columns * 2);
+    var shape_buf = try self.alloc.alloc(font.shape.Cell, grid_size.columns * 2);
     errdefer self.alloc.free(shape_buf);
     self.alloc.free(self.font_shaper.cell_buf);
     self.font_shaper.cell_buf = shape_buf;