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

terminal/kitty-gfx: transmission only sends response when no more chunks

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-08-23 22:01:21 -07:00
parent bf7054eeb6
commit 35f1a9a478
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/terminal/kitty/graphics_exec.zig
View File

@ -41,11 +41,10 @@ pub fn execute(
return null; return null;
} }
log.debug("executing kitty graphics command: {}", .{cmd: { log.debug("executing kitty graphics command: quiet={} control={}", .{
var copy = cmd.*; cmd.quiet,
copy.data = ""; cmd.control,
break :cmd copy; });
}});
const resp_: ?Response = switch (cmd.control) { const resp_: ?Response = switch (cmd.control) {
.query => query(alloc, cmd), .query => query(alloc, cmd),
@ -132,6 +131,7 @@ fn transmit(
// both transmit and transmit and display. The display might also be // both transmit and transmit and display. The display might also be
// deferred if it is multi-chunk. // deferred if it is multi-chunk.
if (load.display) |d| { if (load.display) |d| {
assert(!load.more);
var d_copy = d; var d_copy = d;
d_copy.image_id = load.image.id; d_copy.image_id = load.image.id;
return display(alloc, terminal, &.{ return display(alloc, terminal, &.{
@ -140,6 +140,9 @@ fn transmit(
}); });
} }
// If there are more chunks expected we do not respond.
if (load.more) return .{};
// After the image is added, set the ID in case it changed // After the image is added, set the ID in case it changed
result.id = load.image.id; result.id = load.image.id;
@ -245,6 +248,7 @@ fn loadAndAddImage(
cmd: *Command, cmd: *Command,
) !struct { ) !struct {
image: Image, image: Image,
more: bool = false,
display: ?command.Display = null, display: ?command.Display = null,
} { } {
const t = cmd.transmission().?; const t = cmd.transmission().?;
@ -257,7 +261,7 @@ fn loadAndAddImage(
try loading.addData(alloc, cmd.data); try loading.addData(alloc, cmd.data);
// If we have more then we're done // If we have more then we're done
if (t.more_chunks) return .{ .image = loading.image }; if (t.more_chunks) return .{ .image = loading.image, .more = true };
// We have no more chunks. We're going to be completing the // We have no more chunks. We're going to be completing the
// image so we want to destroy the pointer to the loading // image so we want to destroy the pointer to the loading
@ -290,7 +294,7 @@ fn loadAndAddImage(
errdefer alloc.destroy(loading_ptr); errdefer alloc.destroy(loading_ptr);
loading_ptr.* = loading; loading_ptr.* = loading;
storage.loading = loading_ptr; storage.loading = loading_ptr;
return .{ .image = loading.image }; return .{ .image = loading.image, .more = true };
} }
// Dump the image data before it is decompressed // Dump the image data before it is decompressed