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

terminal2: sel adjust left

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-03-05 22:18:52 -08:00
parent 1f01b2c4c9
commit 8194cb7edb
2 changed files with 69 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/terminal/Selection.zig
View File

@ -330,6 +330,7 @@ pub fn adjust(self: Selection, screen: *Screen, adjustment: Adjustment) Selectio
return result;
}
// X
test "Selection: adjust right" {
const testing = std.testing;
var screen = try Screen.init(testing.allocator, 5, 10, 0);
@ -376,6 +377,7 @@ test "Selection: adjust right" {
}
}
// X
test "Selection: adjust left" {
const testing = std.testing;
var screen = try Screen.init(testing.allocator, 5, 10, 0);

86
src/terminal2/Selection.zig
View File

@ -139,25 +139,22 @@ pub fn adjust(
// } else {
// result.end.y += 1;
// },
//
// .left => {
// // Step left, wrapping to the next row up at the start of each new line,
// // until we find a non-empty cell.
// //
// // This iterator emits the start point first, throw it out.
// var iterator = result.end.iterator(screen, .left_up);
// _ = iterator.next();
// while (iterator.next()) |next| {
// if (screen.getCell(
// .screen,
// next.y,
// next.x,
// ).char != 0) {
// result.end = next;
// break;
// }
// }
// },
.left => {
var it = s.pages.cellIterator(
.left_up,
.{ .screen = .{} },
s.pages.pointFromPin(.screen, self.end.*).?,
);
_ = it.next();
while (it.next()) |next| {
const rac = next.rowAndCell();
if (rac.cell.hasText()) {
self.end.* = next;
break;
}
}
},
.right => {
// Step right, wrapping to the next row down at the start of each new line,
@ -275,6 +272,57 @@ test "Selection: adjust right" {
}
}
test "Selection: adjust left" {
const testing = std.testing;
var s = try Screen.init(testing.allocator, 5, 10, 0);
defer s.deinit();
try s.testWriteString("A1234\nB5678\nC1234\nD5678");
// Simple movement left
{
var sel = try Selection.init(
&s,
s.pages.pin(.{ .screen = .{ .x = 5, .y = 1 } }).?,
s.pages.pin(.{ .screen = .{ .x = 3, .y = 3 } }).?,
false,
);
defer sel.deinit(&s);
sel.adjust(&s, .left);
// Start line
try testing.expectEqual(point.Point{ .screen = .{
.x = 5,
.y = 1,
} }, s.pages.pointFromPin(.screen, sel.start.*).?);
try testing.expectEqual(point.Point{ .screen = .{
.x = 2,
.y = 3,
} }, s.pages.pointFromPin(.screen, sel.end.*).?);
}
// Already at beginning of the line.
{
var sel = try Selection.init(
&s,
s.pages.pin(.{ .screen = .{ .x = 5, .y = 1 } }).?,
s.pages.pin(.{ .screen = .{ .x = 0, .y = 3 } }).?,
false,
);
defer sel.deinit(&s);
sel.adjust(&s, .left);
// Start line
try testing.expectEqual(point.Point{ .screen = .{
.x = 5,
.y = 1,
} }, s.pages.pointFromPin(.screen, sel.start.*).?);
try testing.expectEqual(point.Point{ .screen = .{
.x = 4,
.y = 2,
} }, s.pages.pointFromPin(.screen, sel.end.*).?);
}
}
test "Selection: order, standard" {
const testing = std.testing;
const alloc = testing.allocator;