import jexer.backend.TWindowBackend;
import jexer.menu.TMenu;
import jexer.menu.TMenuItem;
+import jexer.menu.TSubMenu;
import static jexer.TCommand.*;
import static jexer.TKeypress.*;
*/
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.
*/
// resumes working on the primary.
application.secondaryEventHandler = null;
- // DO NOT UNLOCK. Primary thread just came back from
- // primaryHandleEvent() and will unlock in the else
- // block below. Just wake it up.
+ // We are ready to exit, wake up the primary thread.
+ // Remember that it is currently sleeping inside its
+ // primaryHandleEvent().
synchronized (application.primaryEventHandler) {
application.primaryEventHandler.notify();
}
}
}
+ /**
+ * 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.
* Run this application until it exits.
*/
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();
+ // Give the overarching application an opportunity to release
+ // resources.
+ onExit();
+
+ // System.err.println("*** TApplication.run() exits ***");
}
// ------------------------------------------------------------------------
drawAll();
}
+ // Wake up the screen repainter
+ wakeScreenHandler();
+
if (debugThreads) {
System.err.printf(System.currentTimeMillis() + " " +
Thread.currentThread() + " finishEventProcessing() END\n");
// Abort everything
if (event instanceof TCommandEvent) {
TCommandEvent command = (TCommandEvent) event;
- if (command.getCmd().equals(cmAbort)) {
+ if (command.equals(cmAbort)) {
exit();
return;
}
if (desktop != null) {
desktop.setDimensions(0, 0, resize.getWidth(),
resize.getHeight() - 1);
+ desktop.onResize(resize);
}
// Change menu edges if needed.
}
}
+ /**
+ * 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.0";
+ 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;
}
}
}
+ /**
+ * Subclasses can use this hook to cleanup resources. Called as the last
+ * step of TApplication.run().
+ */
+ public void onExit() {
+ // Default does nothing.
+ }
+
// ------------------------------------------------------------------------
// TWindow management -----------------------------------------------------
// ------------------------------------------------------------------------
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 -------------------------------------------------------
// ------------------------------------------------------------------------
}
}
+ /**
+ * Get the menu item associated with this ID.
+ *
+ * @param id the menu item ID
+ * @return the menu item, or null if not found
+ */
+ public final TMenuItem getMenuItem(final int id) {
+ for (TMenuItem item: menuItems) {
+ if (item.getId() == id) {
+ return item;
+ }
+ }
+ return null;
+ }
+
/**
* Recompute menu x positions based on their title length.
*/
*/
public final TMenu addFileMenu() {
TMenu fileMenu = addMenu(i18n.getString("fileMenuTitle"));
- fileMenu.addDefaultItem(TMenu.MID_OPEN_FILE);
- fileMenu.addSeparator();
fileMenu.addDefaultItem(TMenu.MID_SHELL);
+ fileMenu.addSeparator();
fileMenu.addDefaultItem(TMenu.MID_EXIT);
TStatusBar statusBar = fileMenu.newStatusBar(i18n.
getString("fileMenuStatus"));
return helpMenu;
}
+ /**
+ * Convenience function to add a default "Table" menu.
+ *
+ * @return the new menu
+ */
+ public final TMenu addTableMenu() {
+ TMenu tableMenu = addMenu(i18n.getString("tableMenuTitle"));
+ tableMenu.addDefaultItem(TMenu.MID_TABLE_RENAME_COLUMN, false);
+ tableMenu.addDefaultItem(TMenu.MID_TABLE_RENAME_ROW, false);
+ tableMenu.addSeparator();
+
+ TSubMenu viewMenu = tableMenu.addSubMenu(i18n.
+ getString("tableSubMenuView"));
+ viewMenu.addDefaultItem(TMenu.MID_TABLE_VIEW_ROW_LABELS, false);
+ viewMenu.addDefaultItem(TMenu.MID_TABLE_VIEW_COLUMN_LABELS, false);
+ viewMenu.addDefaultItem(TMenu.MID_TABLE_VIEW_HIGHLIGHT_ROW, false);
+ viewMenu.addDefaultItem(TMenu.MID_TABLE_VIEW_HIGHLIGHT_COLUMN, false);
+
+ TSubMenu borderMenu = tableMenu.addSubMenu(i18n.
+ getString("tableSubMenuBorders"));
+ borderMenu.addDefaultItem(TMenu.MID_TABLE_BORDER_NONE, false);
+ borderMenu.addDefaultItem(TMenu.MID_TABLE_BORDER_ALL, false);
+ borderMenu.addDefaultItem(TMenu.MID_TABLE_BORDER_CELL_NONE, false);
+ borderMenu.addDefaultItem(TMenu.MID_TABLE_BORDER_CELL_ALL, false);
+ borderMenu.addDefaultItem(TMenu.MID_TABLE_BORDER_RIGHT, false);
+ borderMenu.addDefaultItem(TMenu.MID_TABLE_BORDER_LEFT, false);
+ borderMenu.addDefaultItem(TMenu.MID_TABLE_BORDER_TOP, false);
+ borderMenu.addDefaultItem(TMenu.MID_TABLE_BORDER_BOTTOM, false);
+ borderMenu.addDefaultItem(TMenu.MID_TABLE_BORDER_DOUBLE_BOTTOM, false);
+ borderMenu.addDefaultItem(TMenu.MID_TABLE_BORDER_THICK_BOTTOM, false);
+ TSubMenu deleteMenu = tableMenu.addSubMenu(i18n.
+ getString("tableSubMenuDelete"));
+ deleteMenu.addDefaultItem(TMenu.MID_TABLE_DELETE_LEFT, false);
+ deleteMenu.addDefaultItem(TMenu.MID_TABLE_DELETE_UP, false);
+ deleteMenu.addDefaultItem(TMenu.MID_TABLE_DELETE_ROW, false);
+ deleteMenu.addDefaultItem(TMenu.MID_TABLE_DELETE_COLUMN, false);
+ TSubMenu insertMenu = tableMenu.addSubMenu(i18n.
+ getString("tableSubMenuInsert"));
+ insertMenu.addDefaultItem(TMenu.MID_TABLE_INSERT_LEFT, false);
+ insertMenu.addDefaultItem(TMenu.MID_TABLE_INSERT_RIGHT, false);
+ insertMenu.addDefaultItem(TMenu.MID_TABLE_INSERT_ABOVE, false);
+ insertMenu.addDefaultItem(TMenu.MID_TABLE_INSERT_BELOW, false);
+ TSubMenu columnMenu = tableMenu.addSubMenu(i18n.
+ getString("tableSubMenuColumn"));
+ columnMenu.addDefaultItem(TMenu.MID_TABLE_COLUMN_NARROW, false);
+ columnMenu.addDefaultItem(TMenu.MID_TABLE_COLUMN_WIDEN, false);
+ TSubMenu fileMenu = tableMenu.addSubMenu(i18n.
+ getString("tableSubMenuFile"));
+ fileMenu.addDefaultItem(TMenu.MID_TABLE_FILE_OPEN_CSV, false);
+ fileMenu.addDefaultItem(TMenu.MID_TABLE_FILE_SAVE_CSV, false);
+ fileMenu.addDefaultItem(TMenu.MID_TABLE_FILE_SAVE_TEXT, false);
+
+ TStatusBar statusBar = tableMenu.newStatusBar(i18n.
+ getString("tableMenuStatus"));
+ statusBar.addShortcutKeypress(kbF1, cmHelp, i18n.getString("Help"));
+ return tableMenu;
+ }
+
// ------------------------------------------------------------------------
// TTimer management ------------------------------------------------------
// ------------------------------------------------------------------------
git://git.nikiroo.be / fanfix.git / blobdiff