*/
private volatile WidgetEventHandler secondaryEventHandler;
+ /**
+ * The screen handler thread.
+ */
+ private volatile ScreenHandler screenHandler;
+
/**
* The widget receiving events from the secondary event handler thread.
*/
*/
private boolean focusFollowsMouse = false;
- /**
- * The images that might be displayed. Note package private access.
- */
- private List<TImage> images;
-
/**
* The list of commands to run before the next I/O check.
*/
}
}
+ /**
+ * ScreenHandler pushes screen updates to the physical device.
+ */
+ private class ScreenHandler implements Runnable {
+ /**
+ * The main application.
+ */
+ private TApplication application;
+
+ /**
+ * The dirty flag.
+ */
+ private boolean dirty = false;
+
+ /**
+ * Public constructor.
+ *
+ * @param application the main application
+ */
+ public ScreenHandler(final TApplication application) {
+ this.application = application;
+ }
+
+ /**
+ * The screen update loop.
+ */
+ public void run() {
+ // Wrap everything in a try, so that if we go belly up we can let
+ // the user have their terminal back.
+ try {
+ runImpl();
+ } catch (Throwable t) {
+ this.application.restoreConsole();
+ t.printStackTrace();
+ this.application.exit();
+ }
+ }
+
+ /**
+ * The update loop.
+ */
+ private void runImpl() {
+
+ // Loop forever
+ while (!application.quit) {
+
+ // Wait until application notifies me
+ while (!application.quit) {
+ try {
+ synchronized (this) {
+ if (dirty) {
+ dirty = false;
+ break;
+ }
+
+ // Always check within 50 milliseconds.
+ this.wait(50);
+ }
+ } catch (InterruptedException e) {
+ // SQUASH
+ }
+ } // while (!application.quit)
+
+ assert (dirty == true);
+
+ // Flush the screen contents
+ if (debugThreads) {
+ System.err.printf("%d %s backend.flushScreen()\n",
+ System.currentTimeMillis(), Thread.currentThread());
+ }
+ synchronized (getScreen()) {
+ backend.flushScreen();
+ }
+ } // while (true) (main runnable loop)
+
+ // Shutdown the user I/O thread(s)
+ backend.shutdown();
+ }
+
+ /**
+ * Set the dirty flag.
+ */
+ public void setDirty() {
+ synchronized (this) {
+ dirty = true;
+ }
+ }
+
+ }
+
// ------------------------------------------------------------------------
// Constructors -----------------------------------------------------------
// ------------------------------------------------------------------------
accelerators = new HashMap<TKeypress, TMenuItem>();
menuItems = new LinkedList<TMenuItem>();
desktop = new TDesktop(this);
- images = new LinkedList<TImage>();
// Special case: the Swing backend needs to have a timer to drive its
// blink state.
public void run() {
// System.err.println("*** TApplication.run() begins ***");
+ // Start the screen updater thread
+ screenHandler = new ScreenHandler(this);
+ (new Thread(screenHandler)).start();
+
// Start the main consumer thread
primaryEventHandler = new WidgetEventHandler(this, true);
(new Thread(primaryEventHandler)).start();
}
}
- // Shutdown the user I/O thread(s)
- backend.shutdown();
-
// Close all the windows. This gives them an opportunity to release
// resources.
closeAllWindows();
drawAll();
}
+ // Wake up the screen repainter
+ wakeScreenHandler();
+
if (debugThreads) {
System.err.printf(System.currentTimeMillis() + " " +
Thread.currentThread() + " finishEventProcessing() END\n");
}
}
+ /**
+ * Wake the sleeping screen handler.
+ */
+ private void wakeScreenHandler() {
+ if (!started) {
+ return;
+ }
+
+ synchronized (screenHandler) {
+ screenHandler.notify();
+ }
+ }
+
// ------------------------------------------------------------------------
// TApplication -----------------------------------------------------------
// ------------------------------------------------------------------------
String version = getClass().getPackage().getImplementationVersion();
if (version == null) {
// This is Java 9+, use a hardcoded string here.
- version = "0.3.1";
+ version = "0.3.2";
}
messageBox(i18n.getString("aboutDialogTitle"),
MessageFormat.format(i18n.getString("aboutDialogText"), version),
* @param y row position
*/
private void invertCell(final int x, final int y) {
+ invertCell(x, y, false);
+ }
+
+ /**
+ * Invert the cell color at a position. This is used to track the mouse.
+ *
+ * @param x column position
+ * @param y row position
+ * @param onlyThisCell if true, only invert this cell
+ */
+ private void invertCell(final int x, final int y,
+ final boolean onlyThisCell) {
+
if (debugThreads) {
System.err.printf("%d %s invertCell() %d %d\n",
System.currentTimeMillis(), Thread.currentThread(), x, y);
}
}
getScreen().putCharXY(x, y, cell);
+ if ((onlyThisCell == true) || (cell.getWidth() == Cell.Width.SINGLE)) {
+ return;
+ }
+
+ // This cell is one half of a fullwidth glyph. Invert the other
+ // half.
+ if (cell.getWidth() == Cell.Width.LEFT) {
+ if (x < getScreen().getWidth() - 1) {
+ Cell rightHalf = getScreen().getCharXY(x + 1, y);
+ if (rightHalf.getWidth() == Cell.Width.RIGHT) {
+ invertCell(x + 1, y, true);
+ return;
+ }
+ }
+ }
+ assert (cell.getWidth() == Cell.Width.RIGHT);
+
+ if (x > 0) {
+ Cell leftHalf = getScreen().getCharXY(x - 1, y);
+ if (leftHalf.getWidth() == Cell.Width.LEFT) {
+ invertCell(x - 1, y, true);
+ }
+ }
}
/**
getScreen().putCharXY(oldDrawnMouseX, oldDrawnMouseY,
oldDrawnMouseCell);
oldDrawnMouseCell = getScreen().getCharXY(mouseX, mouseY);
- if ((images.size() > 0) && (backend instanceof ECMA48Backend)) {
+ if (backend instanceof ECMA48Backend) {
// Special case: the entire row containing the mouse has
// to be re-drawn if it has any image data, AND any rows
// in between.
oldDrawnMouseX = mouseX;
oldDrawnMouseY = mouseY;
}
- if ((images.size() > 0) || getScreen().isDirty()) {
- backend.flushScreen();
+ if (getScreen().isDirty()) {
+ screenHandler.setDirty();
}
return;
}
oldDrawnMouseX, oldDrawnMouseY);
}
oldDrawnMouseCell = getScreen().getCharXY(mouseX, mouseY);
- if ((images.size() > 0) && (backend instanceof ECMA48Backend)) {
+ if (backend instanceof ECMA48Backend) {
// Special case: the entire row containing the mouse has to be
// re-drawn if it has any image data, AND any rows in between.
if (oldDrawnMouseY != mouseY) {
getScreen().hideCursor();
}
- // Flush the screen contents
- if ((images.size() > 0) || getScreen().isDirty()) {
- if (debugThreads) {
- System.err.printf("%d %s backend.flushScreen()\n",
- System.currentTimeMillis(), Thread.currentThread());
- }
- backend.flushScreen();
+ if (getScreen().isDirty()) {
+ screenHandler.setDirty();
}
-
repaint = false;
}
window.setY(windowY);
}
- // ------------------------------------------------------------------------
- // TImage management ------------------------------------------------------
- // ------------------------------------------------------------------------
-
- /**
- * Add an image to the list. Note package private access.
- *
- * @param image the image to add
- * @throws IllegalArgumentException if the image is already used in
- * another TApplication
- */
- final void addImage(final TImage image) {
- if ((image.getApplication() != null)
- && (image.getApplication() != this)
- ) {
- throw new IllegalArgumentException("Image " + image +
- " is already " + "part of application " +
- image.getApplication());
- }
- images.add(image);
- }
-
- /**
- * Remove an image from the list. Note package private access.
- *
- * @param image the image to remove
- * @throws IllegalArgumentException if the image is already used in
- * another TApplication
- */
- final void removeImage(final TImage image) {
- if ((image.getApplication() != null)
- && (image.getApplication() != this)
- ) {
- throw new IllegalArgumentException("Image " + image +
- " is already " + "part of application " +
- image.getApplication());
- }
- images.remove(image);
- }
-
// ------------------------------------------------------------------------
// TMenu management -------------------------------------------------------
// ------------------------------------------------------------------------
git://git.nikiroo.be / fanfix.git / blobdiff