这是indexloc提供的服务，不要输入任何密码
Skip to content

Added(terminal): add separate italic, bold and boldItalic font files #4813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added(terminal): add separate italic, bold and boldItalic font files #4813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionActivityClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.termux.terminal.TerminalSession;
import com.termux.terminal.TerminalSessionClient;
import com.termux.terminal.TextStyle;
import com.termux.view.TerminalRenderer;

import java.io.File;
import java.io.FileInputStream;
Expand Down Expand Up @@ -494,7 +495,6 @@ String toToastTitle(TerminalSession session) {
public void checkForFontAndColors() {
try {
File colorsFile = TermuxConstants.TERMUX_COLOR_PROPERTIES_FILE;
File fontFile = TermuxConstants.TERMUX_FONT_FILE;

final Properties props = new Properties();
if (colorsFile.isFile()) {
Expand All @@ -510,13 +510,22 @@ public void checkForFontAndColors() {
}
updateBackgroundColor();

final Typeface newTypeface = (fontFile.exists() && fontFile.length() > 0) ? Typeface.createFromFile(fontFile) : Typeface.MONOSPACE;
mActivity.getTerminalView().setTypeface(newTypeface);
setTypeface(TermuxConstants.TERMUX_FONT_FILE, TerminalRenderer.TypefaceStyle.NORMAL);
setTypeface(TermuxConstants.TERMUX_ITALIC_FONT_FILE, TerminalRenderer.TypefaceStyle.ITALIC);
setTypeface(TermuxConstants.TERMUX_BOLD_FONT_FILE, TerminalRenderer.TypefaceStyle.BOLD);
setTypeface(TermuxConstants.TERMUX_BOLD_ITALIC_FONT_FILE, TerminalRenderer.TypefaceStyle.BOLD_ITALIC);
} catch (Exception e) {
Logger.logStackTraceWithMessage(LOG_TAG, "Error in checkForFontAndColors()", e);
}
}

private void setTypeface(File fontFile, TerminalRenderer.TypefaceStyle style) {
if (fontFile.exists() && fontFile.length() > 0) {
final Typeface newTypeface = Typeface.createFromFile(fontFile);
mActivity.getTerminalView().setTypeface(newTypeface, style);
}
}

public void updateBackgroundColor() {
if (!mActivity.isVisible()) return;
TerminalSession session = mActivity.getCurrentSession();
Expand Down
188 changes: 153 additions & 35 deletions terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,39 +17,53 @@
* Saves font metrics, so needs to be recreated each time the typeface or font size changes.
*/
public final class TerminalRenderer {

final int mTextSize;
final Typeface mTypeface;
int mTextSize;
private final Paint mTextPaint = new Paint();

/* These arrays are indexed by style e.g mTypefaceByStyle[TypefaceStyle.ITALIC]; */
private final Typeface[] mTypefaceByStyle = new Typeface[4];
/** The width of a single mono spaced character obtained by {@link Paint#measureText(String)} on a single 'X'. */
final float mFontWidth;
private final float[] mFontWidthByStyle = new float[4];
/** The {@link Paint#getFontSpacing()}. See http://www.fampennings.nl/maarten/android/08numgrid/font.png */
final int mFontLineSpacing;
private final int[] mFontLineSpacingByStyle = new int[4];
/** The {@link Paint#ascent()}. See http://www.fampennings.nl/maarten/android/08numgrid/font.png */
private final int mFontAscent;
/** The {@link #mFontLineSpacing} + {@link #mFontAscent}. */
final int mFontLineSpacingAndAscent;

private final int[] mFontAscentByStyle = new int[4];
/** The {@link #mFontLineSpacingByStyle} + {@link #mFontAscentByStyle}. */
private final int[] mFontLineSpacingAndAscentByStyle = new int[4];
private final float[] asciiMeasures = new float[127];

public TerminalRenderer(int textSize, Typeface typeface) {
public TerminalRenderer(int textSize) {
mTextSize = textSize;
mTypeface = typeface;
mTextPaint.setTextSize(textSize);
}

public void setTextSize(int textSize) {
mTextSize = textSize;
mTextPaint.setTextSize(textSize);

for (int i = 0; i < 4; i++) {
setTypeface(mTypefaceByStyle[i], TypefaceStyle.values()[i]);
}
}

public void setTypeface(Typeface typeface, TypefaceStyle style) {
int idx = style.ordinal();

mTypefaceByStyle[idx] = typeface;

mTextPaint.setTypeface(typeface);
mTextPaint.setAntiAlias(true);
mTextPaint.setTextSize(textSize);

mFontLineSpacing = (int) Math.ceil(mTextPaint.getFontSpacing());
mFontAscent = (int) Math.ceil(mTextPaint.ascent());
mFontLineSpacingAndAscent = mFontLineSpacing + mFontAscent;
mFontWidth = mTextPaint.measureText("X");
mFontLineSpacingByStyle[idx] = (int) Math.ceil(mTextPaint.getFontSpacing());
mFontAscentByStyle[idx] = (int) Math.ceil(mTextPaint.ascent());
mFontLineSpacingAndAscentByStyle[idx] = mFontLineSpacingByStyle[idx] + mFontAscentByStyle[idx];
mFontWidthByStyle[idx] = mTextPaint.measureText("X");

StringBuilder sb = new StringBuilder(" ");
for (int i = 0; i < asciiMeasures.length; i++) {
sb.setCharAt(0, (char) i);
asciiMeasures[i] = mTextPaint.measureText(sb, 0, 1);
if (style == TypefaceStyle.NORMAL) {
StringBuilder sb = new StringBuilder(" ");
for (int i = 0; i < asciiMeasures.length; i++) {
sb.setCharAt(0, (char) i);
asciiMeasures[i] = mTextPaint.measureText(sb, 0, 1);
}
}
}

Expand All @@ -69,9 +83,13 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
if (reverseVideo)
canvas.drawColor(palette[TextStyle.COLOR_INDEX_FOREGROUND], PorterDuff.Mode.SRC);

float heightOffset = mFontLineSpacingAndAscent;
int fontLineSpacingAndAscent = getFontLineSpacingAndAscent();
int fontLineSpacing = getFontLineSpacing();
float fontWidth = getFontWidth();

float heightOffset = fontLineSpacingAndAscent;
for (int row = topRow; row < endRow; row++) {
heightOffset += mFontLineSpacing;
heightOffset += fontLineSpacing;

final int cursorX = (row == cursorRow && cursorVisible) ? cursorCol : -1;
int selx1 = -1, selx2 = -1;
Expand Down Expand Up @@ -109,7 +127,7 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
// If this is detected, we draw this code point scaled to match what wcwidth() expects.
final float measuredCodePointWidth = (codePoint < asciiMeasures.length) ? asciiMeasures[codePoint] : mTextPaint.measureText(line,
currentCharIndex, charsForCodePoint);
final boolean fontWidthMismatch = Math.abs(measuredCodePointWidth / mFontWidth - codePointWcWidth) > 0.01;
final boolean fontWidthMismatch = Math.abs(measuredCodePointWidth / fontWidth - codePointWcWidth) > 0.01;

if (style != lastRunStyle || insideCursor != lastRunInsideCursor || insideSelection != lastRunInsideSelection || fontWidthMismatch || lastRunFontWidthMismatch) {
if (column == 0) {
Expand Down Expand Up @@ -156,6 +174,66 @@ public final void render(TerminalEmulator mEmulator, Canvas canvas, int topRow,
}
}

/**
* Prepare the {@link #mTextPaint} for drawing the specified style.
* If there is no Typeface supplied for the style, we will use a
* fallback and return it.
**/
private TypefaceStyle prepareStyleOrFallback(TypefaceStyle desiredStyle) {
TypefaceStyle fallbackStyle = desiredStyle;
switch (desiredStyle) {
case NORMAL:
mTextPaint.setTextSkewX(0.f);
mTextPaint.setFakeBoldText(false);
break;
case ITALIC:
if (mTypefaceByStyle[desiredStyle.ordinal()] == null) {
fallbackStyle = TypefaceStyle.NORMAL;
mTextPaint.setTextSkewX(-0.35f);
} else {
mTextPaint.setTextSkewX(0.f);
}
mTextPaint.setFakeBoldText(false);
break;
case BOLD:
if (mTypefaceByStyle[desiredStyle.ordinal()] == null) {
fallbackStyle = TypefaceStyle.NORMAL;
mTextPaint.setFakeBoldText(true);
} else {
mTextPaint.setFakeBoldText(false);
}
mTextPaint.setTextSkewX(0.f);
break;
case BOLD_ITALIC:
if (mTypefaceByStyle[desiredStyle.ordinal()] == null) {
// italic has priority over bold here since fake bold
// is not as bad as skewed text which may be to big
// for the cell
if (mTypefaceByStyle[TypefaceStyle.ITALIC.ordinal()] != null) {
fallbackStyle = TypefaceStyle.ITALIC;
mTextPaint.setFakeBoldText(true);
mTextPaint.setTextSkewX(0.f);
} else if (mTypefaceByStyle[TypefaceStyle.BOLD.ordinal()] != null) {
fallbackStyle = TypefaceStyle.BOLD;
mTextPaint.setFakeBoldText(false);
mTextPaint.setTextSkewX(-0.35f);
} else {
fallbackStyle = TypefaceStyle.NORMAL;
mTextPaint.setFakeBoldText(true);
mTextPaint.setTextSkewX(-0.35f);
}
} else {
mTextPaint.setFakeBoldText(false);
mTextPaint.setTextSkewX(0.f);
}
break;
}

mTextPaint.setTypeface(mTypefaceByStyle[fallbackStyle.ordinal()]);

return fallbackStyle;
}

private void drawTextRun(Canvas canvas, char[] text, int[] palette, float y, int startColumn, int runWidthColumns,
int startCharIndex, int runWidthChars, float mes, int cursor, int cursorStyle,
long textStyle, boolean reverseVideo) {
Expand All @@ -168,6 +246,21 @@ private void drawTextRun(Canvas canvas, char[] text, int[] palette, float y, int
final boolean strikeThrough = (effect & TextStyle.CHARACTER_ATTRIBUTE_STRIKETHROUGH) != 0;
final boolean dim = (effect & TextStyle.CHARACTER_ATTRIBUTE_DIM) != 0;

TypefaceStyle style = TypefaceStyle.NORMAL;
if (italic && bold) {
style = prepareStyleOrFallback(TypefaceStyle.BOLD_ITALIC);
} else if (italic) {
style = prepareStyleOrFallback(TypefaceStyle.ITALIC);
} else if (bold) {
style = prepareStyleOrFallback(TypefaceStyle.BOLD);
} else {
prepareStyleOrFallback(style);
}

float fontWidth = getFontWidth(style);
int fontAscent = getFontAscent(style);
int fontLineSpacingAndAscent = getFontLineSpacingAndAscent(style);

if ((foreColor & 0xff000000) != 0xff000000) {
// Let bold have bright colors if applicable (one of the first 8):
if (bold && foreColor >= 0 && foreColor < 8) foreColor += 8;
Expand All @@ -186,10 +279,10 @@ private void drawTextRun(Canvas canvas, char[] text, int[] palette, float y, int
backColor = tmp;
}

float left = startColumn * mFontWidth;
float right = left + runWidthColumns * mFontWidth;
float left = startColumn * fontWidth;
float right = left + runWidthColumns * fontWidth;

mes = mes / mFontWidth;
mes = mes / fontWidth;
boolean savedMatrix = false;
if (Math.abs(mes - runWidthColumns) > 0.01) {
canvas.save();
Expand All @@ -202,12 +295,12 @@ private void drawTextRun(Canvas canvas, char[] text, int[] palette, float y, int
if (backColor != palette[TextStyle.COLOR_INDEX_BACKGROUND]) {
// Only draw non-default background.
mTextPaint.setColor(backColor);
canvas.drawRect(left, y - mFontLineSpacingAndAscent + mFontAscent, right, y, mTextPaint);
canvas.drawRect(left, y - fontLineSpacingAndAscent + fontAscent, right, y, mTextPaint);
}

if (cursor != 0) {
mTextPaint.setColor(cursor);
float cursorHeight = mFontLineSpacingAndAscent - mFontAscent;
float cursorHeight = fontLineSpacingAndAscent - fontAscent;
if (cursorStyle == TerminalEmulator.TERMINAL_CURSOR_STYLE_UNDERLINE) cursorHeight /= 4.;
else if (cursorStyle == TerminalEmulator.TERMINAL_CURSOR_STYLE_BAR) right -= ((right - left) * 3) / 4.;
canvas.drawRect(left, y - cursorHeight, right, y, mTextPaint);
Expand All @@ -226,24 +319,49 @@ private void drawTextRun(Canvas canvas, char[] text, int[] palette, float y, int
foreColor = 0xFF000000 + (red << 16) + (green << 8) + blue;
}

mTextPaint.setFakeBoldText(bold);
mTextPaint.setUnderlineText(underline);
mTextPaint.setTextSkewX(italic ? -0.35f : 0.f);
mTextPaint.setStrikeThruText(strikeThrough);
mTextPaint.setColor(foreColor);

// The text alignment is the default Paint.Align.LEFT.
canvas.drawTextRun(text, startCharIndex, runWidthChars, startCharIndex, runWidthChars, left, y - mFontLineSpacingAndAscent, false, mTextPaint);
canvas.drawTextRun(text, startCharIndex, runWidthChars, startCharIndex, runWidthChars, left, y - fontLineSpacingAndAscent, false, mTextPaint);
}

if (savedMatrix) canvas.restore();
}

public float getFontWidth() {
return mFontWidth;
public float getFontWidth(TypefaceStyle style) {
return mFontWidthByStyle[style.ordinal()];
}

public int getFontAscent(TypefaceStyle style) {
return mFontAscentByStyle[style.ordinal()];
}
public int getFontLineSpacing(TypefaceStyle style) {
return mFontLineSpacingByStyle[style.ordinal()];
}

public int getFontLineSpacingAndAscent(TypefaceStyle style) {
return mFontLineSpacingAndAscentByStyle[style.ordinal()];
}

public float getFontWidth() {
return mFontWidthByStyle[TypefaceStyle.NORMAL.ordinal()];
}
public int getFontAscent() {
return mFontAscentByStyle[TypefaceStyle.NORMAL.ordinal()];
}
public int getFontLineSpacing() {
return mFontLineSpacing;
return mFontLineSpacingByStyle[TypefaceStyle.NORMAL.ordinal()];
}
public int getFontLineSpacingAndAscent() {
return mFontLineSpacingAndAscentByStyle[TypefaceStyle.NORMAL.ordinal()];
}

public enum TypefaceStyle {
NORMAL,
ITALIC,
BOLD,
BOLD_ITALIC,
}
}
31 changes: 18 additions & 13 deletions terminal-view/src/main/java/com/termux/view/TerminalView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ public boolean onScroll(MotionEvent e, float distanceX, float distanceY) {
} else {
scrolledWithFinger = true;
distanceY += mScrollRemainder;
int deltaRows = (int) (distanceY / mRenderer.mFontLineSpacing);
mScrollRemainder = distanceY - deltaRows * mRenderer.mFontLineSpacing;
int deltaRows = (int) (distanceY / mRenderer.getFontLineSpacing());
mScrollRemainder = distanceY - deltaRows * mRenderer.getFontLineSpacing();
doScroll(e, deltaRows);
}
return true;
Expand Down Expand Up @@ -512,12 +512,17 @@ public void onContextMenuClosed(Menu menu) {
* @param textSize the new font size, in density-independent pixels.
*/
public void setTextSize(int textSize) {
mRenderer = new TerminalRenderer(textSize, mRenderer == null ? Typeface.MONOSPACE : mRenderer.mTypeface);
if (mRenderer == null) {
mRenderer = new TerminalRenderer(textSize);
mRenderer.setTypeface(Typeface.MONOSPACE, TerminalRenderer.TypefaceStyle.NORMAL);
} else {
mRenderer.setTextSize(textSize);
}
updateSize();
}

public void setTypeface(Typeface newTypeface) {
mRenderer = new TerminalRenderer(mRenderer.mTextSize, newTypeface);
public void setTypeface(Typeface newTypeface, TerminalRenderer.TypefaceStyle style) {
mRenderer.setTypeface(newTypeface, style);
updateSize();
invalidate();
}
Expand All @@ -544,8 +549,8 @@ public boolean isOpaque() {
* @return Array with the column and row.
*/
public int[] getColumnAndRow(MotionEvent event, boolean relativeToScroll) {
int column = (int) (event.getX() / mRenderer.mFontWidth);
int row = (int) ((event.getY() - mRenderer.mFontLineSpacingAndAscent) / mRenderer.mFontLineSpacing);
int column = (int) (event.getX() / mRenderer.getFontWidth());
int row = (int) ((event.getY() - mRenderer.getFontLineSpacingAndAscent()) / mRenderer.getFontLineSpacing());
if (relativeToScroll) {
row += mTopRow;
}
Expand Down Expand Up @@ -985,8 +990,8 @@ public void updateSize() {
if (viewWidth == 0 || viewHeight == 0 || mTermSession == null) return;

// Set to 80 and 24 if you want to enable vttest.
int newColumns = Math.max(4, (int) (viewWidth / mRenderer.mFontWidth));
int newRows = Math.max(4, (viewHeight - mRenderer.mFontLineSpacingAndAscent) / mRenderer.mFontLineSpacing);
int newColumns = Math.max(4, (int) (viewWidth / mRenderer.getFontWidth()));
int newRows = Math.max(4, (viewHeight - mRenderer.getFontLineSpacingAndAscent()) / mRenderer.getFontLineSpacing());

if (mEmulator == null || (newColumns != mEmulator.mColumns || newRows != mEmulator.mRows)) {
mTermSession.updateSize(newColumns, newRows, (int) mRenderer.getFontWidth(), mRenderer.getFontLineSpacing());
Expand Down Expand Up @@ -1030,22 +1035,22 @@ private CharSequence getText() {
}

public int getCursorX(float x) {
return (int) (x / mRenderer.mFontWidth);
return (int) (x / mRenderer.getFontWidth());
}

public int getCursorY(float y) {
return (int) (((y - 40) / mRenderer.mFontLineSpacing) + mTopRow);
return (int) (((y - 40) / mRenderer.getFontLineSpacing()) + mTopRow);
}

public int getPointX(int cx) {
if (cx > mEmulator.mColumns) {
cx = mEmulator.mColumns;
}
return Math.round(cx * mRenderer.mFontWidth);
return Math.round(cx * mRenderer.getFontWidth());
}

public int getPointY(int cy) {
return Math.round((cy - mTopRow) * mRenderer.mFontLineSpacing);
return Math.round((cy - mTopRow) * mRenderer.getFontLineSpacing());
}

public int getTopRow() {
Expand Down
Loading