X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fjexer%2FTText.java;h=f6d7febcc0aefdcd159aa3e5af50d72f1631be0f;hp=0edb290a8a74f7de3e94bd8890961233844a8495;hb=HEAD;hpb=051e29138b18fb4b731a72f8727475b10e4c74e4 diff --git a/src/jexer/TText.java b/src/jexer/TText.java index 0edb290..f6d7feb 100644 --- a/src/jexer/TText.java +++ b/src/jexer/TText.java @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (C) 2017 Kevin Lamonte + * Copyright (C) 2019 Kevin Lamonte * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -28,13 +28,22 @@ */ package jexer; -import java.util.LinkedList; +import java.util.Arrays; +import java.util.ArrayList; import java.util.List; import jexer.bits.CellAttributes; +import jexer.bits.StringUtils; import jexer.event.TKeypressEvent; import jexer.event.TMouseEvent; -import static jexer.TKeypress.*; +import static jexer.TKeypress.kbDown; +import static jexer.TKeypress.kbEnd; +import static jexer.TKeypress.kbHome; +import static jexer.TKeypress.kbLeft; +import static jexer.TKeypress.kbPgDn; +import static jexer.TKeypress.kbPgUp; +import static jexer.TKeypress.kbRight; +import static jexer.TKeypress.kbUp; /** * TText implements a simple scrollable text area. It reflows automatically on @@ -42,10 +51,20 @@ import static jexer.TKeypress.*; */ public class TText extends TScrollableWidget { + // ------------------------------------------------------------------------ + // Constants -------------------------------------------------------------- + // ------------------------------------------------------------------------ + /** * Available text justifications. */ public enum Justification { + + /** + * Not justified at all, use spacing as provided by the client. + */ + NONE, + /** * Left-justified text. */ @@ -67,6 +86,10 @@ public class TText extends TScrollableWidget { FULL, } + // ------------------------------------------------------------------------ + // Variables -------------------------------------------------------------- + // ------------------------------------------------------------------------ + /** * How to justify the text. */ @@ -97,148 +120,9 @@ public class TText extends TScrollableWidget { */ private int lineSpacing = 1; - /** - * Set the text. - * - * @param text new text to display - */ - public void setText(final String text) { - this.text = text; - reflowData(); - } - - /** - * Get the text. - * - * @return the text - */ - public String getText() { - return text; - } - - /** - * Convenience method used by TWindowLoggerOutput. - * - * @param line new line to add - */ - public void addLine(final String line) { - if (text.length() == 0) { - text = line; - } else { - text += "\n\n"; - text += line; - } - reflowData(); - } - - /** - * Recompute the bounds for the scrollbars. - */ - private void computeBounds() { - maxLineWidth = 0; - for (String line : lines) { - if (line.length() > maxLineWidth) { - maxLineWidth = line.length(); - } - } - - vScroller.setTopValue(0); - vScroller.setBottomValue((lines.size() - getHeight()) + 1); - if (vScroller.getBottomValue() < 0) { - vScroller.setBottomValue(0); - } - if (vScroller.getValue() > vScroller.getBottomValue()) { - vScroller.setValue(vScroller.getBottomValue()); - } - - hScroller.setLeftValue(0); - hScroller.setRightValue((maxLineWidth - getWidth()) + 1); - if (hScroller.getRightValue() < 0) { - hScroller.setRightValue(0); - } - if (hScroller.getValue() > hScroller.getRightValue()) { - hScroller.setValue(hScroller.getRightValue()); - } - } - - /** - * Set justification. - * - * @param justification LEFT, CENTER, RIGHT, or FULL - */ - public void setJustification(final Justification justification) { - this.justification = justification; - reflowData(); - } - - /** - * Left-justify the text. - */ - public void leftJustify() { - justification = Justification.LEFT; - reflowData(); - } - - /** - * Center-justify the text. - */ - public void centerJustify() { - justification = Justification.CENTER; - reflowData(); - } - - /** - * Right-justify the text. - */ - public void rightJustify() { - justification = Justification.RIGHT; - reflowData(); - } - - /** - * Fully-justify the text. - */ - public void fullJustify() { - justification = Justification.FULL; - reflowData(); - } - - /** - * Resize text and scrollbars for a new width/height. - */ - @Override - public void reflowData() { - // Reset the lines - lines.clear(); - - // Break up text into paragraphs - String[] paragraphs = text.split("\n\n"); - for (String p : paragraphs) { - switch (justification) { - case LEFT: - lines.addAll(jexer.bits.StringUtils.left(p, - getWidth() - 1)); - break; - case CENTER: - lines.addAll(jexer.bits.StringUtils.center(p, - getWidth() - 1)); - break; - case RIGHT: - lines.addAll(jexer.bits.StringUtils.right(p, - getWidth() - 1)); - break; - case FULL: - lines.addAll(jexer.bits.StringUtils.full(p, - getWidth() - 1)); - break; - } - - for (int i = 0; i < lineSpacing; i++) { - lines.add(""); - } - } - computeBounds(); - } + // ------------------------------------------------------------------------ + // Constructors ----------------------------------------------------------- + // ------------------------------------------------------------------------ /** * Public constructor. @@ -278,13 +162,52 @@ public class TText extends TScrollableWidget { this.text = text; this.colorKey = colorKey; - lines = new LinkedList(); + lines = new ArrayList(); - vScroller = new TVScroller(this, getWidth() - 1, 0, getHeight() - 1); - hScroller = new THScroller(this, 0, getHeight() - 1, getWidth() - 1); + vScroller = new TVScroller(this, getWidth() - 1, 0, + Math.max(1, getHeight() - 1)); + hScroller = new THScroller(this, 0, getHeight() - 1, + Math.max(1, getWidth() - 1)); reflowData(); } + // ------------------------------------------------------------------------ + // TScrollableWidget ------------------------------------------------------ + // ------------------------------------------------------------------------ + + /** + * Override TWidget's width: we need to set child widget widths. + * + * @param width new widget width + */ + @Override + public void setWidth(final int width) { + super.setWidth(width); + if (hScroller != null) { + hScroller.setWidth(getWidth() - 1); + } + if (vScroller != null) { + vScroller.setX(getWidth() - 1); + } + } + + /** + * Override TWidget's height: we need to set child widget heights. + * time. + * + * @param height new widget height + */ + @Override + public void setHeight(final int height) { + super.setHeight(height); + if (hScroller != null) { + hScroller.setY(getHeight() - 1); + } + if (vScroller != null) { + vScroller.setHeight(getHeight() - 1); + } + } + /** * Draw the text box. */ @@ -297,14 +220,15 @@ public class TText extends TScrollableWidget { int topY = 0; for (int i = begin; i < lines.size(); i++) { String line = lines.get(i); - if (hScroller.getValue() < line.length()) { + if (hScroller.getValue() < StringUtils.width(line)) { line = line.substring(hScroller.getValue()); } else { line = ""; } - String formatString = "%-" + Integer.toString(getWidth() - 1) + "s"; - getScreen().putStringXY(0, topY, String.format(formatString, line), - color); + if (getWidth() > 3) { + String formatString = "%-" + Integer.toString(getWidth() - 1) + "s"; + putStringXY(0, topY, String.format(formatString, line), color); + } topY++; if (topY >= (getHeight() - 1)) { @@ -314,7 +238,7 @@ public class TText extends TScrollableWidget { // Pad the rest with blank lines for (int i = topY; i < (getHeight() - 1); i++) { - getScreen().hLineXY(0, i, getWidth() - 1, ' ', color); + hLineXY(0, i, getWidth() - 1, ' ', color); } } @@ -368,4 +292,162 @@ public class TText extends TScrollableWidget { } } + /** + * Resize text and scrollbars for a new width/height. + */ + @Override + public void reflowData() { + // Reset the lines + lines.clear(); + + // Break up text into paragraphs + String[] paragraphs = text.split("\n\n"); + for (String p : paragraphs) { + switch (justification) { + case NONE: + lines.addAll(Arrays.asList(p.split("\n"))); + break; + case LEFT: + lines.addAll(jexer.bits.StringUtils.left(p, + getWidth() - 1)); + break; + case CENTER: + lines.addAll(jexer.bits.StringUtils.center(p, + getWidth() - 1)); + break; + case RIGHT: + lines.addAll(jexer.bits.StringUtils.right(p, + getWidth() - 1)); + break; + case FULL: + lines.addAll(jexer.bits.StringUtils.full(p, + getWidth() - 1)); + break; + } + + for (int i = 0; i < lineSpacing; i++) { + lines.add(""); + } + } + computeBounds(); + } + + // ------------------------------------------------------------------------ + // TText ------------------------------------------------------------------ + // ------------------------------------------------------------------------ + + /** + * Set the text. + * + * @param text new text to display + */ + public void setText(final String text) { + this.text = text; + reflowData(); + } + + /** + * Get the text. + * + * @return the text + */ + public String getText() { + return text; + } + + /** + * Convenience method used by TWindowLoggerOutput. + * + * @param line new line to add + */ + public void addLine(final String line) { + if (StringUtils.width(text) == 0) { + text = line; + } else { + text += "\n\n"; + text += line; + } + reflowData(); + } + + /** + * Recompute the bounds for the scrollbars. + */ + private void computeBounds() { + maxLineWidth = 0; + for (String line : lines) { + if (StringUtils.width(line) > maxLineWidth) { + maxLineWidth = StringUtils.width(line); + } + } + + vScroller.setTopValue(0); + vScroller.setBottomValue((lines.size() - getHeight()) + 1); + if (vScroller.getBottomValue() < 0) { + vScroller.setBottomValue(0); + } + if (vScroller.getValue() > vScroller.getBottomValue()) { + vScroller.setValue(vScroller.getBottomValue()); + } + + hScroller.setLeftValue(0); + hScroller.setRightValue((maxLineWidth - getWidth()) + 1); + if (hScroller.getRightValue() < 0) { + hScroller.setRightValue(0); + } + if (hScroller.getValue() > hScroller.getRightValue()) { + hScroller.setValue(hScroller.getRightValue()); + } + } + + /** + * Set justification. + * + * @param justification NONE, LEFT, CENTER, RIGHT, or FULL + */ + public void setJustification(final Justification justification) { + this.justification = justification; + reflowData(); + } + + /** + * Left-justify the text. + */ + public void leftJustify() { + justification = Justification.LEFT; + reflowData(); + } + + /** + * Center-justify the text. + */ + public void centerJustify() { + justification = Justification.CENTER; + reflowData(); + } + + /** + * Right-justify the text. + */ + public void rightJustify() { + justification = Justification.RIGHT; + reflowData(); + } + + /** + * Fully-justify the text. + */ + public void fullJustify() { + justification = Justification.FULL; + reflowData(); + } + + /** + * Un-justify the text. + */ + public void unJustify() { + justification = Justification.NONE; + reflowData(); + } + }