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

renderer/metal: almost bring back kitty images, some bugs

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-03-13 10:16:00 -07:00
parent 9eeaa0d0a9
commit 0a3f431d1b
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/renderer/Metal.zig
View File

@ -681,11 +681,8 @@ pub fn updateFrame(
// If we have Kitty graphics data, we enter a SLOW SLOW SLOW path. // If we have Kitty graphics data, we enter a SLOW SLOW SLOW path.
// We only do this if the Kitty image state is dirty meaning only if // We only do this if the Kitty image state is dirty meaning only if
// it changes. // it changes.
// TODO(paged-terminal) if (state.terminal.screen.kitty_images.dirty) {
if (false) { try self.prepKittyGraphics(state.terminal);
if (state.terminal.screen.kitty_images.dirty) {
try self.prepKittyGraphics(state.terminal);
}
} }
break :critical .{ break :critical .{
@ -1231,11 +1228,8 @@ fn prepKittyGraphics(
// The top-left and bottom-right corners of our viewport in screen // The top-left and bottom-right corners of our viewport in screen
// points. This lets us determine offsets and containment of placements. // points. This lets us determine offsets and containment of placements.
const top = (terminal.point.Viewport{}).toScreen(&t.screen); const top = t.screen.pages.getTopLeft(.viewport);
const bot = (terminal.point.Viewport{ const bot = t.screen.pages.getBottomRight(.viewport).?;
.x = t.screen.cols - 1,
.y = t.screen.rows - 1,
}).toScreen(&t.screen);
// Go through the placements and ensure the image is loaded on the GPU. // Go through the placements and ensure the image is loaded on the GPU.
var it = storage.placements.iterator(); var it = storage.placements.iterator();
@ -1252,15 +1246,20 @@ fn prepKittyGraphics(
// If the selection isn't within our viewport then skip it. // If the selection isn't within our viewport then skip it.
const rect = p.rect(image, t); const rect = p.rect(image, t);
if (rect.top_left.y > bot.y) continue; if (bot.before(rect.top_left)) continue;
if (rect.bottom_right.y < top.y) continue; if (rect.bottom_right.before(top)) continue;
// If the top left is outside the viewport we need to calc an offset // If the top left is outside the viewport we need to calc an offset
// so that we render (0, 0) with some offset for the texture. // so that we render (0, 0) with some offset for the texture.
const offset_y: u32 = if (rect.top_left.y < t.screen.viewport) offset_y: { const offset_y: u32 = if (rect.top_left.before(top)) offset_y: {
const offset_cells = t.screen.viewport - rect.top_left.y; break :offset_y 0;
const offset_pixels = offset_cells * self.grid_metrics.cell_height; // TODO(paged-terminal)
break :offset_y @intCast(offset_pixels); // const vp_y = t.screen.pages.pointFromPin(.screen, top).?.screen.y;
// const img_y = t.screen.pages.pointFromPin(.screen, rect.top_left).?.screen.y;
// std.log.warn("vp_y={} img_y={}", .{ vp_y, img_y });
// const offset_cells = vp_y - img_y;
// const offset_pixels = offset_cells * self.grid_metrics.cell_height;
// break :offset_y @intCast(offset_pixels);
} else 0; } else 0;
// We need to prep this image for upload if it isn't in the cache OR // We need to prep this image for upload if it isn't in the cache OR
@ -1304,7 +1303,13 @@ fn prepKittyGraphics(
} }
// Convert our screen point to a viewport point // Convert our screen point to a viewport point
const viewport = p.point.toViewport(&t.screen); const viewport = t.screen.pages.pointFromPin(.viewport, p.pin.*) orelse {
log.warn(
"failed to convert image point to viewport point image_id={} placement_id={}",
.{ kv.key_ptr.image_id, kv.key_ptr.placement_id.id },
);
continue;
};
// Calculate the source rectangle // Calculate the source rectangle
const source_x = @min(image.width, p.source_x); const source_x = @min(image.width, p.source_x);
@ -1326,8 +1331,8 @@ fn prepKittyGraphics(
if (image.width > 0 and image.height > 0) { if (image.width > 0 and image.height > 0) {
try self.image_placements.append(self.alloc, .{ try self.image_placements.append(self.alloc, .{
.image_id = kv.key_ptr.image_id, .image_id = kv.key_ptr.image_id,
.x = @intCast(p.point.x), .x = @intCast(p.pin.x),
.y = @intCast(viewport.y), .y = @intCast(viewport.viewport.y),
.z = p.z, .z = p.z,
.width = dest_width, .width = dest_width,
.height = dest_height, .height = dest_height,