* constant. Someday it would be nice to have a multi-line menu or
* toolbars.
*/
- private static final int desktopTop = 1;
+ private int desktopTop = 1;
/**
* Y coordinate of the bottom edge of the desktop.
*/
private boolean focusFollowsMouse = false;
+ /**
+ * If true, display a text-based mouse cursor.
+ */
+ private boolean textMouse = true;
+
+ /**
+ * If true, hide the mouse after typing a keystroke.
+ */
+ private boolean hideMouseWhenTyping = false;
+
+ /**
+ * If true, the mouse should not be displayed because a keystroke was
+ * typed.
+ */
+ private boolean typingHidMouse = false;
+
+ /**
+ * If true, hide the status bar.
+ */
+ private boolean hideStatusBar = false;
+
+ /**
+ * If true, hide the menu bar.
+ */
+ private boolean hideMenuBar = false;
+
/**
* The list of commands to run before the next I/O check.
*/
* Finish construction once the backend is set.
*/
private void TApplicationImpl() {
+ // Text block mouse option
+ if (System.getProperty("jexer.textMouse", "true").equals("false")) {
+ textMouse = false;
+ }
+
+ // Hide mouse when typing option
+ if (System.getProperty("jexer.hideMouseWhenTyping",
+ "false").equals("true")) {
+
+ hideMouseWhenTyping = true;
+ }
+
+ // Hide status bar option
+ if (System.getProperty("jexer.hideStatusBar",
+ "false").equals("true")) {
+ hideStatusBar = true;
+ }
+
+ // Hide menu bar option
+ if (System.getProperty("jexer.hideMenuBar", "false").equals("true")) {
+ hideMenuBar = true;
+ }
+
theme = new ColorTheme();
- desktopBottom = getScreen().getHeight() - 1;
+ desktopTop = (hideMenuBar ? 0 : 1);
+ desktopBottom = getScreen().getHeight() - 1 + (hideStatusBar ? 1 : 0);
fillEventQueue = new LinkedList<TInputEvent>();
drainEventQueue = new LinkedList<TInputEvent>();
windows = new LinkedList<TWindow>();
);
}
}
+
}
// ------------------------------------------------------------------------
// resources.
closeAllWindows();
+ // Close the desktop.
+ if (desktop != null) {
+ setDesktop(null);
+ }
+
// Give the overarching application an opportunity to release
// resources.
onExit();
return true;
}
- if (command.equals(cmMenu)) {
+ if (command.equals(cmMenu) && (hideMenuBar == false)) {
if (!modalWindowActive() && (activeMenu == null)) {
if (menus.size() > 0) {
menus.get(0).setActive(true);
openImage();
return true;
}
- if (menu.getId() == TMenu.MID_CHANGE_FONT) {
+ if (menu.getId() == TMenu.MID_SCREEN_OPTIONS) {
new TFontChooserWindow(this);
return true;
}
&& !keypress.getKey().isCtrl()
&& (activeMenu == null)
&& !modalWindowActive()
+ && (hideMenuBar == false)
) {
assert (subMenus.size() == 0);
screenResizeTime = System.currentTimeMillis();
}
desktopBottom = getScreen().getHeight() - 1;
+ if (hideStatusBar) {
+ desktopBottom++;
+ }
mouseX = 0;
mouseY = 0;
oldMouseX = 0;
oldMouseY = 0;
}
if (desktop != null) {
- desktop.setDimensions(0, 0, resize.getWidth(),
- resize.getHeight() - 1);
+ desktop.setDimensions(0, desktopTop, resize.getWidth(),
+ (desktopBottom - desktopTop));
desktop.onResize(resize);
}
// Special application-wide events -----------------------------------
+ if (event instanceof TKeypressEvent) {
+ if (hideMouseWhenTyping) {
+ typingHidMouse = true;
+ }
+ }
+
// Peek at the mouse position
if (event instanceof TMouseEvent) {
+ typingHidMouse = false;
+
TMouseEvent mouse = (TMouseEvent) event;
if ((mouseX != mouse.getX()) || (mouseY != mouse.getY())) {
oldMouseX = mouseX;
mouse.getAbsoluteX(), mouse.getAbsoluteY(),
mouse.isMouse1(), mouse.isMouse2(),
mouse.isMouse3(),
- mouse.isMouseWheelUp(), mouse.isMouseWheelDown());
+ mouse.isMouseWheelUp(), mouse.isMouseWheelDown(),
+ mouse.isAlt(), mouse.isCtrl(), mouse.isShift());
} else {
// The first click of a potential double-click.
}
} else if (event instanceof TKeypressEvent) {
dispatchToDesktop = false;
+ } else if (event instanceof TMenuEvent) {
+ dispatchToDesktop = false;
}
if (debugEvents) {
// Peek at the mouse position
if (event instanceof TMouseEvent) {
+ typingHidMouse = false;
+
TMouseEvent mouse = (TMouseEvent) event;
if ((mouseX != mouse.getX()) || (mouseY != mouse.getY())) {
oldMouseX = mouseX;
mouse.getAbsoluteX(), mouse.getAbsoluteY(),
mouse.isMouse1(), mouse.isMouse2(),
mouse.isMouse3(),
- mouse.isMouseWheelUp(), mouse.isMouseWheelDown());
+ mouse.isMouseWheelUp(), mouse.isMouseWheelDown(),
+ mouse.isAlt(), mouse.isCtrl(), mouse.isShift());
} else {
// The first click of a potential double-click.
*/
public final void setDesktop(final TDesktop desktop) {
if (this.desktop != null) {
+ this.desktop.onPreClose();
+ this.desktop.onUnfocus();
this.desktop.onClose();
}
this.desktop = desktop;
String version = getClass().getPackage().getImplementationVersion();
if (version == null) {
// This is Java 9+, use a hardcoded string here.
- version = "0.3.2";
+ version = "1.0.0";
}
messageBox(i18n.getString("aboutDialogTitle"),
MessageFormat.format(i18n.getString("aboutDialogText"), version),
// ------------------------------------------------------------------------
/**
- * Invert the cell color at a position. This is used to track the mouse.
+ * Draw the text mouse at position.
*
* @param x column position
* @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) {
+ private void drawTextMouse(final int x, final int y) {
if (debugThreads) {
- System.err.printf("%d %s invertCell() %d %d\n",
+ System.err.printf("%d %s drawTextMouse() %d %d\n",
System.currentTimeMillis(), Thread.currentThread(), x, y);
if (activeWindow != null) {
}
}
- Cell cell = getScreen().getCharXY(x, y);
- if (cell.isImage()) {
- cell.invertImage();
- } else {
- if (cell.getForeColorRGB() < 0) {
- cell.setForeColor(cell.getForeColor().invert());
- } else {
- cell.setForeColorRGB(cell.getForeColorRGB() ^ 0x00ffffff);
- }
- if (cell.getBackColorRGB() < 0) {
- cell.setBackColor(cell.getBackColor().invert());
- } else {
- cell.setBackColorRGB(cell.getBackColorRGB() ^ 0x00ffffff);
- }
- }
- 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;
- }
+ // If this cell is on top of the desktop, and the desktop has
+ // requested a hidden mouse, bail out.
+ if ((desktop != null) && (activeWindow == null) && (activeMenu == null)) {
+ if ((desktop.hasHiddenMouse() == true)
+ && (x > desktop.getX())
+ && (x < desktop.getX() + desktop.getWidth() - 1)
+ && (y > desktop.getY())
+ && (y < desktop.getY() + desktop.getHeight() - 1)
+ ) {
+ 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().invertCell(x, y);
}
/**
}
}
- // Draw mouse at the new position.
- invertCell(mouseX, mouseY);
+ if ((textMouse == true) && (typingHidMouse == false)) {
+ // Draw mouse at the new position.
+ drawTextMouse(mouseX, mouseY);
+ }
oldDrawnMouseX = mouseX;
oldDrawnMouseY = mouseY;
}
}
- // Draw the blank menubar line - reset the screen clipping first so
- // it won't trim it out.
- getScreen().resetClipping();
- getScreen().hLineXY(0, 0, getScreen().getWidth(), ' ',
- theme.getColor("tmenu"));
- // Now draw the menus.
- int x = 1;
- for (TMenu menu: menus) {
- CellAttributes menuColor;
- CellAttributes menuMnemonicColor;
- if (menu.isActive()) {
- menuIsActive = true;
- menuColor = theme.getColor("tmenu.highlighted");
- menuMnemonicColor = theme.getColor("tmenu.mnemonic.highlighted");
- topLevel = menu;
- } else {
- menuColor = theme.getColor("tmenu");
- menuMnemonicColor = theme.getColor("tmenu.mnemonic");
- }
- // Draw the menu title
- getScreen().hLineXY(x, 0, StringUtils.width(menu.getTitle()) + 2, ' ',
- menuColor);
- getScreen().putStringXY(x + 1, 0, menu.getTitle(), menuColor);
- // Draw the highlight character
- getScreen().putCharXY(x + 1 + menu.getMnemonic().getShortcutIdx(),
- 0, menu.getMnemonic().getShortcut(), menuMnemonicColor);
-
- if (menu.isActive()) {
- ((TWindow) menu).drawChildren();
- // Reset the screen clipping so we can draw the next title.
- getScreen().resetClipping();
- }
- x += StringUtils.width(menu.getTitle()) + 2;
- }
+ if (hideMenuBar == false) {
- for (TMenu menu: subMenus) {
- // Reset the screen clipping so we can draw the next sub-menu.
+ // Draw the blank menubar line - reset the screen clipping first
+ // so it won't trim it out.
getScreen().resetClipping();
- ((TWindow) menu).drawChildren();
+ getScreen().hLineXY(0, 0, getScreen().getWidth(), ' ',
+ theme.getColor("tmenu"));
+ // Now draw the menus.
+ int x = 1;
+ for (TMenu menu: menus) {
+ CellAttributes menuColor;
+ CellAttributes menuMnemonicColor;
+ if (menu.isActive()) {
+ menuIsActive = true;
+ menuColor = theme.getColor("tmenu.highlighted");
+ menuMnemonicColor = theme.getColor("tmenu.mnemonic.highlighted");
+ topLevel = menu;
+ } else {
+ menuColor = theme.getColor("tmenu");
+ menuMnemonicColor = theme.getColor("tmenu.mnemonic");
+ }
+ // Draw the menu title
+ getScreen().hLineXY(x, 0,
+ StringUtils.width(menu.getTitle()) + 2, ' ', menuColor);
+ getScreen().putStringXY(x + 1, 0, menu.getTitle(), menuColor);
+ // Draw the highlight character
+ getScreen().putCharXY(x + 1 +
+ menu.getMnemonic().getScreenShortcutIdx(),
+ 0, menu.getMnemonic().getShortcut(), menuMnemonicColor);
+
+ if (menu.isActive()) {
+ ((TWindow) menu).drawChildren();
+ // Reset the screen clipping so we can draw the next
+ // title.
+ getScreen().resetClipping();
+ }
+ x += StringUtils.width(menu.getTitle()) + 2;
+ }
+
+ for (TMenu menu: subMenus) {
+ // Reset the screen clipping so we can draw the next
+ // sub-menu.
+ getScreen().resetClipping();
+ ((TWindow) menu).drawChildren();
+ }
}
getScreen().resetClipping();
- // Draw the status bar of the top-level window
- TStatusBar statusBar = null;
- if (topLevel != null) {
- statusBar = topLevel.getStatusBar();
- }
- if (statusBar != null) {
- getScreen().resetClipping();
- statusBar.setWidth(getScreen().getWidth());
- statusBar.setY(getScreen().getHeight() - topLevel.getY());
- statusBar.draw();
- } else {
- CellAttributes barColor = new CellAttributes();
- barColor.setTo(getTheme().getColor("tstatusbar.text"));
- getScreen().hLineXY(0, desktopBottom, getScreen().getWidth(), ' ',
- barColor);
+ if (hideStatusBar == false) {
+ // Draw the status bar of the top-level window
+ TStatusBar statusBar = null;
+ if (topLevel != null) {
+ statusBar = topLevel.getStatusBar();
+ }
+ if (statusBar != null) {
+ getScreen().resetClipping();
+ statusBar.setWidth(getScreen().getWidth());
+ statusBar.setY(getScreen().getHeight() - topLevel.getY());
+ statusBar.draw();
+ } else {
+ CellAttributes barColor = new CellAttributes();
+ barColor.setTo(getTheme().getColor("tstatusbar.text"));
+ getScreen().hLineXY(0, desktopBottom, getScreen().getWidth(),
+ ' ', barColor);
+ }
}
// Draw the mouse pointer
getScreen().unsetImageRow(mouseY);
}
}
- invertCell(mouseX, mouseY);
+ if ((textMouse == true) && (typingHidMouse == false)) {
+ drawTextMouse(mouseX, mouseY);
+ }
oldDrawnMouseX = mouseX;
oldDrawnMouseY = mouseY;
// Place the cursor if it is visible
if (!menuIsActive) {
+
+ int visibleWindowCount = 0;
+ for (TWindow window: sorted) {
+ if (window.isShown()) {
+ visibleWindowCount++;
+ }
+ }
+ if (visibleWindowCount == 0) {
+ // No windows are visible, only the desktop. Allow it to
+ // have the cursor.
+ if (desktop != null) {
+ sorted.add(desktop);
+ }
+ }
+
TWidget activeWidget = null;
if (sorted.size() > 0) {
activeWidget = sorted.get(sorted.size() - 1).getActiveChild();
+ int cursorClipTop = desktopTop;
+ int cursorClipBottom = desktopBottom;
if (activeWidget.isCursorVisible()) {
- if ((activeWidget.getCursorAbsoluteY() < desktopBottom)
- && (activeWidget.getCursorAbsoluteY() > desktopTop)
+ if ((activeWidget.getCursorAbsoluteY() <= cursorClipBottom)
+ && (activeWidget.getCursorAbsoluteY() >= cursorClipTop)
) {
getScreen().putCursor(true,
activeWidget.getCursorAbsoluteX(),
assert (!window.isActive());
if (activeWindow != null) {
- // TODO: see if this assertion is really necessary.
- // assert (activeWindow.getZ() == 0);
-
activeWindow.setActive(false);
// Increment every window Z that is on top of window
if (((window.flags & TWindow.CENTERED) == 0)
&& ((window.flags & TWindow.ABSOLUTEXY) == 0)
&& (smartWindowPlacement == true)
+ && (!(window instanceof TDesktop))
) {
doSmartPlacement(window);
&& (!modalWindowActive())
&& (!overrideMenuWindowActive())
&& (mouse.getAbsoluteY() == 0)
+ && (hideMenuBar == false)
) {
for (TMenu menu: subMenus) {
&& (mouse.isMouse1())
&& (activeMenu != null)
&& (mouse.getAbsoluteY() == 0)
+ && (hideMenuBar == false)
) {
TMenu oldMenu = activeMenu;
*/
public final void switchMenu(final boolean forward) {
assert (activeMenu != null);
+ assert (hideMenuBar == false);
for (TMenu menu: subMenus) {
menu.setActive(false);
TMenu toolMenu = addMenu(i18n.getString("toolMenuTitle"));
toolMenu.addDefaultItem(TMenu.MID_REPAINT);
toolMenu.addDefaultItem(TMenu.MID_VIEW_IMAGE);
- toolMenu.addDefaultItem(TMenu.MID_CHANGE_FONT);
+ toolMenu.addDefaultItem(TMenu.MID_SCREEN_OPTIONS);
TStatusBar toolStatusBar = toolMenu.newStatusBar(i18n.
getString("toolMenuStatus"));
toolStatusBar.addShortcutKeypress(kbF1, cmHelp, i18n.getString("Help"));
git://git.nikiroo.be / nikiroo-utils.git / blobdiff