Cell ch = line.charAt(i);
Cell newCell = new Cell();
newCell.setTo(ch);
- boolean reverse = line.isReverseColor() ^ ch.getReverse();
+ boolean reverse = line.isReverseColor() ^ ch.isReverse();
newCell.setReverse(false);
if (reverse) {
newCell.setBackColor(ch.getForeColor());
if (vScroller != null) {
setCursorY(getCursorY() - vScroller.getValue());
}
- setHasCursor(emulator.visibleCursor());
+ setCursorVisible(emulator.isCursorVisible());
if (getCursorX() > getWidth() - 2) {
- setHasCursor(false);
+ setCursorVisible(false);
}
if ((getCursorY() > getHeight() - 2) || (getCursorY() < 0)) {
- setHasCursor(false);
+ setCursorVisible(false);
}
if (emulator.getScreenTitle().length() > 0) {
// Only update the title if the shell is still alive
// Check to see if the shell has died.
if (!emulator.isReading() && (shell != null)) {
- // The emulator exited on its own, all is fine
- setTitle(String.format("%s [Completed - %d]",
- getTitle(), shell.exitValue()));
- shell = null;
- emulator.close();
+ try {
+ int rc = shell.exitValue();
+ // The emulator exited on its own, all is fine
+ setTitle(String.format("%s [Completed - %d]",
+ getTitle(), shell.exitValue()));
+ shell = null;
+ emulator.close();
+ } catch (IllegalThreadStateException e) {
+ // The emulator thread has exited, but the shell Process
+ // hasn't figured that out yet. Do nothing, we will see
+ // this in a future tick.
+ }
} else if (emulator.isReading() && (shell != null)) {
// The shell might be dead, let's check
try {
return;
}
- if (mouse.getMouseWheelUp()) {
+ if (mouse.isMouseWheelUp()) {
vScroller.decrement();
return;
}
- if (mouse.getMouseWheelDown()) {
+ if (mouse.isMouseWheelDown()) {
vScroller.increment();
return;
}