git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blinking cursor and SGR 1006 mode
[nikiroo-utils.git]
/
src
/
jexer
/
TTerminalWindow.java
diff --git
a/src/jexer/TTerminalWindow.java
b/src/jexer/TTerminalWindow.java
index 336c3ff8db7cd19c2a6761f98469cc869f0b6b78..f85e346e4a230f646e6e41635941a516e6281f72 100644
(file)
--- a/
src/jexer/TTerminalWindow.java
+++ b/
src/jexer/TTerminalWindow.java
@@
-208,7
+208,7
@@
public class TTerminalWindow extends TWindow {
Cell ch = line.charAt(i);
Cell newCell = new Cell();
newCell.setTo(ch);
Cell ch = line.charAt(i);
Cell newCell = new Cell();
newCell.setTo(ch);
- boolean reverse = line.isReverseColor() ^ ch.
get
Reverse();
+ boolean reverse = line.isReverseColor() ^ ch.
is
Reverse();
newCell.setReverse(false);
if (reverse) {
newCell.setBackColor(ch.getForeColor());
newCell.setReverse(false);
if (reverse) {
newCell.setBackColor(ch.getForeColor());
@@
-242,7
+242,12
@@
public class TTerminalWindow extends TWindow {
* Handle window close.
*/
@Override public void onClose() {
* Handle window close.
*/
@Override public void onClose() {
- emulator.close();
+ if (shell != null) {
+ shell.destroy();
+ shell = null;
+ } else {
+ emulator.close();
+ }
}
/**
}
/**
@@
-260,12
+265,12
@@
public class TTerminalWindow extends TWindow {
if (vScroller != null) {
setCursorY(getCursorY() - vScroller.getValue());
}
if (vScroller != null) {
setCursorY(getCursorY() - vScroller.getValue());
}
- set
HasCursor(emulator.visibleCursor
());
+ set
CursorVisible(emulator.isCursorVisible
());
if (getCursorX() > getWidth() - 2) {
if (getCursorX() > getWidth() - 2) {
- set
HasCursor
(false);
+ set
CursorVisible
(false);
}
if ((getCursorY() > getHeight() - 2) || (getCursorY() < 0)) {
}
if ((getCursorY() > getHeight() - 2) || (getCursorY() < 0)) {
- set
HasCursor
(false);
+ set
CursorVisible
(false);
}
if (emulator.getScreenTitle().length() > 0) {
// Only update the title if the shell is still alive
}
if (emulator.getScreenTitle().length() > 0) {
// Only update the title if the shell is still alive
@@
-439,11
+444,11
@@
public class TTerminalWindow extends TWindow {
return;
}
return;
}
- if (mouse.
get
MouseWheelUp()) {
+ if (mouse.
is
MouseWheelUp()) {
vScroller.decrement();
return;
}
vScroller.decrement();
return;
}
- if (mouse.
get
MouseWheelDown()) {
+ if (mouse.
is
MouseWheelDown()) {
vScroller.increment();
return;
}
vScroller.increment();
return;
}