Skip to content

Commit 828627c

Browse files
diegosouzapwclaude
andcommitted
fix(patch): correct hunk line counts in ghostty-wasm-api.patch after rebase
Regenerated with git diff --recount after dynamic theme rebase introduced stale @@ counts from the merge conflict resolution. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent 740452a commit 828627c

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

patches/ghostty-wasm-api.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ index 4f8fef88e..ca9fb1d4d 100644
2929
#include <ghostty/vt/key.h>
3030
diff --git a/include/ghostty/vt/terminal.h b/include/ghostty/vt/terminal.h
3131
new file mode 100644
32-
index 000000000..c0a9c6604
32+
index 000000000..e1cd14e70
3333
--- /dev/null
3434
+++ b/include/ghostty/vt/terminal.h
35-
@@ -0,0 +1,292 @@
35+
@@ -0,0 +1,296 @@
3636
+/**
3737
+ * @file terminal.h
3838
+ *
@@ -330,10 +330,10 @@ index 000000000..c0a9c6604
330330
+
331331
+#endif /* GHOSTTY_VT_TERMINAL_H */
332332
diff --git a/src/lib_vt.zig b/src/lib_vt.zig
333-
index 03a883e20..9d74a46dc 100644
333+
index 03a883e20..154a9daae 100644
334334
--- a/src/lib_vt.zig
335335
+++ b/src/lib_vt.zig
336-
@@ -140,6 +140,46 @@ comptime {
336+
@@ -140,6 +140,48 @@ comptime {
337337
@export(&c.sgr_unknown_partial, .{ .name = "ghostty_sgr_unknown_partial" });
338338
@export(&c.sgr_attribute_tag, .{ .name = "ghostty_sgr_attribute_tag" });
339339
@export(&c.sgr_attribute_value, .{ .name = "ghostty_sgr_attribute_value" });
@@ -383,7 +383,7 @@ index 03a883e20..9d74a46dc 100644
383383
// On Wasm we need to export our allocator convenience functions.
384384
if (builtin.target.cpu.arch.isWasm()) {
385385
diff --git a/src/terminal/PageList.zig b/src/terminal/PageList.zig
386-
index 29f414e03..6b5ab19ab 100644
386+
index 29f414e03..6b5ab19f5 100644
387387
--- a/src/terminal/PageList.zig
388388
+++ b/src/terminal/PageList.zig
389389
@@ -5,6 +5,7 @@ const PageList = @This();
@@ -425,7 +425,7 @@ index 29f414e03..6b5ab19ab 100644
425425
page.* = .{
426426
.data = .initBuf(.init(page_buf), layout),
427427
diff --git a/src/terminal/c/main.zig b/src/terminal/c/main.zig
428-
index bc92597f5..5814a0559 100644
428+
index bc92597f5..ea656a013 100644
429429
--- a/src/terminal/c/main.zig
430430
+++ b/src/terminal/c/main.zig
431431
@@ -4,6 +4,7 @@ pub const key_event = @import("key_event.zig");
@@ -436,7 +436,7 @@ index bc92597f5..5814a0559 100644
436436

437437
// The full C API, unexported.
438438
pub const osc_new = osc.new;
439-
@@ -52,6 +53,47 @@ pub const key_encoder_encode = key_encode.encode;
439+
@@ -52,6 +53,49 @@ pub const key_encoder_encode = key_encode.encode;
440440

441441
pub const paste_is_safe = paste.is_safe;
442442

@@ -486,7 +486,7 @@ index bc92597f5..5814a0559 100644
486486
test {
487487
_ = color;
488488
_ = osc;
489-
@@ -59,6 +101,7 @@ test {
489+
@@ -59,6 +103,7 @@ test {
490490
_ = key_encode;
491491
_ = paste;
492492
_ = sgr;
@@ -496,10 +496,10 @@ index bc92597f5..5814a0559 100644
496496
_ = @import("../../lib/allocator.zig");
497497
diff --git a/src/terminal/c/terminal.zig b/src/terminal/c/terminal.zig
498498
new file mode 100644
499-
index 000000000..1ce4f1919
499+
index 000000000..186b37dde
500500
--- /dev/null
501501
+++ b/src/terminal/c/terminal.zig
502-
@@ -0,0 +1,1168 @@
502+
@@ -0,0 +1,1184 @@
503503
+//! C API wrapper for Terminal
504504
+//!
505505
+//! This provides a minimal, high-performance interface to Ghostty's Terminal

0 commit comments

Comments
 (0)