Compare commits

...
30 Commits
Author SHA1 Message Date
Codex 412c69cc36 Replace native dialogs with app sheets
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Has been cancelled
2026-07-15 15:03:56 +00:00
Codex 813a74f3ef Simplify server page actions
Gitea Smoke / smoke (push) Successful in 2s
Gitea Android APK / build (push) Failing after 1m2s
2026-07-15 14:40:01 +00:00
Codex 0d32e6105a Move secondary navigation into header menu
Gitea Smoke / smoke (push) Successful in 2s
Gitea Android APK / build (push) Failing after 1m33s
2026-07-15 10:37:22 +00:00
Codex 0cf8de3dda Fix Gitea release asset uploads
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Successful in 12m1s
2026-07-15 08:36:33 +00:00
Codex 4f1b24c1c3 Bound Gitea release mirror retries
Gitea Android APK / build (push) Failing after 2s
Gitea Smoke / smoke (push) Successful in 0s
2026-07-15 08:28:54 +00:00
Codex 5c76bc87ba Mirror signed GitHub APKs to Gitea
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Has been cancelled
2026-07-15 08:16:29 +00:00
Codex 9a574ed497 Add structured agent activity panel
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Failing after 8m34s
2026-07-15 07:37:39 +00:00
Codex 2d052cb832 Focus Android client on terminal workflow
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Failing after 10m50s
2026-07-15 07:10:09 +00:00
Codex 1e5f45dcc9 Fix terminal status and content scrolling
Gitea Smoke / smoke (push) Successful in 2s
Gitea Android APK / build (push) Failing after 1m26s
2026-07-15 06:33:30 +00:00
Codex c9284d6222 Align Android terminal themes with server
Gitea Smoke / smoke (push) Successful in 2s
Gitea Android APK / build (push) Failing after 1m31s
2026-07-14 16:21:04 +00:00
Codex 2824fafc32 Polish session controls and server management
Gitea Smoke / smoke (push) Successful in 1s
Gitea Android APK / build (push) Has been cancelled
2026-07-14 16:16:42 +00:00
Codex 974abed278 Connect touch scrolling to tmux history
Gitea Smoke / smoke (push) Successful in 2s
Gitea Android APK / build (push) Failing after 55s
2026-07-14 15:52:43 +00:00
Codex 47af792d62 Pin tmux status above soft keys
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Failing after 8m24s
2026-07-14 15:36:49 +00:00
Codex 0c7dba0ef1 Fix terminal composer and status layout
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Successful in 12m20s
2026-07-14 15:23:22 +00:00
Codex f1eb30cea0 Restore terminal history navigation
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Successful in 12m20s
2026-07-14 14:28:04 +00:00
Codex a25a2d16b6 Make terminal content view selective
Gitea Smoke / smoke (push) Successful in 2s
Gitea Android APK / build (push) Failing after 54s
2026-07-14 05:22:38 +00:00
Codex a88b6cf98d Polish server and session management UI
Gitea Smoke / smoke (push) Successful in 2s
Gitea Android APK / build (push) Failing after 53s
2026-07-13 06:58:51 +00:00
Codex 41e50322be Refine chat and terminal presentation
Gitea Smoke / smoke (push) Successful in 1s
Gitea Android APK / build (push) Successful in 12m12s
2026-07-12 10:12:09 +00:00
Codex f1db46ecbe Replace heuristic reading with chat toggle
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Successful in 12m3s
2026-07-12 09:45:38 +00:00
Codex c0904e6aaa Show live terminal status in chat
Gitea Smoke / smoke (push) Successful in 1s
Gitea Android APK / build (push) Successful in 12m9s
2026-07-12 09:03:14 +00:00
Codex 1d9492aff5 Add structured session chat view
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Failing after 8m24s
2026-07-12 07:24:58 +00:00
Codex 9416fa6518 Show version in terminal header
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Successful in 12m25s
2026-07-12 02:26:32 +00:00
Codex 360e2f3af0 Top align terminal reading mode
Gitea Android APK / build (push) Failing after 57s
Gitea Smoke / smoke (push) Successful in 0s
2026-07-12 02:19:06 +00:00
Codex 0119c7cb0e Add expandable terminal reading summaries
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Failing after 8m54s
2026-07-12 02:14:25 +00:00
Codex daf2990b15 Clear stale terminal frames on resize
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Successful in 12m24s
2026-07-12 02:00:55 +00:00
Codex 96fe5ecb8f Improve mobile session reading and pane layout
Gitea Smoke / smoke (push) Successful in 2s
Gitea Android APK / build (push) Has been cancelled
2026-07-12 01:59:55 +00:00
Codex f103e9e065 Render ANSI dim terminal text
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Successful in 11m47s
2026-07-11 08:41:33 +00:00
Codex 6a1052d437 Insert uploaded image paths
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Successful in 11m50s
2026-07-11 08:11:46 +00:00
Codex 7e028b09d4 Reduce terminal key overflow
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Failing after 8m17s
2026-07-11 08:01:21 +00:00
Codex f6e801defc Rearrange terminal composer controls
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Successful in 12m15s
2026-07-11 03:12:52 +00:00
4 changed files with 2477 additions and 469 deletions
+83 -1
View File
@@ -33,6 +33,88 @@ jobs:
if ! command -v git >/dev/null 2>&1 || ! command -v curl >/dev/null 2>&1 || ! command -v unzip >/dev/null 2>&1; then
install_packages git curl unzip
fi
REF="${GITHUB_REF:-}"
REF_NAME="${GITHUB_REF_NAME:-}"
if [ -z "${REF_NAME}" ]; then
REF_NAME="${REF##*/}"
fi
if [ "${REF#refs/tags/v}" != "${REF}" ]; then
if [ -z "${CLONE_TOKEN:-}" ]; then
echo "Gitea release publishing requires TMUX_GITEA_TOKEN." >&2
exit 1
fi
TAG="${REF_NAME}"
VERSION_NAME="${TAG#v}"
MAJOR="$(printf '%s' "${VERSION_NAME}" | cut -d. -f1)"
MINOR="$(printf '%s' "${VERSION_NAME}" | cut -d. -f2)"
PATCH="$(printf '%s' "${VERSION_NAME}" | cut -d. -f3)"
VERSION_CODE=$((MAJOR * 1000000 + MINOR * 1000 + PATCH))
GITHUB_APK_URL="https://github.com/neatstudio/tmux-browser-android/releases/download/${TAG}/tmux-android.apk"
mkdir -p release
ATTEMPT=1
while [ "${ATTEMPT}" -le 6 ]; do
if curl -fsSL "${GITHUB_APK_URL}" -o release/tmux-android.apk; then
break
fi
rm -f release/tmux-android.apk
echo "Waiting for GitHub release ${TAG} (${ATTEMPT}/6)..."
sleep 10
ATTEMPT=$((ATTEMPT + 1))
done
if [ ! -s release/tmux-android.apk ]; then
echo "GitHub release APK unavailable for ${TAG}." >&2
exit 1
fi
SHA256="$(sha256sum release/tmux-android.apk | cut -d ' ' -f1)"
APK_URL="https://gitea.neatcn.com/tmux/tmux-browser-android/releases/download/${TAG}/tmux-android.apk"
RELEASE_PAGE_URL="https://gitea.neatcn.com/tmux/tmux-browser-android/releases/tag/${TAG}"
cat > release/latest.json << JSON
{
"versionCode": ${VERSION_CODE},
"versionName": "${VERSION_NAME}",
"apkUrl": "${APK_URL}",
"sha256": "${SHA256}",
"releasePageUrl": "${RELEASE_PAGE_URL}",
"minSdk": 26
}
JSON
API_ROOT="https://gitea.neatcn.com/api/v1/repos/tmux/tmux-browser-android"
RELEASE_BODY='{"tag_name":"'"${TAG}"'","target_commitish":"main","name":"tmux Android '"${VERSION_NAME}"'","body":"Android APK for tmux-ui remote testing.","draft":false,"prerelease":false}'
if ! curl -fsSL -X POST \
-H "Authorization: token ${CLONE_TOKEN}" \
-H "Content-Type: application/json" \
-d "${RELEASE_BODY}" \
"${API_ROOT}/releases" \
-o /tmp/gitea-release.json; then
curl -fsSL -H "Authorization: token ${CLONE_TOKEN}" \
"${API_ROOT}/releases/tags/${TAG}" \
-o /tmp/gitea-release.json
fi
RELEASE_ID="$(sed -n 's/^{"id":\([0-9][0-9]*\),.*/\1/p' /tmp/gitea-release.json | head -1)"
if [ -z "${RELEASE_ID}" ]; then
echo "Cannot resolve Gitea release id for ${TAG}." >&2
exit 1
fi
curl -fsSL -X POST -H "Authorization: token ${CLONE_TOKEN}" \
-F "attachment=@release/tmux-android.apk;type=application/vnd.android.package-archive" \
"${API_ROOT}/releases/${RELEASE_ID}/assets?name=tmux-android.apk" \
-o /tmp/gitea-apk-asset.json
curl -fsSL -X POST -H "Authorization: token ${CLONE_TOKEN}" \
-F "attachment=@release/latest.json;type=application/json" \
"${API_ROOT}/releases/${RELEASE_ID}/assets?name=latest.json" \
-o /tmp/gitea-latest-asset.json
echo "Mirrored GitHub release ${TAG} to Gitea."
echo "versionCode=${VERSION_CODE}"
echo "versionName=${VERSION_NAME}"
echo "sha256=${SHA256}"
exit 0
fi
if ! command -v java >/dev/null 2>&1; then
if command -v apk >/dev/null 2>&1; then
install_packages openjdk17-jdk
@@ -166,7 +248,7 @@ jobs:
"${API_ROOT}/releases/tags/${TAG}" \
-o /tmp/gitea-release.json
fi
RELEASE_ID="$(sed -n 's/.*"id":\([0-9][0-9]*\).*/\1/p' /tmp/gitea-release.json | head -1)"
RELEASE_ID="$(sed -n 's/^{"id":\([0-9][0-9]*\),.*/\1/p' /tmp/gitea-release.json | head -1)"
if [ -z "${RELEASE_ID}" ]; then
echo "Cannot resolve Gitea release id." >&2
cat /tmp/gitea-release.json >&2
@@ -0,0 +1,85 @@
package com.neatstudio.tmuxandroid;
import org.json.JSONObject;
final class ConversationMessage {
final String messageId;
final String sessionName;
final String role;
final String contentType;
final String content;
final String status;
final String toolName;
final String parentMessageId;
final String createdAt;
final boolean local;
ConversationMessage(
String messageId,
String sessionName,
String role,
String contentType,
String content,
String status,
String toolName,
String parentMessageId,
String createdAt,
boolean local
) {
this.messageId = messageId;
this.sessionName = sessionName;
this.role = role;
this.contentType = contentType;
this.content = content;
this.status = status;
this.toolName = toolName;
this.parentMessageId = parentMessageId;
this.createdAt = createdAt;
this.local = local;
}
static ConversationMessage fromJson(JSONObject object) {
return new ConversationMessage(
value(object, "messageId", object.optString("id", "")),
object.optString("sessionName", ""),
object.optString("role", "assistant"),
object.optString("contentType", "text"),
object.optString("content", ""),
object.optString("status", "complete"),
object.optString("toolName", ""),
value(object, "parentMessageId", ""),
object.optString("createdAt", ""),
false
);
}
static ConversationMessage localUser(String sessionName, String content) {
long now = System.currentTimeMillis();
return new ConversationMessage(
"local-" + now,
sessionName,
"user",
"text",
content,
"sending",
"",
"",
"~" + now,
true
);
}
boolean isTool() {
return "tool".equals(role)
|| "tool".equals(contentType)
|| "command".equals(contentType)
|| "code".equals(contentType);
}
private static String value(JSONObject object, String key, String fallback) {
if (!object.has(key) || object.isNull(key)) {
return fallback;
}
return object.optString(key, fallback);
}
}
File diff suppressed because it is too large Load Diff
@@ -4,16 +4,22 @@ import android.graphics.Color;
import android.graphics.Typeface;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextPaint;
import android.text.style.BackgroundColorSpan;
import android.text.style.ClickableSpan;
import android.text.style.ForegroundColorSpan;
import android.text.style.StyleSpan;
import android.view.View;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Set;
final class TerminalScreenBuffer {
private static final int DEFAULT_FG = 0xffe6ebf2;
private static final int DEFAULT_BG = Color.TRANSPARENT;
private static final int TERMINAL_BG = 0xff0b0e13;
private int cols;
private int rows;
@@ -27,6 +33,11 @@ final class TerminalScreenBuffer {
private int fg = DEFAULT_FG;
private int bg = DEFAULT_BG;
private boolean bold;
private boolean dim;
interface FocusToggle {
void toggle(String key);
}
TerminalScreenBuffer(int cols, int rows) {
resize(cols, rows);
@@ -35,9 +46,6 @@ final class TerminalScreenBuffer {
void resize(int nextCols, int nextRows) {
nextCols = Math.max(1, nextCols);
nextRows = Math.max(1, nextRows);
Cell[][] previous = cells;
int previousRows = rows;
int previousCols = cols;
cols = nextCols;
rows = nextRows;
cells = new Cell[rows][cols];
@@ -46,21 +54,11 @@ final class TerminalScreenBuffer {
cells[row][col] = new Cell();
}
}
if (previous != null) {
int copyRows = Math.min(previousRows, rows);
int copyCols = Math.min(previousCols, cols);
int previousStart = Math.max(0, previousRows - copyRows);
int nextStart = Math.max(0, rows - copyRows);
for (int row = 0; row < copyRows; row++) {
for (int col = 0; col < copyCols; col++) {
cells[nextStart + row][col].copyFrom(previous[previousStart + row][col]);
}
}
}
cursorRow = clamp(cursorRow, 0, rows - 1);
cursorCol = clamp(cursorCol, 0, cols - 1);
savedRow = clamp(savedRow, 0, rows - 1);
savedCol = clamp(savedCol, 0, cols - 1);
cursorRow = 0;
cursorCol = 0;
savedRow = 0;
savedCol = 0;
wrapPending = false;
}
void clear() {
@@ -74,6 +72,7 @@ final class TerminalScreenBuffer {
fg = DEFAULT_FG;
bg = DEFAULT_BG;
bold = false;
dim = false;
}
void write(String text) {
@@ -121,16 +120,200 @@ final class TerminalScreenBuffer {
}
CharSequence render() {
return renderRows(0, rows);
}
CharSequence renderBody() {
return renderRows(0, Math.max(0, rows - 1));
}
CharSequence renderStatusLine() {
return renderRows(Math.max(0, rows - 1), rows);
}
private CharSequence renderRows(int startRow, int endRow) {
SpannableStringBuilder output = new SpannableStringBuilder();
for (int row = 0; row < rows; row++) {
for (int row = startRow; row < endRow; row++) {
appendRow(output, row);
if (row + 1 < rows) {
if (row + 1 < endRow) {
output.append('\n');
}
}
return output;
}
String renderTail(int maxRows) {
List<String> visible = new ArrayList<>();
for (int row = rows - 1; row >= 0 && visible.size() < maxRows; row--) {
String text = rowText(row).trim();
if (!text.isEmpty()) {
visible.add(0, text);
}
}
if (visible.isEmpty()) {
return "Waiting for terminal output";
}
return String.join("\n", visible);
}
CharSequence renderFocused(Set<String> expandedBlocks, FocusToggle toggle) {
SpannableStringBuilder output = new SpannableStringBuilder();
int row = 0;
while (row < rows) {
String text = rowText(row).trim();
if (!isCollapsibleHeader(text)) {
if (text.isEmpty()) {
if (output.length() > 0) {
output.append('\n');
}
} else {
appendStyledRow(output, row);
}
row++;
continue;
}
int startRow = row;
List<String> hiddenRows = new ArrayList<>();
hiddenRows.add(text);
row++;
while (row < rows) {
String next = rowText(row).trim();
if (next.isEmpty() || isTopLevelLine(next)) {
break;
}
hiddenRows.add(next);
row++;
}
appendFocusBlock(output, hiddenRows, startRow, row - 1, expandedBlocks, toggle);
}
if (output.length() == 0) {
output.append("Waiting for terminal output");
}
return output;
}
private boolean isCollapsibleHeader(String text) {
boolean activity = text.startsWith("") || text.startsWith("");
String header = stripActivityMarker(text);
return activity && (header.startsWith("Ran ")
|| header.equals("Explored")
|| header.startsWith("Explored ")
|| header.startsWith("Searched ")
|| header.startsWith("Read ")
|| header.startsWith("List ")
|| header.startsWith("Viewed ")
|| header.startsWith("Opened ")
|| header.startsWith("Fetched ")
|| header.startsWith("Downloaded ")
|| header.startsWith("Wrote ")
|| header.startsWith("Edited ")
|| header.startsWith("Applied ")
|| header.startsWith("Updated ")
|| header.startsWith("Checked ")
|| header.startsWith("Inspected ")
|| header.startsWith("Waited ")
|| header.startsWith("Working")
|| header.startsWith("Stop hook"))
|| text.startsWith("─ Worked for ");
}
private boolean isTopLevelLine(String text) {
return text.startsWith("")
|| text.startsWith("")
|| text.startsWith(" ")
|| text.startsWith("> ")
|| text.startsWith("")
|| isCollapsibleHeader(text);
}
private String stripActivityMarker(String text) {
if (text.startsWith("") || text.startsWith("")) {
return text.substring(2).trim();
}
return text;
}
private void appendFocusBlock(
SpannableStringBuilder output,
List<String> lines,
int startRow,
int endRow,
Set<String> expandedBlocks,
FocusToggle toggle
) {
String key = startRow + ":" + endRow;
boolean expanded = expandedBlocks.contains(key);
String summary = focusSummary(lines);
int actionStart = output.length();
appendLine(output, (expanded ? "" : "") + summary);
int actionEnd = output.length();
output.setSpan(new ClickableSpan() {
@Override
public void onClick(View widget) {
toggle.toggle(key);
}
@Override
public void updateDrawState(TextPaint paint) {
paint.setColor(0xff67da91);
paint.setUnderlineText(false);
paint.setFakeBoldText(true);
}
}, actionStart, actionEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
if (expanded) {
for (String line : lines) {
appendLine(output, " " + line);
}
}
}
private String focusSummary(List<String> lines) {
String first = stripActivityMarker(lines.get(0));
String joined = String.join(" ", lines).toLowerCase(Locale.ROOT);
String type;
if (first.startsWith("Explored") || first.startsWith("Searched")
|| first.startsWith("Read ") || first.startsWith("List ")
|| first.startsWith("Viewed ") || first.startsWith("Inspected ")) {
type = "Explored";
} else if (first.startsWith("Working") || first.startsWith("Stop hook")
|| first.startsWith("─ Worked for ")) {
type = "Status";
} else if (joined.contains("error") || joined.contains("failed") || joined.contains("exception")) {
type = "Command failed";
} else {
type = "Command output";
}
return type + " · " + lines.size() + " lines · " + compactSummary(first, 48);
}
private String compactSummary(String text, int maxChars) {
String compact = text.replaceAll("\\s+", " ").trim();
if (compact.length() <= maxChars) {
return compact;
}
return compact.substring(0, maxChars - 1) + "";
}
private void appendLine(SpannableStringBuilder output, String text) {
if (output.length() > 0) {
output.append('\n');
}
output.append(text);
}
private void appendStyledRow(SpannableStringBuilder output, int row) {
if (output.length() > 0) {
output.append('\n');
}
int limit = cols;
while (limit > 0 && cells[row][limit - 1].value == ' '
&& cells[row][limit - 1].bg == DEFAULT_BG) {
limit--;
}
appendRow(output, row, limit);
}
private int handleEscape(String text, int index) {
if (index + 1 >= text.length()) {
return -1;
@@ -257,10 +440,14 @@ final class TerminalScreenBuffer {
fg = DEFAULT_FG;
bg = DEFAULT_BG;
bold = false;
dim = false;
} else if (value == 1) {
bold = true;
} else if (value == 2) {
dim = true;
} else if (value == 22) {
bold = false;
dim = false;
} else if (value == 39) {
fg = DEFAULT_FG;
} else if (value == 49) {
@@ -302,14 +489,34 @@ final class TerminalScreenBuffer {
wrapPending = false;
newLine();
}
cells[cursorRow][cursorCol].set(value, fg, bg, bold);
if (cursorCol == cols - 1) {
int width = isWideCharacter(value) ? 2 : 1;
if (width == 2 && cursorCol == cols - 1) {
newLine();
}
cells[cursorRow][cursorCol].set(value, fg, bg, bold, dim);
if (width == 2) {
cells[cursorRow][cursorCol + 1].setContinuation(fg, bg, bold, dim);
}
if (cursorCol + width >= cols) {
cursorCol = cols - 1;
wrapPending = true;
} else {
cursorCol++;
cursorCol += width;
}
}
private boolean isWideCharacter(char value) {
return value >= '\u1100' && (value <= '\u115f'
|| value == '\u2329' || value == '\u232a'
|| (value >= '\u2e80' && value <= '\ua4cf' && value != '\u303f')
|| (value >= '\uac00' && value <= '\ud7a3')
|| (value >= '\uf900' && value <= '\ufaff')
|| (value >= '\ufe10' && value <= '\ufe19')
|| (value >= '\ufe30' && value <= '\ufe6f')
|| (value >= '\uff00' && value <= '\uff60')
|| (value >= '\uffe0' && value <= '\uffe6'));
}
private void newLine() {
wrapPending = false;
cursorRow++;
@@ -446,22 +653,32 @@ final class TerminalScreenBuffer {
}
private void appendRow(SpannableStringBuilder output, int row) {
appendRow(output, row, cols);
}
private void appendRow(SpannableStringBuilder output, int row, int limit) {
int col = 0;
while (col < cols) {
while (col < limit) {
Cell first = cells[row][col];
int start = output.length();
int fgColor = first.fg;
int bgColor = first.bg;
boolean isBold = first.bold;
while (col < cols) {
boolean isDim = first.dim;
while (col < limit) {
Cell cell = cells[row][col];
if (cell.fg != fgColor || cell.bg != bgColor || cell.bold != isBold) {
if (cell.fg != fgColor || cell.bg != bgColor || cell.bold != isBold || cell.dim != isDim) {
break;
}
output.append(cell.value);
if (!cell.continuation) {
output.append(cell.value);
}
col++;
}
int end = output.length();
if (isDim) {
fgColor = blendColor(fgColor, bgColor == DEFAULT_BG ? TERMINAL_BG : bgColor, 0.55f);
}
output.setSpan(new ForegroundColorSpan(fgColor), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
if (bgColor != DEFAULT_BG) {
output.setSpan(new BackgroundColorSpan(bgColor), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -472,6 +689,17 @@ final class TerminalScreenBuffer {
}
}
private String rowText(int row) {
StringBuilder text = new StringBuilder(cols);
for (int col = 0; col < cols; col++) {
Cell cell = cells[row][col];
if (!cell.continuation) {
text.append(cell.value);
}
}
return text.toString();
}
private void saveCursor() {
savedRow = cursorRow;
savedCol = cursorCol;
@@ -613,6 +841,15 @@ final class TerminalScreenBuffer {
return value == 0 ? 0 : 55 + value * 40;
}
private static int blendColor(int foreground, int background, float foregroundRatio) {
float backgroundRatio = 1f - foregroundRatio;
return Color.rgb(
Math.round(Color.red(foreground) * foregroundRatio + Color.red(background) * backgroundRatio),
Math.round(Color.green(foreground) * foregroundRatio + Color.green(background) * backgroundRatio),
Math.round(Color.blue(foreground) * foregroundRatio + Color.blue(background) * backgroundRatio)
);
}
private static int clamp(int value, int min, int max) {
return Math.max(min, Math.min(max, value));
}
@@ -622,19 +859,34 @@ final class TerminalScreenBuffer {
int fg = DEFAULT_FG;
int bg = DEFAULT_BG;
boolean bold;
boolean dim;
boolean continuation;
void clear() {
value = ' ';
fg = DEFAULT_FG;
bg = DEFAULT_BG;
bold = false;
dim = false;
continuation = false;
}
void set(char nextValue, int nextFg, int nextBg, boolean nextBold) {
void set(char nextValue, int nextFg, int nextBg, boolean nextBold, boolean nextDim) {
value = nextValue;
fg = nextFg;
bg = nextBg;
bold = nextBold;
dim = nextDim;
continuation = false;
}
void setContinuation(int nextFg, int nextBg, boolean nextBold, boolean nextDim) {
value = ' ';
fg = nextFg;
bg = nextBg;
bold = nextBold;
dim = nextDim;
continuation = true;
}
void copyFrom(Cell other) {
@@ -642,6 +894,8 @@ final class TerminalScreenBuffer {
fg = other.fg;
bg = other.bg;
bold = other.bold;
dim = other.dim;
continuation = other.continuation;
}
}
}