Render terminal rows as JavaFX nodes
This commit is contained in:
Gregor Lohaus
@@ -259,7 +259,7 @@ public final class Compositor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private TerminalPaneNode createNode(TerminalPane pane) {
|
private TerminalPaneNode createNode(TerminalPane pane) {
|
||||||
TerminalPaneNode node = new TerminalPaneNode(pane);
|
TerminalPaneNode node = new TerminalPaneNode(pane, metrics);
|
||||||
node.setOnMousePressed(event -> handleMousePressed(pane, event));
|
node.setOnMousePressed(event -> handleMousePressed(pane, event));
|
||||||
node.setOnMouseReleased(event -> handleMouseReleased(pane, event));
|
node.setOnMouseReleased(event -> handleMouseReleased(pane, event));
|
||||||
node.setOnMouseDragged(event -> handleMouseDragged(pane, event));
|
node.setOnMouseDragged(event -> handleMouseDragged(pane, event));
|
||||||
|
|||||||
@@ -1,78 +1,645 @@
|
|||||||
package com.gregor.jprototerm;
|
package com.gregor.jprototerm;
|
||||||
|
|
||||||
|
import dev.jlibghostty.KittyImageCompression;
|
||||||
|
import dev.jlibghostty.KittyImageFormat;
|
||||||
|
import dev.jlibghostty.KittyImageSnapshot;
|
||||||
|
import dev.jlibghostty.KittyPlacement;
|
||||||
|
import dev.jlibghostty.KittyPlacementLayer;
|
||||||
|
import dev.jlibghostty.KittyPlaceholder;
|
||||||
|
import dev.jlibghostty.KittyRenderInfo;
|
||||||
|
import dev.jlibghostty.RenderCell;
|
||||||
|
import dev.jlibghostty.RenderColor;
|
||||||
|
import dev.jlibghostty.RenderCursorStyle;
|
||||||
|
import dev.jlibghostty.RenderRow;
|
||||||
|
import dev.jlibghostty.RenderStateSnapshot;
|
||||||
|
import javafx.geometry.Rectangle2D;
|
||||||
|
import javafx.scene.Node;
|
||||||
import javafx.scene.canvas.Canvas;
|
import javafx.scene.canvas.Canvas;
|
||||||
import javafx.scene.canvas.GraphicsContext;
|
import javafx.scene.canvas.GraphicsContext;
|
||||||
|
import javafx.scene.image.Image;
|
||||||
|
import javafx.scene.image.ImageView;
|
||||||
|
import javafx.scene.image.PixelFormat;
|
||||||
|
import javafx.scene.image.WritableImage;
|
||||||
|
import javafx.scene.layout.Pane;
|
||||||
import javafx.scene.layout.Region;
|
import javafx.scene.layout.Region;
|
||||||
|
import javafx.scene.paint.Color;
|
||||||
|
import javafx.scene.shape.Line;
|
||||||
|
import javafx.scene.shape.Rectangle;
|
||||||
|
import javafx.scene.text.FontSmoothingType;
|
||||||
|
|
||||||
|
import java.io.ByteArrayInputStream;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* JavaFX node for one terminal pane. It is intentionally a thin adapter: the terminal model
|
* JavaFX node for one terminal pane. The pane is composed from JavaFX primitives: one node per
|
||||||
* still provides snapshots and the existing renderer still draws the cell grid, but drawing is
|
* terminal row, kitty graphics as ImageView nodes, plus background/cursor/border nodes.
|
||||||
* now local to this node's own canvas instead of a shared compositor canvas.
|
|
||||||
*/
|
*/
|
||||||
final class TerminalPaneNode extends Region {
|
final class TerminalPaneNode extends Region {
|
||||||
|
private static final int DIRTY_PARTIAL = 1;
|
||||||
|
private static final int DIRTY_FULL = 2;
|
||||||
|
|
||||||
|
private static final Color DEFAULT_FOREGROUND = Color.rgb(225, 229, 235);
|
||||||
|
private static final Color SELECTED_BACKGROUND = Color.rgb(52, 92, 140);
|
||||||
|
private static final Color PANE_BACKGROUND = Color.rgb(9, 10, 12);
|
||||||
|
private static final Map<Integer, Color> COLOR_CACHE = new HashMap<>();
|
||||||
|
|
||||||
private final TerminalPane pane;
|
private final TerminalPane pane;
|
||||||
private final Canvas canvas = new Canvas();
|
private final TerminalMetrics metrics;
|
||||||
|
private final Rectangle background = new Rectangle();
|
||||||
|
private final Pane belowImageLayer = new Pane();
|
||||||
|
private final Pane rowLayer = new Pane();
|
||||||
|
private final Pane cursorLayer = new Pane();
|
||||||
|
private final Pane aboveImageLayer = new Pane();
|
||||||
|
private final Rectangle topPadding = new Rectangle();
|
||||||
|
private final Rectangle bottomPadding = new Rectangle();
|
||||||
|
private final Rectangle border = new Rectangle();
|
||||||
|
private final Map<Integer, TerminalRowNode> rows = new HashMap<>();
|
||||||
|
private final Map<KittyImageKey, Image> kittyImageCache = new HashMap<>();
|
||||||
private long drawnContentVersion = Long.MIN_VALUE;
|
private long drawnContentVersion = Long.MIN_VALUE;
|
||||||
private double drawnWidth = -1.0;
|
private double drawnWidth = -1.0;
|
||||||
private double drawnHeight = -1.0;
|
private double drawnHeight = -1.0;
|
||||||
|
|
||||||
TerminalPaneNode(TerminalPane pane) {
|
TerminalPaneNode(TerminalPane pane, TerminalMetrics metrics) {
|
||||||
this.pane = pane;
|
this.pane = pane;
|
||||||
|
this.metrics = metrics;
|
||||||
setPickOnBounds(true);
|
setPickOnBounds(true);
|
||||||
getChildren().add(canvas);
|
setClip(new Rectangle());
|
||||||
|
background.setFill(PANE_BACKGROUND);
|
||||||
|
border.setFill(Color.TRANSPARENT);
|
||||||
|
getChildren().setAll(background, belowImageLayer, rowLayer, cursorLayer, aboveImageLayer, border);
|
||||||
|
rowLayer.getChildren().setAll(topPadding, bottomPadding);
|
||||||
}
|
}
|
||||||
|
|
||||||
void discard() {
|
void discard() {
|
||||||
drawnContentVersion = Long.MIN_VALUE;
|
drawnContentVersion = Long.MIN_VALUE;
|
||||||
drawnWidth = -1.0;
|
drawnWidth = -1.0;
|
||||||
drawnHeight = -1.0;
|
drawnHeight = -1.0;
|
||||||
|
rows.clear();
|
||||||
|
rowLayer.getChildren().setAll(topPadding, bottomPadding);
|
||||||
|
belowImageLayer.getChildren().clear();
|
||||||
|
aboveImageLayer.getChildren().clear();
|
||||||
|
cursorLayer.getChildren().clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void renderFull(boolean active) {
|
void renderFull(boolean active) {
|
||||||
prepareCanvas();
|
prepareGeometry();
|
||||||
paint(active, true);
|
RenderStateSnapshot snapshot = pane.snapshotFull();
|
||||||
|
boolean withKitty = pane.kittyEnabled() && hasKittyGraphics();
|
||||||
|
updateRowsFull(snapshot);
|
||||||
|
updateKittyGraphics(snapshot, withKitty);
|
||||||
|
updateCursor(snapshot);
|
||||||
|
updateBorder(active);
|
||||||
|
markDrawn();
|
||||||
}
|
}
|
||||||
|
|
||||||
void renderIncremental(boolean active) {
|
void renderIncremental(boolean active) {
|
||||||
if (drawnContentVersion == Long.MIN_VALUE || prepareCanvas()) {
|
boolean geometryChanged = prepareGeometry();
|
||||||
paint(active, true);
|
boolean withKitty = pane.kittyEnabled() && hasKittyGraphics();
|
||||||
|
if (drawnContentVersion == Long.MIN_VALUE || geometryChanged || withKitty) {
|
||||||
|
renderFull(active);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (drawnContentVersion == pane.contentVersion()) {
|
if (drawnContentVersion == pane.contentVersion()) {
|
||||||
|
updateBorder(active);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
paint(active, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean prepareCanvas() {
|
RenderStateSnapshot snapshot = pane.snapshot();
|
||||||
boolean changed = canvas.getWidth() != pane.width() || canvas.getHeight() != pane.height();
|
int dirty = snapshot == null ? DIRTY_FULL : snapshot.dirty();
|
||||||
if (changed) {
|
if (dirty == DIRTY_FULL) {
|
||||||
canvas.setWidth(Math.max(0.0, pane.width()));
|
updateRowsFull(snapshot);
|
||||||
canvas.setHeight(Math.max(0.0, pane.height()));
|
} else if (dirty == DIRTY_PARTIAL) {
|
||||||
drawnWidth = pane.width();
|
updateDirtyRows(snapshot);
|
||||||
drawnHeight = pane.height();
|
|
||||||
drawnContentVersion = Long.MIN_VALUE;
|
|
||||||
}
|
}
|
||||||
return changed || drawnWidth != pane.width() || drawnHeight != pane.height();
|
updateKittyGraphics(snapshot, false);
|
||||||
|
updateCursor(snapshot);
|
||||||
|
updateBorder(active);
|
||||||
|
markDrawn();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void paint(boolean active, boolean full) {
|
private boolean prepareGeometry() {
|
||||||
GraphicsContext gc = canvas.getGraphicsContext2D();
|
double width = Math.max(0.0, pane.width());
|
||||||
gc.save();
|
double height = Math.max(0.0, pane.height());
|
||||||
gc.translate(-pane.x(), -pane.y());
|
boolean changed = drawnWidth != width || drawnHeight != height;
|
||||||
if (full) {
|
resize(width, height);
|
||||||
pane.paintFull(gc, active);
|
background.setWidth(width);
|
||||||
|
background.setHeight(height);
|
||||||
|
resizeLayer(belowImageLayer, width, height);
|
||||||
|
resizeLayer(rowLayer, width, height);
|
||||||
|
resizeLayer(cursorLayer, width, height);
|
||||||
|
resizeLayer(aboveImageLayer, width, height);
|
||||||
|
border.setWidth(Math.max(0.0, width - 1.0));
|
||||||
|
border.setHeight(Math.max(0.0, height - 1.0));
|
||||||
|
border.relocate(0.5, 0.5);
|
||||||
|
Node clip = getClip();
|
||||||
|
if (clip instanceof Rectangle rectangle) {
|
||||||
|
rectangle.setWidth(width);
|
||||||
|
rectangle.setHeight(height);
|
||||||
|
}
|
||||||
|
return changed;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void resizeLayer(Pane layer, double width, double height) {
|
||||||
|
layer.resizeRelocate(0.0, 0.0, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateRowsFull(RenderStateSnapshot snapshot) {
|
||||||
|
if (snapshot == null) {
|
||||||
|
rows.clear();
|
||||||
|
rowLayer.getChildren().setAll(topPadding, bottomPadding);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Node> ordered = new ArrayList<>(snapshot.renderRows().size() + 2);
|
||||||
|
ordered.add(topPadding);
|
||||||
|
ordered.add(bottomPadding);
|
||||||
|
for (RenderRow row : snapshot.renderRows()) {
|
||||||
|
TerminalRowNode node = rowNode(row.row());
|
||||||
|
node.render(row);
|
||||||
|
ordered.add(node);
|
||||||
|
}
|
||||||
|
rows.keySet().retainAll(snapshot.renderRows().stream().map(RenderRow::row).toList());
|
||||||
|
rowLayer.getChildren().setAll(ordered);
|
||||||
|
updateVerticalPadding(snapshot);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateDirtyRows(RenderStateSnapshot snapshot) {
|
||||||
|
for (RenderRow row : snapshot.renderRows()) {
|
||||||
|
if (row.dirty()) {
|
||||||
|
rowNode(row.row()).render(row);
|
||||||
|
updateDirtyVerticalPadding(snapshot, row);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private TerminalRowNode rowNode(int row) {
|
||||||
|
return rows.computeIfAbsent(row, ignored -> {
|
||||||
|
TerminalRowNode created = new TerminalRowNode(metrics);
|
||||||
|
if (!rowLayer.getChildren().contains(created)) {
|
||||||
|
rowLayer.getChildren().add(created);
|
||||||
|
}
|
||||||
|
return created;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateVerticalPadding(RenderStateSnapshot snapshot) {
|
||||||
|
List<RenderRow> renderRows = snapshot.renderRows();
|
||||||
|
if (renderRows.isEmpty()) {
|
||||||
|
topPadding.setVisible(false);
|
||||||
|
bottomPadding.setVisible(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
double width = pane.width();
|
||||||
|
double top = TerminalMetrics.PADDING;
|
||||||
|
double contentBottom = top + snapshot.rows() * metrics.lineHeight();
|
||||||
|
topPadding.setVisible(true);
|
||||||
|
topPadding.setFill(rowEdgeBackground(renderRows.get(0), true));
|
||||||
|
topPadding.relocate(0.0, 0.0);
|
||||||
|
topPadding.setWidth(width);
|
||||||
|
topPadding.setHeight(top);
|
||||||
|
|
||||||
|
bottomPadding.setVisible(true);
|
||||||
|
bottomPadding.setFill(rowEdgeBackground(renderRows.get(renderRows.size() - 1), true));
|
||||||
|
bottomPadding.relocate(0.0, contentBottom);
|
||||||
|
bottomPadding.setWidth(width);
|
||||||
|
bottomPadding.setHeight(Math.max(0.0, pane.height() - contentBottom));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateDirtyVerticalPadding(RenderStateSnapshot snapshot, RenderRow row) {
|
||||||
|
if (row.row() == 0) {
|
||||||
|
topPadding.setVisible(true);
|
||||||
|
topPadding.setFill(rowEdgeBackground(row, true));
|
||||||
|
topPadding.relocate(0.0, 0.0);
|
||||||
|
topPadding.setWidth(pane.width());
|
||||||
|
topPadding.setHeight(TerminalMetrics.PADDING);
|
||||||
|
}
|
||||||
|
if (row.row() == snapshot.rows() - 1) {
|
||||||
|
double contentBottom = TerminalMetrics.PADDING + snapshot.rows() * metrics.lineHeight();
|
||||||
|
bottomPadding.setVisible(true);
|
||||||
|
bottomPadding.setFill(rowEdgeBackground(row, true));
|
||||||
|
bottomPadding.relocate(0.0, contentBottom);
|
||||||
|
bottomPadding.setWidth(pane.width());
|
||||||
|
bottomPadding.setHeight(Math.max(0.0, pane.height() - contentBottom));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateCursor(RenderStateSnapshot snapshot) {
|
||||||
|
cursorLayer.getChildren().clear();
|
||||||
|
if (snapshot == null || !snapshot.cursorVisible() || !snapshot.cursorViewportHasValue()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
double x = TerminalMetrics.PADDING + (snapshot.cursorViewportX() * metrics.cellWidth());
|
||||||
|
double y = TerminalMetrics.PADDING + (snapshot.cursorViewportY() * metrics.lineHeight());
|
||||||
|
double cellWidth = metrics.cellWidth();
|
||||||
|
double lineHeight = metrics.lineHeight();
|
||||||
|
RenderCursorStyle style = snapshot.cursorStyle();
|
||||||
|
if (style == RenderCursorStyle.BAR) {
|
||||||
|
Line line = new Line(x + 0.5, y + 2.0, x + 0.5, y + lineHeight - 2.0);
|
||||||
|
line.setStroke(DEFAULT_FOREGROUND);
|
||||||
|
line.setStrokeWidth(1.5);
|
||||||
|
cursorLayer.getChildren().add(line);
|
||||||
|
} else if (style == RenderCursorStyle.UNDERLINE) {
|
||||||
|
Line line = new Line(x + 1.0, y + lineHeight - 2.0, x + cellWidth - 1.0, y + lineHeight - 2.0);
|
||||||
|
line.setStroke(DEFAULT_FOREGROUND);
|
||||||
|
line.setStrokeWidth(1.5);
|
||||||
|
cursorLayer.getChildren().add(line);
|
||||||
|
} else if (style == RenderCursorStyle.BLOCK) {
|
||||||
|
Rectangle rectangle = new Rectangle(x + 0.5, y + 1.0, Math.max(1.0, cellWidth - 1.0), Math.max(1.0, lineHeight - 2.0));
|
||||||
|
rectangle.setFill(Color.rgb(225, 229, 235, 0.28));
|
||||||
|
cursorLayer.getChildren().add(rectangle);
|
||||||
} else {
|
} else {
|
||||||
pane.paintIncremental(gc, active);
|
Rectangle rectangle = new Rectangle(x + 0.5, y + 1.0, Math.max(1.0, cellWidth - 1.0), Math.max(1.0, lineHeight - 2.0));
|
||||||
|
rectangle.setFill(Color.TRANSPARENT);
|
||||||
|
rectangle.setStroke(DEFAULT_FOREGROUND);
|
||||||
|
rectangle.setStrokeWidth(1.5);
|
||||||
|
cursorLayer.getChildren().add(rectangle);
|
||||||
}
|
}
|
||||||
gc.restore();
|
}
|
||||||
|
|
||||||
|
private void updateBorder(boolean active) {
|
||||||
|
border.setStroke(active ? Color.rgb(87, 166, 255) : Color.rgb(52, 57, 65));
|
||||||
|
border.setStrokeWidth(active ? 2.0 : 1.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateKittyGraphics(RenderStateSnapshot snapshot, boolean withKitty) {
|
||||||
|
belowImageLayer.getChildren().clear();
|
||||||
|
aboveImageLayer.getChildren().clear();
|
||||||
|
if (!withKitty || snapshot == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<KittyPlaceholderKey, KittyPlaceholderBounds> placeholderBounds = kittyPlaceholderBounds(snapshot);
|
||||||
|
addKittyGraphics(belowImageLayer, KittyPlacementLayer.BELOW_TEXT, placeholderBounds);
|
||||||
|
addKittyGraphics(aboveImageLayer, KittyPlacementLayer.ABOVE_TEXT, placeholderBounds);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addKittyGraphics(Pane layer, KittyPlacementLayer placementLayer, Map<KittyPlaceholderKey, KittyPlaceholderBounds> placeholderBounds) {
|
||||||
|
pane.kittyGraphics().ifPresent(graphics -> {
|
||||||
|
for (KittyPlacement placement : graphics.placements(placementLayer)) {
|
||||||
|
Image image = imageFor(placement);
|
||||||
|
if (image == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
ImageView view = placement.virtual()
|
||||||
|
? virtualKittyView(placement, image, placeholderBounds)
|
||||||
|
: pinnedKittyView(placement, image);
|
||||||
|
if (view != null) {
|
||||||
|
layer.getChildren().add(view);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private ImageView pinnedKittyView(KittyPlacement placement, Image image) {
|
||||||
|
KittyRenderInfo renderInfo = placement.renderInfo().orElse(null);
|
||||||
|
if (renderInfo == null || !renderInfo.viewportVisible()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
double sourceX = renderInfo.sourceX();
|
||||||
|
double sourceY = renderInfo.sourceY();
|
||||||
|
double sourceWidth = renderInfo.sourceWidth();
|
||||||
|
double sourceHeight = renderInfo.sourceHeight();
|
||||||
|
if (sourceWidth <= 0.0 || sourceHeight <= 0.0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
double x = TerminalMetrics.PADDING + (renderInfo.viewportColumn() * metrics.cellWidth()) + placement.xOffset();
|
||||||
|
double y = TerminalMetrics.PADDING + (renderInfo.viewportRow() * metrics.lineHeight()) + placement.yOffset();
|
||||||
|
double width = renderInfo.pixelWidth() > 0 ? renderInfo.pixelWidth() : renderInfo.gridColumns() * metrics.cellWidth();
|
||||||
|
double height = renderInfo.pixelHeight() > 0 ? renderInfo.pixelHeight() : renderInfo.gridRows() * metrics.lineHeight();
|
||||||
|
return imageView(image, sourceX, sourceY, sourceWidth, sourceHeight, x, y, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ImageView virtualKittyView(KittyPlacement placement, Image image, Map<KittyPlaceholderKey, KittyPlaceholderBounds> placeholderBounds) {
|
||||||
|
KittyPlaceholderBounds bounds = placeholderBounds.get(new KittyPlaceholderKey(placement.imageId(), placement.placementId()));
|
||||||
|
if (bounds == null) {
|
||||||
|
bounds = placeholderBounds.get(new KittyPlaceholderKey(placement.imageId(), 0));
|
||||||
|
}
|
||||||
|
if (bounds == null && placement.placementId() == 0) {
|
||||||
|
bounds = placeholderBounds.entrySet().stream()
|
||||||
|
.filter(entry -> entry.getKey().imageId() == placement.imageId())
|
||||||
|
.map(Map.Entry::getValue)
|
||||||
|
.findFirst()
|
||||||
|
.orElse(null);
|
||||||
|
}
|
||||||
|
if (bounds == null || bounds.isEmpty()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
SourceRect source = sourceRect(placement, image);
|
||||||
|
if (source.width() <= 0.0 || source.height() <= 0.0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
long gridColumns = gridColumns(placement, bounds);
|
||||||
|
long gridRows = gridRows(placement, bounds);
|
||||||
|
double sourceCellWidth = source.width() / Math.max(1L, gridColumns);
|
||||||
|
double sourceCellHeight = source.height() / Math.max(1L, gridRows);
|
||||||
|
|
||||||
|
double sourceX = source.x() + (bounds.minSourceColumn * sourceCellWidth);
|
||||||
|
double sourceY = source.y() + (bounds.minSourceRow * sourceCellHeight);
|
||||||
|
double sourceWidth = bounds.sourceColumns() * sourceCellWidth;
|
||||||
|
double sourceHeight = bounds.sourceRows() * sourceCellHeight;
|
||||||
|
double x = TerminalMetrics.PADDING + (bounds.minColumn * metrics.cellWidth());
|
||||||
|
double y = TerminalMetrics.PADDING + (bounds.minRow * metrics.lineHeight());
|
||||||
|
double availableWidth = bounds.columns() * metrics.cellWidth();
|
||||||
|
double availableHeight = bounds.rows() * metrics.lineHeight();
|
||||||
|
if (sourceWidth <= 0.0 || sourceHeight <= 0.0 || availableWidth <= 0.0 || availableHeight <= 0.0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
double scale = Math.min(availableWidth / sourceWidth, availableHeight / sourceHeight);
|
||||||
|
return imageView(image, sourceX, sourceY, sourceWidth, sourceHeight, x, y, sourceWidth * scale, sourceHeight * scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ImageView imageView(Image image, double sourceX, double sourceY, double sourceWidth, double sourceHeight,
|
||||||
|
double x, double y, double width, double height) {
|
||||||
|
if (width <= 0.0 || height <= 0.0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
ImageView view = new ImageView(image);
|
||||||
|
view.setViewport(new Rectangle2D(sourceX, sourceY, sourceWidth, sourceHeight));
|
||||||
|
view.setFitWidth(width);
|
||||||
|
view.setFitHeight(height);
|
||||||
|
view.setPreserveRatio(false);
|
||||||
|
view.relocate(x, y);
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean hasKittyGraphics() {
|
||||||
|
return pane.kittyGraphics()
|
||||||
|
.map(graphics -> !graphics.placements().isEmpty())
|
||||||
|
.orElse(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Image imageFor(KittyPlacement placement) {
|
||||||
|
return placement.image().map(snapshot -> {
|
||||||
|
byte[] data = snapshot.data();
|
||||||
|
KittyImageKey key = KittyImageKey.of(snapshot, data);
|
||||||
|
Image cached = kittyImageCache.get(key);
|
||||||
|
if (cached != null) {
|
||||||
|
return cached;
|
||||||
|
}
|
||||||
|
|
||||||
|
kittyImageCache.keySet().removeIf(existing -> existing.id() == snapshot.id());
|
||||||
|
Image decoded = decodeImage(snapshot, data);
|
||||||
|
if (decoded != null) {
|
||||||
|
kittyImageCache.put(key, decoded);
|
||||||
|
}
|
||||||
|
return decoded;
|
||||||
|
}).orElse(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Image decodeImage(KittyImageSnapshot snapshot, byte[] data) {
|
||||||
|
if (snapshot.compression() != KittyImageCompression.NONE) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (snapshot.format() == KittyImageFormat.PNG) {
|
||||||
|
return new Image(new ByteArrayInputStream(data));
|
||||||
|
}
|
||||||
|
|
||||||
|
int width = Math.toIntExact(snapshot.width());
|
||||||
|
int height = Math.toIntExact(snapshot.height());
|
||||||
|
WritableImage image = new WritableImage(width, height);
|
||||||
|
|
||||||
|
if (snapshot.format() == KittyImageFormat.RGBA) {
|
||||||
|
image.getPixelWriter().setPixels(0, 0, width, height, PixelFormat.getByteBgraInstance(), rgbaToBgra(data), 0, width * 4);
|
||||||
|
} else if (snapshot.format() == KittyImageFormat.RGB) {
|
||||||
|
image.getPixelWriter().setPixels(0, 0, width, height, PixelFormat.getByteRgbInstance(), data, 0, width * 3);
|
||||||
|
}
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] rgbaToBgra(byte[] rgba) {
|
||||||
|
byte[] bgra = new byte[rgba.length];
|
||||||
|
for (int i = 0; i + 3 < rgba.length; i += 4) {
|
||||||
|
bgra[i] = rgba[i + 2];
|
||||||
|
bgra[i + 1] = rgba[i + 1];
|
||||||
|
bgra[i + 2] = rgba[i];
|
||||||
|
bgra[i + 3] = rgba[i + 3];
|
||||||
|
}
|
||||||
|
return bgra;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<KittyPlaceholderKey, KittyPlaceholderBounds> kittyPlaceholderBounds(RenderStateSnapshot snapshot) {
|
||||||
|
Map<KittyPlaceholderKey, KittyPlaceholderBounds> result = new HashMap<>();
|
||||||
|
for (RenderRow row : snapshot.renderRows()) {
|
||||||
|
for (RenderCell cell : row.cells()) {
|
||||||
|
cell.kittyPlaceholder().ifPresent(placeholder -> {
|
||||||
|
KittyPlaceholderKey key = new KittyPlaceholderKey(placeholder.imageId(), placeholder.placementId());
|
||||||
|
result.computeIfAbsent(key, ignored -> new KittyPlaceholderBounds()).include(row.row(), cell.column(), placeholder);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static long gridColumns(KittyPlacement placement, KittyPlaceholderBounds bounds) {
|
||||||
|
if (placement.columns() > 0) {
|
||||||
|
return placement.columns();
|
||||||
|
}
|
||||||
|
return Math.max(bounds.maxSourceColumn + 1, bounds.sourceColumns());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static long gridRows(KittyPlacement placement, KittyPlaceholderBounds bounds) {
|
||||||
|
if (placement.rows() > 0) {
|
||||||
|
return placement.rows();
|
||||||
|
}
|
||||||
|
return Math.max(bounds.maxSourceRow + 1, bounds.sourceRows());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static SourceRect sourceRect(KittyPlacement placement, Image image) {
|
||||||
|
double sourceX = placement.sourceX();
|
||||||
|
double sourceY = placement.sourceY();
|
||||||
|
double sourceWidth = placement.sourceWidth() > 0 ? placement.sourceWidth() : image.getWidth() - sourceX;
|
||||||
|
double sourceHeight = placement.sourceHeight() > 0 ? placement.sourceHeight() : image.getHeight() - sourceY;
|
||||||
|
return new SourceRect(sourceX, sourceY, Math.min(sourceWidth, image.getWidth() - sourceX), Math.min(sourceHeight, image.getHeight() - sourceY));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void markDrawn() {
|
||||||
drawnContentVersion = pane.contentVersion();
|
drawnContentVersion = pane.contentVersion();
|
||||||
drawnWidth = pane.width();
|
drawnWidth = pane.width();
|
||||||
drawnHeight = pane.height();
|
drawnHeight = pane.height();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
private static Color cellBackgroundColor(RenderCell cell) {
|
||||||
protected void layoutChildren() {
|
if (cell.inverse()) {
|
||||||
canvas.relocate(0.0, 0.0);
|
var fg = cell.foreground();
|
||||||
|
return fg.isPresent() ? toFxColor(fg.get()) : DEFAULT_FOREGROUND;
|
||||||
|
}
|
||||||
|
var bg = cell.background();
|
||||||
|
return bg.isPresent() ? toFxColor(bg.get()) : PANE_BACKGROUND;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Color rowEdgeBackground(RenderRow row, boolean firstCell) {
|
||||||
|
List<RenderCell> cells = row.cells();
|
||||||
|
if (cells.isEmpty()) {
|
||||||
|
return PANE_BACKGROUND;
|
||||||
|
}
|
||||||
|
return cellBackgroundColor(firstCell ? cells.get(0) : cells.get(cells.size() - 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Color toFxColor(RenderColor color) {
|
||||||
|
int key = (color.red() << 16) | (color.green() << 8) | color.blue();
|
||||||
|
Color cached = COLOR_CACHE.get(key);
|
||||||
|
if (cached != null) {
|
||||||
|
return cached;
|
||||||
|
}
|
||||||
|
if (COLOR_CACHE.size() >= 4096) {
|
||||||
|
COLOR_CACHE.clear();
|
||||||
|
}
|
||||||
|
Color created = Color.rgb(color.red(), color.green(), color.blue());
|
||||||
|
COLOR_CACHE.put(key, created);
|
||||||
|
return created;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final class TerminalRowNode extends Region {
|
||||||
|
private final TerminalMetrics metrics;
|
||||||
|
private final Canvas canvas = new Canvas();
|
||||||
|
|
||||||
|
private TerminalRowNode(TerminalMetrics metrics) {
|
||||||
|
this.metrics = metrics;
|
||||||
|
getChildren().add(canvas);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void render(RenderRow row) {
|
||||||
|
double paneWidth = ((Region) getParent()).getWidth();
|
||||||
|
double top = TerminalMetrics.PADDING;
|
||||||
|
double cellWidth = metrics.cellWidth();
|
||||||
|
double lineHeight = metrics.lineHeight();
|
||||||
|
double rowTop = Math.floor(top + row.row() * lineHeight);
|
||||||
|
double rowBottom = Math.ceil(top + (row.row() + 1) * lineHeight);
|
||||||
|
double rowHeight = Math.max(1.0, rowBottom - rowTop);
|
||||||
|
resizeRelocate(0.0, rowTop, paneWidth, rowHeight);
|
||||||
|
canvas.setWidth(Math.max(0.0, paneWidth));
|
||||||
|
canvas.setHeight(rowHeight);
|
||||||
|
|
||||||
|
GraphicsContext gc = canvas.getGraphicsContext2D();
|
||||||
|
gc.clearRect(0.0, 0.0, paneWidth, rowHeight);
|
||||||
|
gc.setFontSmoothingType(FontSmoothingType.LCD);
|
||||||
|
gc.setFont(metrics.font());
|
||||||
|
|
||||||
|
paintSidePadding(gc, row, paneWidth, rowHeight);
|
||||||
|
drawRow(gc, row, rowTop, cellWidth, lineHeight);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void paintSidePadding(GraphicsContext gc, RenderRow row, double paneWidth, double bandHeight) {
|
||||||
|
int columns = row.cells().size();
|
||||||
|
if (columns == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
double contentLeft = TerminalMetrics.PADDING;
|
||||||
|
double contentRight = contentLeft + columns * metrics.cellWidth();
|
||||||
|
gc.setFill(rowEdgeBackground(row, true));
|
||||||
|
gc.fillRect(0.0, 0.0, contentLeft, bandHeight);
|
||||||
|
gc.setFill(rowEdgeBackground(row, false));
|
||||||
|
gc.fillRect(contentRight, 0.0, paneWidth - contentRight, bandHeight);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void drawRow(GraphicsContext gc, RenderRow row, double rowTop, double cellWidth, double lineHeight) {
|
||||||
|
double contentTop = TerminalMetrics.PADDING + row.row() * lineHeight;
|
||||||
|
double localCellTop = contentTop - rowTop;
|
||||||
|
double baseline = TerminalMetrics.PADDING + metrics.baselineOffset() + row.row() * lineHeight - rowTop;
|
||||||
|
for (RenderCell cell : row.cells()) {
|
||||||
|
if (cell.kittyPlaceholder().isPresent()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
double x = TerminalMetrics.PADDING + cell.column() * cellWidth;
|
||||||
|
var fgOpt = cell.foreground();
|
||||||
|
var bgOpt = cell.background();
|
||||||
|
Color fg = fgOpt.isPresent() ? toFxColor(fgOpt.get()) : DEFAULT_FOREGROUND;
|
||||||
|
Color bg = bgOpt.isPresent() ? toFxColor(bgOpt.get()) : null;
|
||||||
|
|
||||||
|
if (cell.inverse()) {
|
||||||
|
Color swappedBg = fg;
|
||||||
|
fg = (bg != null) ? bg : PANE_BACKGROUND;
|
||||||
|
bg = swappedBg;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bg != null) {
|
||||||
|
gc.setFill(bg);
|
||||||
|
gc.fillRect(x, localCellTop, cellWidth, lineHeight);
|
||||||
|
}
|
||||||
|
if (cell.selected()) {
|
||||||
|
gc.setFill(SELECTED_BACKGROUND);
|
||||||
|
gc.fillRect(x, localCellTop, cellWidth, lineHeight);
|
||||||
|
}
|
||||||
|
if (cell.codepoints().length == 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
gc.setFill(fg);
|
||||||
|
gc.fillText(cell.text(), x, baseline);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private record KittyImageKey(long id, long number, long width, long height, KittyImageFormat format, int dataLength) {
|
||||||
|
private static KittyImageKey of(KittyImageSnapshot snapshot, byte[] data) {
|
||||||
|
return new KittyImageKey(
|
||||||
|
snapshot.id(),
|
||||||
|
snapshot.number(),
|
||||||
|
snapshot.width(),
|
||||||
|
snapshot.height(),
|
||||||
|
snapshot.format(),
|
||||||
|
data.length
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private record KittyPlaceholderKey(long imageId, long placementId) {
|
||||||
|
}
|
||||||
|
|
||||||
|
private record SourceRect(double x, double y, double width, double height) {
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final class KittyPlaceholderBounds {
|
||||||
|
private int minRow = Integer.MAX_VALUE;
|
||||||
|
private int maxRow = Integer.MIN_VALUE;
|
||||||
|
private int minColumn = Integer.MAX_VALUE;
|
||||||
|
private int maxColumn = Integer.MIN_VALUE;
|
||||||
|
private long minSourceRow = Long.MAX_VALUE;
|
||||||
|
private long maxSourceRow = Long.MIN_VALUE;
|
||||||
|
private long minSourceColumn = Long.MAX_VALUE;
|
||||||
|
private long maxSourceColumn = Long.MIN_VALUE;
|
||||||
|
|
||||||
|
private void include(int row, int column, KittyPlaceholder placeholder) {
|
||||||
|
minRow = Math.min(minRow, row);
|
||||||
|
maxRow = Math.max(maxRow, row);
|
||||||
|
minColumn = Math.min(minColumn, column);
|
||||||
|
maxColumn = Math.max(maxColumn, column);
|
||||||
|
minSourceRow = Math.min(minSourceRow, placeholder.sourceRow());
|
||||||
|
maxSourceRow = Math.max(maxSourceRow, placeholder.sourceRow());
|
||||||
|
minSourceColumn = Math.min(minSourceColumn, placeholder.sourceColumn());
|
||||||
|
maxSourceColumn = Math.max(maxSourceColumn, placeholder.sourceColumn());
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isEmpty() {
|
||||||
|
return minRow == Integer.MAX_VALUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int rows() {
|
||||||
|
return maxRow - minRow + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int columns() {
|
||||||
|
return maxColumn - minColumn + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
private long sourceRows() {
|
||||||
|
return maxSourceRow - minSourceRow + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
private long sourceColumns() {
|
||||||
|
return maxSourceColumn - minSourceColumn + 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user