-/**
+/*
* Jexer - Java Text User Interface
*
* License: LGPLv3 or later
*/
private enum MouseEncoding {
X10,
- UTF8
+ UTF8,
+ SGR
}
/**
*
* @return if true, the cursor is visible
*/
- public final boolean visibleCursor() {
+ public final boolean isCursorVisible() {
return cursorVisible;
}
* Whether number pad keys send VT100 or VT52, application or numeric
* sequences.
*/
+ @SuppressWarnings("unused")
private KeypadMode keypadMode;
/**
mouseProtocol, mouseEncoding, mouse);
*/
- if (mouseEncoding != MouseEncoding.UTF8) {
+ if (mouseEncoding == MouseEncoding.X10) {
// We will support X10 but only for (160,94) and smaller.
if ((mouse.getX() >= 160) || (mouse.getY() >= 94)) {
return;
* have a button down (i.e. drag-and-drop).
*/
if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) {
- if (!mouse.getMouse1()
- && !mouse.getMouse2()
- && !mouse.getMouse3()
- && !mouse.getMouseWheelUp()
- && !mouse.getMouseWheelDown()
+ if (!mouse.isMouse1()
+ && !mouse.isMouse2()
+ && !mouse.isMouse3()
+ && !mouse.isMouseWheelUp()
+ && !mouse.isMouseWheelDown()
) {
return;
}
// Now encode the event
StringBuilder sb = new StringBuilder(6);
- sb.append((char) 0x1B);
- sb.append('[');
- sb.append('M');
- if (mouse.getType() == TMouseEvent.Type.MOUSE_UP) {
- sb.append((char) (0x03 + 32));
- } else if (mouse.getMouse1()) {
- sb.append((char) (0x00 + 32));
- } else if (mouse.getMouse2()) {
- sb.append((char) (0x01 + 32));
- } else if (mouse.getMouse3()) {
- sb.append((char) (0x02 + 32));
- } else if (mouse.getMouseWheelUp()) {
- sb.append((char) (0x04 + 64));
- } else if (mouse.getMouseWheelDown()) {
- sb.append((char) (0x05 + 64));
+ if (mouseEncoding == MouseEncoding.SGR) {
+ sb.append((char) 0x1B);
+ sb.append("[<");
+
+ if (mouse.isMouse1()) {
+ if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) {
+ sb.append("32;");
+ } else {
+ sb.append("0;");
+ }
+ } else if (mouse.isMouse2()) {
+ if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) {
+ sb.append("33;");
+ } else {
+ sb.append("1;");
+ }
+ } else if (mouse.isMouse3()) {
+ if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) {
+ sb.append("34;");
+ } else {
+ sb.append("2;");
+ }
+ } else if (mouse.isMouseWheelUp()) {
+ sb.append("64;");
+ } else if (mouse.isMouseWheelDown()) {
+ sb.append("65;");
+ } else {
+ // This is motion with no buttons down.
+ sb.append("35;");
+ }
+
+ sb.append(String.format("%d;%d", mouse.getX() + 1,
+ mouse.getY() + 1));
+
+ if (mouse.getType() == TMouseEvent.Type.MOUSE_UP) {
+ sb.append("m");
+ } else {
+ sb.append("M");
+ }
+
} else {
- sb.append((char) (0x03 + 32));
- }
+ // X10 and UTF8 encodings
+ sb.append((char) 0x1B);
+ sb.append('[');
+ sb.append('M');
+ if (mouse.getType() == TMouseEvent.Type.MOUSE_UP) {
+ sb.append((char) (0x03 + 32));
+ } else if (mouse.isMouse1()) {
+ if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) {
+ sb.append((char) (0x00 + 32 + 32));
+ } else {
+ sb.append((char) (0x00 + 32));
+ }
+ } else if (mouse.isMouse2()) {
+ if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) {
+ sb.append((char) (0x01 + 32 + 32));
+ } else {
+ sb.append((char) (0x01 + 32));
+ }
+ } else if (mouse.isMouse3()) {
+ if (mouse.getType() == TMouseEvent.Type.MOUSE_MOTION) {
+ sb.append((char) (0x02 + 32 + 32));
+ } else {
+ sb.append((char) (0x02 + 32));
+ }
+ } else if (mouse.isMouseWheelUp()) {
+ sb.append((char) (0x04 + 64));
+ } else if (mouse.isMouseWheelDown()) {
+ sb.append((char) (0x05 + 64));
+ } else {
+ // This is motion with no buttons down.
+ sb.append((char) (0x03 + 32));
+ }
- sb.append((char) (mouse.getX() + 33));
- sb.append((char) (mouse.getY() + 33));
+ sb.append((char) (mouse.getX() + 33));
+ sb.append((char) (mouse.getY() + 33));
+ }
// System.err.printf("Would write: \'%s\'\n", sb.toString());
writeRemote(sb.toString());
*/
private String keypressToString(final TKeypress keypress) {
- if ((fullDuplex == false) && (!keypress.getIsKey())) {
+ if ((fullDuplex == false) && (!keypress.isFnKey())) {
/*
* If this is a control character, process it like it came from
* the remote side.
*/
- if (keypress.getCh() < 0x20) {
- handleControlChar(keypress.getCh());
+ if (keypress.getChar() < 0x20) {
+ handleControlChar(keypress.getChar());
} else {
// Local echo for everything else
- printCharacter(keypress.getCh());
+ printCharacter(keypress.getChar());
}
}
}
// Handle control characters
- if ((keypress.getCtrl()) && (!keypress.getIsKey())) {
+ if ((keypress.isCtrl()) && (!keypress.isFnKey())) {
StringBuilder sb = new StringBuilder();
- char ch = keypress.getCh();
+ char ch = keypress.getChar();
ch -= 0x40;
sb.append(ch);
return sb.toString();
}
// Handle alt characters
- if ((keypress.getAlt()) && (!keypress.getIsKey())) {
+ if ((keypress.isAlt()) && (!keypress.isFnKey())) {
StringBuilder sb = new StringBuilder("\033");
- char ch = keypress.getCh();
+ char ch = keypress.getChar();
sb.append(ch);
return sb.toString();
}
}
// Non-alt, non-ctrl characters
- if (!keypress.getIsKey()) {
+ if (!keypress.isFnKey()) {
StringBuilder sb = new StringBuilder();
- sb.append(keypress.getCh());
+ sb.append(keypress.getChar());
return sb.toString();
}
return "";
}
break;
+ case 1006:
+ if ((type == DeviceType.XTERM)
+ && (decPrivateModeFlag == true)
+ ) {
+ // Mouse: SGR coordinates
+ if (value == true) {
+ mouseEncoding = MouseEncoding.SGR;
+ } else {
+ mouseEncoding = MouseEncoding.X10;
+ }
+ }
+ break;
+
default:
break;
for (int i = start; i <= end; i++) {
DisplayLine line = display.get(currentState.cursorY);
if ((!honorProtected)
- || ((honorProtected) && (!line.charAt(i).getProtect()))) {
+ || ((honorProtected) && (!line.charAt(i).isProtect()))) {
switch (type) {
case VT100: