git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring - boolean getters and miscellaneous
[fanfix.git]
/
src
/
jexer
/
tterminal
/
ECMA48.java
diff --git
a/src/jexer/tterminal/ECMA48.java
b/src/jexer/tterminal/ECMA48.java
index 22867e1d1c6e7c45e549dfdfc55999940e6aee53..7b41594be4eff9ab073437f9fb64f2302b18f259 100644
(file)
--- a/
src/jexer/tterminal/ECMA48.java
+++ b/
src/jexer/tterminal/ECMA48.java
@@
-614,7
+614,7
@@
public class ECMA48 implements Runnable {
*
* @return if true, the cursor is visible
*/
*
* @return if true, the cursor is visible
*/
- public final boolean
visibleCursor
() {
+ public final boolean
isCursorVisible
() {
return cursorVisible;
}
return cursorVisible;
}
@@
-1145,11
+1145,11
@@
public class ECMA48 implements Runnable {
* have a button down (i.e. drag-and-drop).
*/
if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) {
* have a button down (i.e. drag-and-drop).
*/
if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) {
- if (!mouse.
get
Mouse1()
- && !mouse.
get
Mouse2()
- && !mouse.
get
Mouse3()
- && !mouse.
get
MouseWheelUp()
- && !mouse.
get
MouseWheelDown()
+ if (!mouse.
is
Mouse1()
+ && !mouse.
is
Mouse2()
+ && !mouse.
is
Mouse3()
+ && !mouse.
is
MouseWheelUp()
+ && !mouse.
is
MouseWheelDown()
) {
return;
}
) {
return;
}
@@
-1168,15
+1168,15
@@
public class ECMA48 implements Runnable {
sb.append('M');
if (mouse.getType() == TMouseEvent.Type.MOUSE_UP) {
sb.append((char) (0x03 + 32));
sb.append('M');
if (mouse.getType() == TMouseEvent.Type.MOUSE_UP) {
sb.append((char) (0x03 + 32));
- } else if (mouse.
get
Mouse1()) {
+ } else if (mouse.
is
Mouse1()) {
sb.append((char) (0x00 + 32));
sb.append((char) (0x00 + 32));
- } else if (mouse.
get
Mouse2()) {
+ } else if (mouse.
is
Mouse2()) {
sb.append((char) (0x01 + 32));
sb.append((char) (0x01 + 32));
- } else if (mouse.
get
Mouse3()) {
+ } else if (mouse.
is
Mouse3()) {
sb.append((char) (0x02 + 32));
sb.append((char) (0x02 + 32));
- } else if (mouse.
get
MouseWheelUp()) {
+ } else if (mouse.
is
MouseWheelUp()) {
sb.append((char) (0x04 + 64));
sb.append((char) (0x04 + 64));
- } else if (mouse.
get
MouseWheelDown()) {
+ } else if (mouse.
is
MouseWheelDown()) {
sb.append((char) (0x05 + 64));
} else {
sb.append((char) (0x03 + 32));
sb.append((char) (0x05 + 64));
} else {
sb.append((char) (0x03 + 32));
@@
-1207,16
+1207,16
@@
public class ECMA48 implements Runnable {
*/
private String keypressToString(final TKeypress keypress) {
*/
private String keypressToString(final TKeypress keypress) {
- if ((fullDuplex == false) && (!keypress.
getIs
Key())) {
+ if ((fullDuplex == false) && (!keypress.
isFn
Key())) {
/*
* If this is a control character, process it like it came from
* the remote side.
*/
/*
* If this is a control character, process it like it came from
* the remote side.
*/
- if (keypress.getCh() < 0x20) {
- handleControlChar(keypress.getCh());
+ if (keypress.getCh
ar
() < 0x20) {
+ handleControlChar(keypress.getCh
ar
());
} else {
// Local echo for everything else
} else {
// Local echo for everything else
- printCharacter(keypress.getCh());
+ printCharacter(keypress.getCh
ar
());
}
}
}
}
@@
-1226,18
+1226,18
@@
public class ECMA48 implements Runnable {
}
// Handle control characters
}
// Handle control characters
- if ((keypress.
getCtrl()) && (!keypress.getIs
Key())) {
+ if ((keypress.
isCtrl()) && (!keypress.isFn
Key())) {
StringBuilder sb = new StringBuilder();
StringBuilder sb = new StringBuilder();
- char ch = keypress.getCh();
+ char ch = keypress.getCh
ar
();
ch -= 0x40;
sb.append(ch);
return sb.toString();
}
// Handle alt characters
ch -= 0x40;
sb.append(ch);
return sb.toString();
}
// Handle alt characters
- if ((keypress.
getAlt()) && (!keypress.getIs
Key())) {
+ if ((keypress.
isAlt()) && (!keypress.isFn
Key())) {
StringBuilder sb = new StringBuilder("\033");
StringBuilder sb = new StringBuilder("\033");
- char ch = keypress.getCh();
+ char ch = keypress.getCh
ar
();
sb.append(ch);
return sb.toString();
}
sb.append(ch);
return sb.toString();
}
@@
-1635,9
+1635,9
@@
public class ECMA48 implements Runnable {
}
// Non-alt, non-ctrl characters
}
// Non-alt, non-ctrl characters
- if (!keypress.
getIs
Key()) {
+ if (!keypress.
isFn
Key()) {
StringBuilder sb = new StringBuilder();
StringBuilder sb = new StringBuilder();
- sb.append(keypress.getCh());
+ sb.append(keypress.getCh
ar
());
return sb.toString();
}
return "";
return sb.toString();
}
return "";
@@
-3546,7
+3546,7
@@
public class ECMA48 implements Runnable {
for (int i = start; i <= end; i++) {
DisplayLine line = display.get(currentState.cursorY);
if ((!honorProtected)
for (int i = start; i <= end; i++) {
DisplayLine line = display.get(currentState.cursorY);
if ((!honorProtected)
- || ((honorProtected) && (!line.charAt(i).
get
Protect()))) {
+ || ((honorProtected) && (!line.charAt(i).
is
Protect()))) {
switch (type) {
case VT100:
switch (type) {
case VT100: