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

fix(terminal/Sreen): selectionString across pages

Browse Source 
Newlines after rows should only be omitted on the final row of the
entire SELECTION, not on the final row of each page/chunk.
This commit is contained in:
Qwerasd
2024-04-03 20:03:25 -04:00
parent fa5646e762
commit 8be145ec1f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/terminal/Screen.zig
View File

@ -1355,14 +1355,14 @@ pub fn selectionString(self: *Screen, alloc: Allocator, opts: SelectionString) !
defer if (mapbuilder) |*b| b.deinit(); defer if (mapbuilder) |*b| b.deinit();
const sel_ordered = opts.sel.ordered(self, .forward); const sel_ordered = opts.sel.ordered(self, .forward);
const sel_start = start: { const sel_start: Pin = start: {
var start = sel_ordered.start(); var start: Pin = sel_ordered.start();
const cell = start.rowAndCell().cell; const cell = start.rowAndCell().cell;
if (cell.wide == .spacer_tail) start.x -= 1; if (cell.wide == .spacer_tail) start.x -= 1;
break :start start; break :start start;
}; };
const sel_end = end: { const sel_end: Pin = end: {
var end = sel_ordered.end(); var end: Pin = sel_ordered.end();
const cell = end.rowAndCell().cell; const cell = end.rowAndCell().cell;
switch (cell.wide) { switch (cell.wide) {
.narrow, .wide => {}, .narrow, .wide => {},
@ -1433,7 +1433,9 @@ pub fn selectionString(self: *Screen, alloc: Allocator, opts: SelectionString) !
} }
} }
if (row_count < rows.len - 1 and const is_final_row = sel_end.page == chunk.page and sel_end.y == chunk.start + row_count;
if (!is_final_row and
(!row.wrap or sel_ordered.rectangle)) (!row.wrap or sel_ordered.rectangle))
{ {
try strbuilder.append('\n'); try strbuilder.append('\n');