X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fio%2FAWTScreen.java;h=a3fc41f19fa03563ca292c5f4feed4e28fd0c33f;hb=a83fea2bae838f4b9bbf59ce3832e0e67be41378;hp=2b913f1d41c9cf0621b3c85ff79c032465e87346;hpb=84614868e6bcbe374c0c1ba248ad046ff25ccb2b;p=nikiroo-utils.git diff --git a/src/jexer/io/AWTScreen.java b/src/jexer/io/AWTScreen.java index 2b913f1..a3fc41f 100644 --- a/src/jexer/io/AWTScreen.java +++ b/src/jexer/io/AWTScreen.java @@ -32,6 +32,7 @@ package jexer.io; import jexer.bits.Cell; import jexer.bits.CellAttributes; +import jexer.session.AWTSessionInfo; import java.awt.Color; import java.awt.Cursor; @@ -40,8 +41,14 @@ import java.awt.FontMetrics; import java.awt.Frame; import java.awt.Graphics; import java.awt.Insets; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Toolkit; import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; import java.io.InputStream; +import javax.swing.JFrame; +import javax.swing.SwingUtilities; /** * This Screen implementation draws to a Java AWT Frame. @@ -98,7 +105,7 @@ public final class AWTScreen extends Screen { /** * AWTFrame is our top-level hook into the AWT system. */ - class AWTFrame extends Frame { + class AWTFrame extends JFrame { /** * The terminus font resource filename. @@ -231,12 +238,13 @@ public final class AWTScreen extends Screen { setDOSColors(); setTitle("Jexer Application"); - setBackground(java.awt.Color.black); - setCursor(Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR)); + setBackground(Color.black); + // setCursor(Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR)); // setFont(new Font("Liberation Mono", Font.BOLD, 16)); // setFont(new Font(Font.MONOSPACED, Font.PLAIN, 16)); try { + // Always try to use Terminus, the one decent font. ClassLoader loader = Thread.currentThread().getContextClassLoader(); InputStream in = loader.getResourceAsStream(FONTFILE); Font terminusRoot = Font.createFont(Font.TRUETYPE_FONT, in); @@ -247,8 +255,19 @@ public final class AWTScreen extends Screen { // setFont(new Font("Liberation Mono", Font.PLAIN, 24)); setFont(new Font(Font.MONOSPACED, Font.PLAIN, 24)); } + pack(); setVisible(true); resizeToScreen(); + + // Kill the X11 cursor + // Transparent 16 x 16 pixel cursor image. + BufferedImage cursorImg = new BufferedImage(16, 16, + BufferedImage.TYPE_INT_ARGB); + + // Create a new blank cursor. + Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor( + cursorImg, new Point(0, 0), "blank cursor"); + setCursor(blankCursor); } /** @@ -281,6 +300,18 @@ public final class AWTScreen extends Screen { */ } + /** + * Update redraws the whole screen. + * + * @param gr the AWT Graphics context + */ + @Override + public void update(final Graphics gr) { + // The default update clears the area. Don't do that, instead + // just paint it directly. + paint(gr); + } + /** * Paint redraws the whole screen. * @@ -288,32 +319,95 @@ public final class AWTScreen extends Screen { */ @Override public void paint(final Graphics gr) { + // Do nothing until the screen reference has been set. + if (screen == null) { + return; + } + if (screen.frame == null) { + return; + } - for (int y = 0; y < screen.height; y++) { - for (int x = 0; x < screen.width; x++) { - Cell lCell = screen.logical[x][y]; - Cell pCell = screen.physical[x][y]; - - int xPixel = x * textWidth + left; - int yPixel = y * textHeight + top; - - if (!lCell.equals(pCell)) { - - // Draw the background rectangle, then the foreground - // character. - gr.setColor(attrToBackgroundColor(lCell)); - gr.fillRect(xPixel, yPixel, textWidth, textHeight); - gr.setColor(attrToForegroundColor(lCell)); - char [] chars = new char[1]; - chars[0] = lCell.getChar(); - gr.drawChars(chars, 0, 1, xPixel, - yPixel + textHeight - maxDescent); + int xCellMin = 0; + int xCellMax = screen.width; + int yCellMin = 0; + int yCellMax = screen.height; + + Rectangle bounds = gr.getClipBounds(); + if (bounds != null) { + // Only update what is in the bounds + xCellMin = screen.textColumn(bounds.x); + xCellMax = screen.textColumn(bounds.x + bounds.width) + 1; + if (xCellMax > screen.width) { + xCellMax = screen.width; + } + if (xCellMin >= xCellMax) { + xCellMin = xCellMax - 2; + } + if (xCellMin < 0) { + xCellMin = 0; + } + yCellMin = screen.textRow(bounds.y); + yCellMax = screen.textRow(bounds.y + bounds.height) + 1; + if (yCellMax > screen.height) { + yCellMax = screen.height; + } + if (yCellMin >= yCellMax) { + yCellMin = yCellMax - 2; + } + if (yCellMin < 0) { + yCellMin = 0; + } + } - // Physical is always updated - physical[x][y].setTo(lCell); + // Prevent updates to the screen's data from the TApplication + // threads. + synchronized (screen) { + /* + System.err.printf("bounds %s X %d %d Y %d %d\n", + bounds, xCellMin, xCellMax, yCellMin, yCellMax); + */ + + for (int y = yCellMin; y < yCellMax; y++) { + for (int x = xCellMin; x < xCellMax; x++) { + + int xPixel = x * textWidth + left; + int yPixel = y * textHeight + top; + + Cell lCell = screen.logical[x][y]; + Cell pCell = screen.physical[x][y]; + + if (!lCell.equals(pCell) || reallyCleared) { + // Draw the background rectangle, then the + // foreground character. + gr.setColor(attrToBackgroundColor(lCell)); + gr.fillRect(xPixel, yPixel, textWidth, textHeight); + gr.setColor(attrToForegroundColor(lCell)); + char [] chars = new char[1]; + chars[0] = lCell.getChar(); + gr.drawChars(chars, 0, 1, xPixel, + yPixel + textHeight - maxDescent); + + // Physical is always updated + physical[x][y].setTo(lCell); + } } } - } + + // Draw the cursor if it is visible + if ((cursorVisible) + && (cursorY <= screen.height - 1) + && (cursorX <= screen.width - 1) + ) { + int xPixel = cursorX * textWidth + left; + int yPixel = cursorY * textHeight + top; + Cell lCell = screen.logical[cursorX][cursorY]; + gr.setColor(attrToForegroundColor(lCell)); + gr.fillRect(xPixel, yPixel + textHeight - 2, textWidth, 2); + } + + dirty = false; + reallyCleared = false; + } // synchronized (screen) } } @@ -326,7 +420,26 @@ public final class AWTScreen extends Screen { * Public constructor. */ public AWTScreen() { - frame = new AWTFrame(this); + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + AWTScreen.this.frame = new AWTFrame(AWTScreen.this); + } + } ); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the AWTSessionInfo. Note package private access. + * + * @return the sessionInfo + */ + AWTSessionInfo getSessionInfo() { + AWTSessionInfo sessionInfo = new AWTSessionInfo(frame, frame.textWidth, + frame.textHeight); + return sessionInfo; } /** @@ -334,7 +447,111 @@ public final class AWTScreen extends Screen { */ @Override public void flushPhysical() { - Graphics gr = frame.getGraphics(); - frame.paint(gr); + + if (reallyCleared) { + // Really refreshed, do it all + frame.repaint(); + return; + } + + // Do nothing if nothing happened. + if (!dirty) { + return; + } + + // Request a repaint, let the frame's repaint/update methods do the + // right thing. + + // Find the minimum-size damaged region. + int xMin = frame.getWidth(); + int xMax = 0; + int yMin = frame.getHeight(); + int yMax = 0; + + synchronized (this) { + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { + Cell lCell = logical[x][y]; + Cell pCell = physical[x][y]; + + int xPixel = x * frame.textWidth + frame.left; + int yPixel = y * frame.textHeight + frame.top; + + if (!lCell.equals(pCell) + || ((x == cursorX) + && (y == cursorY) + && cursorVisible) + ) { + if (xPixel < xMin) { + xMin = xPixel; + } + if (xPixel + frame.textWidth > xMax) { + xMax = xPixel + frame.textWidth; + } + if (yPixel < yMin) { + yMin = yPixel; + } + if (yPixel + frame.textHeight > yMax) { + yMax = yPixel + frame.textHeight; + } + } + } + } + } + if (xMin + frame.textWidth >= xMax) { + xMax += frame.textWidth; + } + if (yMin + frame.textHeight >= yMax) { + yMax += frame.textHeight; + } + + // Repaint the desired area + frame.repaint(xMin, yMin, xMax - xMin, yMax - yMin); + // System.err.printf("REPAINT X %d %d Y %d %d\n", xMin, xMax, yMin, yMax); } + + /** + * Put the cursor at (x,y). + * + * @param visible if true, the cursor should be visible + * @param x column coordinate to put the cursor on + * @param y row coordinate to put the cursor on + */ + @Override + public void putCursor(final boolean visible, final int x, final int y) { + if ((cursorVisible) + && (cursorY <= height - 1) + && (cursorX <= width - 1) + ) { + // Make the current cursor position dirty + if (physical[cursorX][cursorY].getChar() == 'Q') { + physical[cursorX][cursorY].setChar('X'); + } else { + physical[cursorX][cursorY].setChar('Q'); + } + } + + super.putCursor(visible, x, y); + } + + /** + * Convert pixel column position to text cell column position. + * + * @param x pixel column position + * @return text cell column position + */ + public int textColumn(final int x) { + return ((x - frame.left) / frame.textWidth); + } + + /** + * Convert pixel row position to text cell row position. + * + * @param y pixel row position + * @return text cell row position + */ + public int textRow(final int y) { + return ((y - frame.top) / frame.textHeight); + } + }