*/
private boolean haveTimer = false;
+ /**
+ * The last seen scrollback lines.
+ */
+ private List<DisplayLine> scrollback;
+
+ /**
+ * The last seen display lines.
+ */
+ private List<DisplayLine> display;
+
+ /**
+ * If true, the display has changed and needs updating.
+ */
+ private volatile boolean dirty = true;
+
+ /**
+ * Time that the display was last updated.
+ */
+ private long lastUpdateTime = 0;
+
// ------------------------------------------------------------------------
// Constructors -----------------------------------------------------------
// ------------------------------------------------------------------------
*/
@Override
public void draw() {
- // Synchronize against the emulator so we don't stomp on its reader
- // thread.
- synchronized (emulator) {
-
- // Update the scroll bars
- reflowData();
- // Draw the box using my superclass
- super.draw();
-
- List<DisplayLine> scrollback = emulator.getScrollbackBuffer();
- List<DisplayLine> display = emulator.getDisplayBuffer();
+ int width = getDisplayWidth();
+ boolean syncEmulator = false;
+ if ((System.currentTimeMillis() - lastUpdateTime > 125)
+ && (dirty == true)
+ ) {
+ // Too much time has passed, draw it all.
+ syncEmulator = true;
+ } else if (emulator.isReading() && (dirty == false)) {
+ // Wait until the emulator has brought more data in.
+ syncEmulator = false;
+ } else if (!emulator.isReading() && (dirty == true)) {
+ // The emulator won't receive more data, update the display.
+ syncEmulator = true;
+ }
- // Put together the visible rows
- int visibleHeight = getHeight() - 2;
- int visibleBottom = scrollback.size() + display.size()
- + getVerticalValue();
- assert (visibleBottom >= 0);
+ if ((syncEmulator == true)
+ || (scrollback == null)
+ || (display == null)
+ ) {
+ // We want to minimize the amount of time we have the emulator
+ // locked. Grab a copy of its display.
+ synchronized (emulator) {
+ // Update the scroll bars
+ reflowData();
- List<DisplayLine> preceedingBlankLines = new ArrayList<DisplayLine>();
- int visibleTop = visibleBottom - visibleHeight;
- if (visibleTop < 0) {
- for (int i = visibleTop; i < 0; i++) {
- preceedingBlankLines.add(emulator.getBlankDisplayLine());
+ if ((scrollback == null) || emulator.isReading()) {
+ scrollback = copyBuffer(emulator.getScrollbackBuffer());
+ display = copyBuffer(emulator.getDisplayBuffer());
}
- visibleTop = 0;
+ width = emulator.getWidth();
}
- assert (visibleTop >= 0);
+ dirty = false;
+ }
- List<DisplayLine> displayLines = new ArrayList<DisplayLine>();
- displayLines.addAll(scrollback);
- displayLines.addAll(display);
+ // Draw the box using my superclass
+ super.draw();
- List<DisplayLine> visibleLines = new ArrayList<DisplayLine>();
- visibleLines.addAll(preceedingBlankLines);
- visibleLines.addAll(displayLines.subList(visibleTop,
- visibleBottom));
+ // Put together the visible rows
+ int visibleHeight = getHeight() - 2;
+ int visibleBottom = scrollback.size() + display.size()
+ + getVerticalValue();
+ assert (visibleBottom >= 0);
- visibleHeight -= visibleLines.size();
- assert (visibleHeight >= 0);
+ List<DisplayLine> preceedingBlankLines = new ArrayList<DisplayLine>();
+ int visibleTop = visibleBottom - visibleHeight;
+ if (visibleTop < 0) {
+ for (int i = visibleTop; i < 0; i++) {
+ preceedingBlankLines.add(emulator.getBlankDisplayLine());
+ }
+ visibleTop = 0;
+ }
+ assert (visibleTop >= 0);
+
+ List<DisplayLine> displayLines = new ArrayList<DisplayLine>();
+ displayLines.addAll(scrollback);
+ displayLines.addAll(display);
+
+ List<DisplayLine> visibleLines = new ArrayList<DisplayLine>();
+ visibleLines.addAll(preceedingBlankLines);
+ visibleLines.addAll(displayLines.subList(visibleTop,
+ visibleBottom));
+
+ visibleHeight -= visibleLines.size();
+ assert (visibleHeight >= 0);
+
+ // Now draw the emulator screen
+ int row = 1;
+ for (DisplayLine line: visibleLines) {
+ int widthMax = width;
+ if (line.isDoubleWidth()) {
+ widthMax /= 2;
+ }
+ if (widthMax > getWidth() - 2) {
+ widthMax = getWidth() - 2;
+ }
+ for (int i = 0; i < widthMax; i++) {
+ Cell ch = line.charAt(i);
- // Now draw the emulator screen
- int row = 1;
- for (DisplayLine line: visibleLines) {
- int widthMax = emulator.getWidth();
- if (line.isDoubleWidth()) {
- widthMax /= 2;
- }
- if (widthMax > getWidth() - 2) {
- widthMax = getWidth() - 2;
+ if (ch.isImage()) {
+ putCharXY(i + 1, row, ch);
+ continue;
}
- for (int i = 0; i < widthMax; i++) {
- Cell ch = line.charAt(i);
- if (ch.isImage()) {
- putCharXY(i + 1, row, ch);
- continue;
- }
-
- Cell newCell = new Cell();
- newCell.setTo(ch);
- boolean reverse = line.isReverseColor() ^ ch.isReverse();
- newCell.setReverse(false);
- if (reverse) {
- if (ch.getForeColorRGB() < 0) {
- newCell.setBackColor(ch.getForeColor());
- newCell.setBackColorRGB(-1);
- } else {
- newCell.setBackColorRGB(ch.getForeColorRGB());
- }
- if (ch.getBackColorRGB() < 0) {
- newCell.setForeColor(ch.getBackColor());
- newCell.setForeColorRGB(-1);
- } else {
- newCell.setForeColorRGB(ch.getBackColorRGB());
- }
+ Cell newCell = new Cell();
+ newCell.setTo(ch);
+ boolean reverse = line.isReverseColor() ^ ch.isReverse();
+ newCell.setReverse(false);
+ if (reverse) {
+ if (ch.getForeColorRGB() < 0) {
+ newCell.setBackColor(ch.getForeColor());
+ newCell.setBackColorRGB(-1);
+ } else {
+ newCell.setBackColorRGB(ch.getForeColorRGB());
}
- if (line.isDoubleWidth()) {
- putDoubleWidthCharXY(line, (i * 2) + 1, row, newCell);
+ if (ch.getBackColorRGB() < 0) {
+ newCell.setForeColor(ch.getBackColor());
+ newCell.setForeColorRGB(-1);
} else {
- putCharXY(i + 1, row, newCell);
+ newCell.setForeColorRGB(ch.getBackColorRGB());
}
}
- row++;
- if (row == getHeight() - 1) {
- // Don't overwrite the box edge
- break;
+ if (line.isDoubleWidth()) {
+ putDoubleWidthCharXY(line, (i * 2) + 1, row, newCell);
+ } else {
+ putCharXY(i + 1, row, newCell);
}
}
- CellAttributes background = new CellAttributes();
- // Fill in the blank lines on bottom
- for (int i = 0; i < visibleHeight; i++) {
- hLineXY(1, i + row, getWidth() - 2, ' ', background);
+ row++;
+ if (row == getHeight() - 1) {
+ // Don't overwrite the box edge
+ break;
}
-
- } // synchronized (emulator)
+ }
+ CellAttributes background = new CellAttributes();
+ // Fill in the blank lines on bottom
+ for (int i = 0; i < visibleHeight; i++) {
+ hLineXY(1, i + row, getWidth() - 2, ' ', background);
+ }
}
return;
}
- // Synchronize against the emulator so we don't stomp on its reader
- // thread.
- synchronized (emulator) {
- if (emulator.isReading()) {
- // Get out of scrollback
- setVerticalValue(0);
- emulator.keypress(keypress.getKey());
+ if (emulator.isReading()) {
+ // Get out of scrollback
+ setVerticalValue(0);
+ emulator.addUserEvent(keypress);
- // UGLY HACK TIME! cmd.exe needs CRLF, not just CR, so if
- // this is kBEnter then also send kbCtrlJ.
- if (System.getProperty("os.name").startsWith("Windows")) {
- if (keypress.equals(kbEnter)) {
- emulator.keypress(kbCtrlJ);
- }
+ // UGLY HACK TIME! cmd.exe needs CRLF, not just CR, so if
+ // this is kBEnter then also send kbCtrlJ.
+ if (System.getProperty("os.name").startsWith("Windows")) {
+ if (keypress.equals(kbEnter)) {
+ emulator.addUserEvent(new TKeypressEvent(kbCtrlJ));
}
-
- readEmulatorState();
- return;
}
+
+ readEmulatorState();
+ return;
}
// Process is closed, honor "normal" TUI keystrokes
}
}
if (mouseOnEmulator(mouse)) {
- synchronized (emulator) {
- mouse.setX(mouse.getX() - 1);
- mouse.setY(mouse.getY() - 1);
- emulator.mouse(mouse);
- readEmulatorState();
- return;
- }
+ mouse.setX(mouse.getX() - 1);
+ mouse.setY(mouse.getY() - 1);
+ emulator.addUserEvent(mouse);
+ readEmulatorState();
+ return;
}
// Emulator didn't consume it, pass it on
}
if (mouseOnEmulator(mouse)) {
- synchronized (emulator) {
- mouse.setX(mouse.getX() - 1);
- mouse.setY(mouse.getY() - 1);
- emulator.mouse(mouse);
- readEmulatorState();
- return;
- }
+ mouse.setX(mouse.getX() - 1);
+ mouse.setY(mouse.getY() - 1);
+ emulator.addUserEvent(mouse);
+ readEmulatorState();
+ return;
}
// Emulator didn't consume it, pass it on
}
if (mouseOnEmulator(mouse)) {
- synchronized (emulator) {
- mouse.setX(mouse.getX() - 1);
- mouse.setY(mouse.getY() - 1);
- emulator.mouse(mouse);
- readEmulatorState();
- return;
- }
+ mouse.setX(mouse.getX() - 1);
+ mouse.setY(mouse.getY() - 1);
+ emulator.addUserEvent(mouse);
+ readEmulatorState();
+ return;
}
// Emulator didn't consume it, pass it on
}
}
- /**
- * Called by emulator when fresh data has come in.
- */
- public void displayChanged() {
- getApplication().postEvent(new TMenuEvent(TMenu.MID_REPAINT));
- }
-
- /**
- * Function to call to obtain the display width.
- *
- * @return the number of columns in the display
- */
- public int getDisplayWidth() {
- if (ptypipe) {
- return getWidth() - 2;
- }
- return 80;
- }
-
- /**
- * Function to call to obtain the display height.
- *
- * @return the number of rows in the display
- */
- public int getDisplayHeight() {
- if (ptypipe) {
- return getHeight() - 2;
- }
- return 24;
- }
-
/**
* Hook for subclasses to be notified of the shell termination.
*/
*/
private boolean mouseOnEmulator(final TMouseEvent mouse) {
- synchronized (emulator) {
- if (!emulator.isReading()) {
- return false;
- }
+ if (!emulator.isReading()) {
+ return false;
}
if ((mouse.getAbsoluteX() >= getAbsoluteX() + 1)
return false;
}
+ /**
+ * Copy a display buffer.
+ *
+ * @param buffer the buffer to copy
+ * @return a deep copy of the buffer's data
+ */
+ private List<DisplayLine> copyBuffer(final List<DisplayLine> buffer) {
+ ArrayList<DisplayLine> result = new ArrayList<DisplayLine>(buffer.size());
+ for (DisplayLine line: buffer) {
+ result.add(new DisplayLine(line));
+ }
+ return result;
+ }
+
/**
* Draw glyphs for a double-width or double-height VT100 cell to two
* screen cells.
}
}
+ // ------------------------------------------------------------------------
+ // DisplayListener --------------------------------------------------------
+ // ------------------------------------------------------------------------
+
+ /**
+ * Called by emulator when fresh data has come in.
+ */
+ public void displayChanged() {
+ dirty = true;
+ getApplication().postEvent(new TMenuEvent(TMenu.MID_REPAINT));
+ }
+
+ /**
+ * Function to call to obtain the display width.
+ *
+ * @return the number of columns in the display
+ */
+ public int getDisplayWidth() {
+ if (ptypipe) {
+ return getWidth() - 2;
+ }
+ return 80;
+ }
+
+ /**
+ * Function to call to obtain the display height.
+ *
+ * @return the number of rows in the display
+ */
+ public int getDisplayHeight() {
+ if (ptypipe) {
+ return getHeight() - 2;
+ }
+ return 24;
+ }
+
}
private ScanState scanState = ScanState.GROUND;
/**
- * Parameter characters being collected.
+ * Parameters being collected.
*/
- private ArrayList<Integer> colorParams;
+ private int [] params = new int[5];
+
+ /**
+ * Current parameter being collected.
+ */
+ private int paramsI = 0;
/**
* The sixel palette colors specified.
*/
public Sixel(final String buffer) {
this.buffer = buffer;
- colorParams = new ArrayList<Integer>();
palette = new HashMap<Integer, Color>();
image = new BufferedImage(200, 100, BufferedImage.TYPE_INT_ARGB);
for (int i = 0; i < buffer.length(); i++) {
* Clear the parameters and flags.
*/
private void toGround() {
- colorParams.clear();
+ paramsI = 0;
+ for (int i = 0; i < params.length; i++) {
+ params[i] = 0;
+ }
scanState = ScanState.GROUND;
repeatCount = -1;
}
- /**
- * Save a byte into the color parameters buffer.
- *
- * @param ch byte to save
- */
- private void param(final byte ch) {
- if (colorParams.size() == 0) {
- colorParams.add(Integer.valueOf(0));
- }
- Integer n = colorParams.get(colorParams.size() - 1);
- if ((ch >= '0') && (ch <= '9')) {
- n *= 10;
- n += (ch - '0');
- colorParams.set(colorParams.size() - 1, n);
- }
-
- if ((ch == ';') && (colorParams.size() < 16)) {
- colorParams.add(Integer.valueOf(0));
- }
- }
-
/**
* Get a color parameter value, with a default.
*
* @return parameter value
*/
private int getColorParam(final int position, final int defaultValue) {
- if (colorParams.size() < position + 1) {
+ if (position > paramsI) {
return defaultValue;
}
- return colorParams.get(position).intValue();
+ return params[position];
}
/**
return;
}
+ int dy = 0;
for (int i = 0; i < rep; i++) {
if ((n & 0x01) != 0) {
- image.setRGB(x, height + 0, rgb);
- y = Math.max(y, height);
+ dy = 0;
+ image.setRGB(x, height + dy, rgb);
}
if ((n & 0x02) != 0) {
- image.setRGB(x, height + 1, rgb);
- y = Math.max(y, height + 1);
+ dy = 1;
+ image.setRGB(x, height + dy, rgb);
}
if ((n & 0x04) != 0) {
- image.setRGB(x, height + 2, rgb);
- y = Math.max(y, height + 2);
+ dy = 2;
+ image.setRGB(x, height + dy, rgb);
}
if ((n & 0x08) != 0) {
- image.setRGB(x, height + 3, rgb);
- y = Math.max(y, height + 3);
+ dy = 3;
+ image.setRGB(x, height + dy, rgb);
}
if ((n & 0x10) != 0) {
- image.setRGB(x, height + 4, rgb);
- y = Math.max(y, height + 4);
+ dy = 4;
+ image.setRGB(x, height + dy, rgb);
}
if ((n & 0x20) != 0) {
- image.setRGB(x, height + 5, rgb);
- y = Math.max(y, height + 5);
+ dy = 5;
+ image.setRGB(x, height + dy, rgb);
}
- x++;
- if (x > width) {
- width++;
- assert (x == width);
+ if (height + dy > y) {
+ y = height + dy;
}
+ x++;
+ }
+ if (x > width) {
+ width = x;
}
}
private void setPalette() {
int idx = getColorParam(0, 0);
- if (colorParams.size() == 1) {
+ if (paramsI == 0) {
Color newColor = palette.get(idx);
if (newColor != null) {
color = newColor;
if ((ch >= 63) && (ch < 127)) {
if (scanState == ScanState.COLOR) {
setPalette();
- toGround();
}
addSixel(ch);
toGround();
case COLOR:
// 30-39, 3B --> param
if ((ch >= '0') && (ch <= '9')) {
- param((byte) ch);
+ params[paramsI] *= 10;
+ params[paramsI] += (ch - '0');
}
if (ch == ';') {
- param((byte) ch);
+ if (paramsI < params.length - 1) {
+ paramsI++;
+ }
}
return;
git://git.nikiroo.be / fanfix.git / commitdiff