gregor/jprototerm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix cell shifting regression

Browse Source
This commit is contained in:
Gregor Lohaus
2026-05-31 16:58:11 +02:00
parent 9b7247a4e0
commit 9903e9174f
1 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/com/gregor/jprototerm/GhosttyTerminalRenderer.java
View File

@@ -51,7 +51,6 @@ final class GhosttyTerminalRenderer extends TerminalRenderer {
private final TerminalMetrics metrics; private final TerminalMetrics metrics;
// Decoded kitty images for this renderer's pane (kitty graphics state is per-terminal). // Decoded kitty images for this renderer's pane (kitty graphics state is per-terminal).
private final Map<KittyImageKey, Image> kittyImageCache = new HashMap<>(); private final Map<KittyImageKey, Image> kittyImageCache = new HashMap<>();
private final StringBuilder textRun = new StringBuilder(256);
GhosttyTerminalRenderer(TerminalMetrics metrics) { GhosttyTerminalRenderer(TerminalMetrics metrics) {
this.metrics = metrics; this.metrics = metrics;
@@ -372,49 +371,14 @@ final class GhosttyTerminalRenderer extends TerminalRenderer {
double cellWidth, double cellWidth,
double lineHeight double lineHeight
) { ) {
StringBuilder run = textRun;
run.setLength(0);
Color runForeground = null;
int runStartColumn = 0;
int previousColumn = -1;
for (RenderCell cell : row.cells()) { for (RenderCell cell : row.cells()) {
if (cell.kittyPlaceholder().isPresent() || cell.codepoints().length == 0) { if (cell.kittyPlaceholder().isPresent() || cell.codepoints().length == 0) {
flushTextRun(gc, run, runForeground, left, baseline, cellWidth, lineHeight, row.row(), runStartColumn);
runForeground = null;
previousColumn = -1;
continue; continue;
} }
Color fg = cellForegroundColor(cell); gc.setFill(cellForegroundColor(cell));
if (run.length() == 0 || fg != runForeground || cell.column() != previousColumn + 1) { gc.fillText(cell.text(), left + (cell.column() * cellWidth), baseline + (row.row() * lineHeight));
flushTextRun(gc, run, runForeground, left, baseline, cellWidth, lineHeight, row.row(), runStartColumn);
runForeground = fg;
runStartColumn = cell.column();
} }
run.append(cell.text());
previousColumn = cell.column();
}
flushTextRun(gc, run, runForeground, left, baseline, cellWidth, lineHeight, row.row(), runStartColumn);
}
private static void flushTextRun(
GraphicsContext gc,
StringBuilder run,
Color foreground,
double left,
double baseline,
double cellWidth,
double lineHeight,
int row,
int startColumn
) {
if (run.length() == 0) {
return;
}
gc.setFill(foreground);
gc.fillText(run.toString(), left + (startColumn * cellWidth), baseline + (row * lineHeight));
run.setLength(0);
} }
// Background override for a cell: null means the pane default background already covers it. // Background override for a cell: null means the pane default background already covers it.