}
synchronized (this) {
- /*
- System.err.printf("%s %s sleep\n", this, primary ?
- "primary" : "secondary");
- */
+ if (debugThreads) {
+ System.err.printf("%s %s sleep\n", this,
+ primary ? "primary" : "secondary");
+ }
this.wait();
- /*
- System.err.printf("%s %s AWAKE\n", this, primary ?
- "primary" : "secondary");
- */
+ if (debugThreads) {
+ System.err.printf("%s %s AWAKE\n", this,
+ primary ? "primary" : "secondary");
+ }
if ((!primary)
&& (application.secondaryEventReceiver == null)
// got here then something went wrong with
// the handoff between yield() and
// closeWindow().
-
- System.err.printf("secondary exiting at wrong time, why?\n");
synchronized (application.primaryEventHandler) {
application.primaryEventHandler.notify();
}
application.secondaryEventHandler = null;
- return;
+ throw new RuntimeException(
+ "secondary exited at wrong time");
}
break;
}
// the event.
boolean oldLock = lockHandleEvent();
assert (oldLock == false);
+ application.repaint = true;
if (primary) {
primaryHandleEvent(event);
} else {
secondaryHandleEvent(event);
}
- application.repaint = true;
if ((!primary)
&& (application.secondaryEventReceiver == null)
) {
synchronized (this) {
// Wait for TApplication.run() to finish using the global state
// before allowing further event processing.
- while (lockoutHandleEvent == true);
+ while (lockoutHandleEvent == true) {}
oldValue = insideHandleEvent;
insideHandleEvent = true;
lockoutHandleEvent = true;
// Wait for the last event to finish processing before returning
// control to TApplication.run().
- while (insideHandleEvent == true);
+ while (insideHandleEvent == true) {}
if (debugThreads) {
System.err.printf(" XXX\n");
*/
private int mouseY;
+ /**
+ * Old version of mouse coordinate X.
+ */
+ private int oldMouseX;
+
+ /**
+ * Old version mouse coordinate Y.
+ */
+ private int oldMouseY;
+
/**
* Event queue that is filled by run().
*/
*/
private volatile boolean repaint = true;
- /**
- * When true, just flush updates from the screen. This is only used to
- * minimize physical writes for the mouse cursor.
- */
- private boolean flush = false;
-
/**
* Y coordinate of the top edge of the desktop. For now this is a
* constant. Someday it would be nice to have a multi-line menu or
}
/**
- * Invert the cell at the mouse pointer position.
+ * Invert the cell color at a position. This is used to track the mouse.
+ *
+ * @param x column position
+ * @param y row position
*/
- private void drawMouse() {
- CellAttributes attr = getScreen().getAttrXY(mouseX, mouseY);
- attr.setForeColor(attr.getForeColor().invert());
- attr.setBackColor(attr.getBackColor().invert());
- getScreen().putAttrXY(mouseX, mouseY, attr, false);
- flush = true;
-
- if (windows.size() == 0) {
- repaint = true;
+ private void invertCell(final int x, final int y) {
+ synchronized (getScreen()) {
+ CellAttributes attr = getScreen().getAttrXY(x, y);
+ attr.setForeColor(attr.getForeColor().invert());
+ attr.setBackColor(attr.getBackColor().invert());
+ getScreen().putAttrXY(x, y, attr, false);
}
}
System.err.printf("drawAll() enter\n");
}
- if ((flush) && (!repaint)) {
- backend.flushScreen();
- flush = false;
+ if (!repaint) {
+ synchronized (getScreen()) {
+ if ((oldMouseX != mouseX) || (oldMouseY != mouseY)) {
+ // The only thing that has happened is the mouse moved.
+ // Clear the old position and draw the new position.
+ invertCell(oldMouseX, oldMouseY);
+ invertCell(mouseX, mouseY);
+ oldMouseX = mouseX;
+ oldMouseY = mouseY;
+ }
+ }
+ if (getScreen().isDirty()) {
+ backend.flushScreen();
+ }
return;
}
}
// Draw the mouse pointer
- drawMouse();
+ invertCell(mouseX, mouseY);
// Place the cursor if it is visible
TWidget activeWidget = null;
backend.flushScreen();
repaint = false;
- flush = false;
}
/**
// If I've got no updates to render, wait for something from the
// backend or a timer.
- if (!repaint && !flush) {
+ if (!repaint
+ && ((mouseX == oldMouseX) && (mouseY == oldMouseY))
+ ) {
// Never sleep longer than 100 millis, to get windows with
// background tasks an opportunity to update the display.
timeout = getSleepTime(100);
// I'm awake and don't care why, let's see what's going
// on out there.
}
+ repaint = true;
}
// Pull any pending I/O events
// Screen resize
if (event instanceof TResizeEvent) {
TResizeEvent resize = (TResizeEvent) event;
- getScreen().setDimensions(resize.getWidth(),
- resize.getHeight());
- desktopBottom = getScreen().getHeight() - 1;
- repaint = true;
- mouseX = 0;
- mouseY = 0;
+ synchronized (getScreen()) {
+ getScreen().setDimensions(resize.getWidth(),
+ resize.getHeight());
+ desktopBottom = getScreen().getHeight() - 1;
+ mouseX = 0;
+ mouseY = 0;
+ oldMouseX = 0;
+ oldMouseY = 0;
+ }
return;
}
// Peek at the mouse position
if (event instanceof TMouseEvent) {
TMouseEvent mouse = (TMouseEvent) event;
- if ((mouseX != mouse.getX()) || (mouseY != mouse.getY())) {
- mouseX = mouse.getX();
- mouseY = mouse.getY();
- drawMouse();
+ synchronized (getScreen()) {
+ if ((mouseX != mouse.getX()) || (mouseY != mouse.getY())) {
+ oldMouseX = mouseX;
+ oldMouseY = mouseY;
+ mouseX = mouse.getX();
+ mouseY = mouse.getY();
+ }
}
}
- // Put into the main queue
+ // Put into the main queue
synchronized (drainEventQueue) {
drainEventQueue.add(event);
}
item = accelerators.get(keypressLowercase);
}
if (item != null) {
- // Let the menu item dispatch
- item.dispatch();
- return;
- } else {
- // Handle the keypress
- if (onKeypress(keypress)) {
+ if (item.getEnabled()) {
+ // Let the menu item dispatch
+ item.dispatch();
return;
}
}
+ // Handle the keypress
+ if (onKeypress(keypress)) {
+ return;
+ }
}
if (event instanceof TCommandEvent) {
secondaryEventReceiver = widget;
secondaryEventHandler = new WidgetEventHandler(this, false);
(new Thread(secondaryEventHandler)).start();
-
- // Refresh
- repaint = true;
}
/**
boolean oldLock = unlockHandleEvent();
assert (oldLock == true);
- // System.err.printf("YIELD\n");
-
while (secondaryEventReceiver != null) {
synchronized (primaryEventHandler) {
try {
}
}
}
-
- // System.err.printf("EXIT YIELD\n");
}
/**
* @param timeout = initial (maximum) timeout in millis
* @return number of milliseconds between now and the next timer event
*/
- protected long getSleepTime(final long timeout) {
+ private long getSleepTime(final long timeout) {
Date now = new Date();
long nowTime = now.getTime();
long sleepTime = timeout;
// Perform window cleanup
window.onClose();
- // Refresh screen
- repaint = true;
-
// Check if we are closing a TMessageBox or similar
if (secondaryEventReceiver != null) {
assert (secondaryEventHandler != null);
} // synchronized (windows)
- // Refresh
- repaint = true;
}
/**
menu.setActive(false);
}
}
- repaint = true;
return;
}
// They switched menus
oldMenu.setActive(false);
}
- repaint = true;
return;
}
windows.get(0).setZ(window.getZ());
window.setZ(0);
window.setActive(true);
- repaint = true;
return;
}
}
}
subMenus.clear();
}
- repaint = true;
}
/**
assert (item != null);
item.setActive(false);
subMenus.remove(subMenus.size() - 1);
- repaint = true;
}
/**
activeMenu.setActive(false);
activeMenu = menus.get(i);
activeMenu.setActive(true);
- repaint = true;
return;
}
}
TMessageBox.Type.YESNO).getResult() == TMessageBox.Result.YES) {
quit = true;
}
- repaint = true;
return true;
}
if (command.equals(cmShell)) {
openTerminal(0, 0, TWindow.RESIZABLE);
- repaint = true;
return true;
}
if (command.equals(cmTile)) {
tileWindows();
- repaint = true;
return true;
}
if (command.equals(cmCascade)) {
cascadeWindows();
- repaint = true;
return true;
}
if (command.equals(cmCloseAll)) {
closeAllWindows();
- repaint = true;
return true;
}
TMessageBox.Type.YESNO).getResult() == TMessageBox.Result.YES) {
quit = true;
}
- // System.err.printf("onMenu MID_EXIT result: quit = %s\n", quit);
- repaint = true;
return true;
}
if (menu.getId() == TMenu.MID_SHELL) {
openTerminal(0, 0, TWindow.RESIZABLE);
- repaint = true;
return true;
}
if (menu.getId() == TMenu.MID_TILE) {
tileWindows();
- repaint = true;
return true;
}
if (menu.getId() == TMenu.MID_CASCADE) {
cascadeWindows();
- repaint = true;
return true;
}
if (menu.getId() == TMenu.MID_CLOSE_ALL) {
closeAllWindows();
- repaint = true;
return true;
}
return false;
) {
activeMenu = menu;
menu.setActive(true);
- repaint = true;
return true;
}
}
public final void addAccelerator(final TMenuItem item,
final TKeypress keypress) {
- // System.err.printf("addAccelerator: key %s item %s\n", keypress, item);
-
synchronized (accelerators) {
assert (accelerators.get(keypress) == null);
accelerators.put(keypress, item);
import java.util.LinkedList;
import java.util.List;
+import jexer.TKeypress;
+import jexer.event.TMouseEvent;
import jexer.bits.Color;
import jexer.bits.Cell;
import jexer.bits.CellAttributes;
-import jexer.TKeypress;
import static jexer.TKeypress.*;
/**
* caveats:
*
* <p>
+ * - The vttest scenario for VT220 8-bit controls (11.1.2.3) reports a
+ * failure with XTERM. This is due to vttest failing to decode the UTF-8
+ * stream.
+ *
+ * <p>
* - Smooth scrolling, printing, keyboard locking, keyboard leds, and tests
* from VT100 are not supported.
*
/**
* Return the proper TERM environment variable for this device type.
*
- * @return "TERM=vt100", "TERM=xterm", etc.
+ * @param deviceType DeviceType.VT100, DeviceType, XTERM, etc.
+ * @return "vt100", "xterm", etc.
*/
- public String deviceTypeTerm() {
- switch (type) {
+ public static String deviceTypeTerm(final DeviceType deviceType) {
+ switch (deviceType) {
case VT100:
- return "TERM=vt100";
+ return "vt100";
case VT102:
- return "TERM=vt102";
+ return "vt102";
case VT220:
- return "TERM=vt220";
+ return "vt220";
case XTERM:
- return "TERM=xterm";
+ return "xterm";
default:
- throw new IllegalArgumentException("Invalid device type: " + type);
+ throw new IllegalArgumentException("Invalid device type: "
+ + deviceType);
}
}
* about UTF-8, the others are defined by their standard to be either
* 7-bit or 8-bit characters only.
*
+ * @param deviceType DeviceType.VT100, DeviceType, XTERM, etc.
* @param baseLang a base language without UTF-8 flag such as "C" or
* "en_US"
* @return "LANG=en_US", "LANG=en_US.UTF-8", etc.
*/
- public String deviceTypeLang(final String baseLang) {
- switch (type) {
+ public static String deviceTypeLang(final DeviceType deviceType,
+ final String baseLang) {
- case VT100:
- return "LANG=" + baseLang;
+ switch (deviceType) {
+ case VT100:
case VT102:
- return "LANG=" + baseLang;
-
case VT220:
- return "LANG=" + baseLang;
+ return baseLang;
case XTERM:
- return "LANG=" + baseLang + ".UTF-8";
+ return baseLang + ".UTF-8";
default:
- throw new IllegalArgumentException("Invalid device type: " + type);
+ throw new IllegalArgumentException("Invalid device type: "
+ + deviceType);
}
}
G3_GL
}
+ /**
+ * XTERM mouse reporting protocols.
+ */
+ private enum MouseProtocol {
+ OFF,
+ X10,
+ NORMAL,
+ BUTTONEVENT,
+ ANYEVENT
+ }
+
+ /**
+ * Which mouse protocol is active.
+ */
+ private MouseProtocol mouseProtocol = MouseProtocol.OFF;
+
+ /**
+ * XTERM mouse reporting encodings.
+ */
+ private enum MouseEncoding {
+ X10,
+ UTF8
+ }
+
+ /**
+ * Which mouse encoding is active.
+ */
+ private MouseEncoding mouseEncoding = MouseEncoding.X10;
+
/**
* Physical display width. We start at 80x24, but the user can resize us
* bigger/smaller.
return screenTitle;
}
- /**
- * Array of flags that have come in, e.g. '?' (DEC private mode), '=',
- * '>' (<), ...
- */
- private List<Character> csiFlags;
-
/**
* Parameter characters being collected.
*/
/**
* Non-csi collect buffer.
*/
- private List<Character> collectBuffer;
+ private StringBuilder collectBuffer;
/**
* When true, use the G1 character set.
*/
private void toGround() {
csiParams.clear();
- csiFlags.clear();
- collectBuffer.clear();
+ collectBuffer = new StringBuilder(8);
scanState = ScanState.GROUND;
}
s8c1t = false;
printerControllerMode = false;
+ // XTERM
+ mouseProtocol = MouseProtocol.OFF;
+ mouseEncoding = MouseEncoding.X10;
+
// Tab stops
resetTabStops();
assert (inputStream != null);
assert (outputStream != null);
- csiFlags = new ArrayList<Character>();
csiParams = new ArrayList<Integer>();
- collectBuffer = new ArrayList<Character>();
tabStops = new ArrayList<Integer>();
scrollback = new LinkedList<DisplayLine>();
display = new LinkedList<DisplayLine>();
}
}
+ /**
+ * Translate the mouse event to a VT100, VT220, or XTERM sequence and
+ * send to the remote side.
+ *
+ * @param mouse mouse event received from the local user
+ */
+ public void mouse(final TMouseEvent mouse) {
+ /*
+ * TODO:
+ *
+ * - Parse the mouse requests from the remote side regarding protocol
+ * + encoding
+ *
+ * - Send mouse events to the other side.
+ *
+ * - Handle the cursor (double invert).
+ */
+
+ // System.err.printf("Mouse: %s\n", mouse);
+
+ /*
+ if (mouseEncoding != MouseEncoding.UTF8) {
+ // We only support UTF8 encoding, bail out now.
+ return;
+ }
+ */
+
+ switch (mouseProtocol) {
+
+ case OFF:
+ // Do nothing
+ return;
+
+ case X10:
+ // Only report button presses
+ if (mouse.getType() != TMouseEvent.Type.MOUSE_DOWN) {
+ return;
+ }
+ break;
+
+ case NORMAL:
+ // Only report button presses and releases
+ if ((mouse.getType() != TMouseEvent.Type.MOUSE_DOWN)
+ && (mouse.getType() != TMouseEvent.Type.MOUSE_UP)
+ ) {
+ return;
+ }
+ break;
+
+ case BUTTONEVENT:
+ /*
+ * Only report button presses, button releases, and motions that
+ * 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()
+ ) {
+ return;
+ }
+ }
+ break;
+
+ case ANYEVENT:
+ // Report everything
+ break;
+ }
+
+ // Now encode the event
+ StringBuilder sb = new StringBuilder(6);
+ sb.append((char) 0x1B);
+ sb.append('[');
+ sb.append('M');
+ 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));
+ } else {
+ sb.append((char) (0x03 + 32));
+ }
+
+ sb.append((char) (mouse.getX() + 33));
+ sb.append((char) (mouse.getY() + 33));
+
+ // System.err.printf("Would write: \'%s\'\n", sb.toString());
+ writeRemote(sb.toString());
+ }
+
/**
* Translate the keyboard press to a VT100, VT220, or XTERM sequence and
* send to the remote side.
* @param ch character to save
*/
private void collect(final char ch) {
- collectBuffer.add(new Character(ch));
+ collectBuffer.append(ch);
}
/**
*/
private void setToggle(final boolean value) {
boolean decPrivateModeFlag = false;
- for (Character ch: collectBuffer) {
- if (ch == '?') {
+ for (int i = 0; i < collectBuffer.length(); i++) {
+ if (collectBuffer.charAt(i) == '?') {
decPrivateModeFlag = true;
+ break;
}
}
break;
+ case 1000:
+ if ((type == DeviceType.XTERM)
+ && (decPrivateModeFlag == true)
+ ) {
+ // Mouse: normal tracking mode
+ if (value == true) {
+ mouseProtocol = MouseProtocol.NORMAL;
+ } else {
+ mouseProtocol = MouseProtocol.OFF;
+ }
+ }
+ break;
+
+ case 1002:
+ if ((type == DeviceType.XTERM)
+ && (decPrivateModeFlag == true)
+ ) {
+ // Mouse: normal tracking mode
+ if (value == true) {
+ mouseProtocol = MouseProtocol.BUTTONEVENT;
+ } else {
+ mouseProtocol = MouseProtocol.OFF;
+ }
+ }
+ break;
+
+ case 1003:
+ if ((type == DeviceType.XTERM)
+ && (decPrivateModeFlag == true)
+ ) {
+ // Mouse: Any-event tracking mode
+ if (value == true) {
+ mouseProtocol = MouseProtocol.ANYEVENT;
+ } else {
+ mouseProtocol = MouseProtocol.OFF;
+ }
+ }
+ break;
+
+ case 1005:
+ if ((type == DeviceType.XTERM)
+ && (decPrivateModeFlag == true)
+ ) {
+ // Mouse: UTF-8 coordinates
+ if (value == true) {
+ mouseEncoding = MouseEncoding.UTF8;
+ } else {
+ mouseEncoding = MouseEncoding.X10;
+ }
+ }
+ break;
+
default:
break;
boolean honorProtected = false;
boolean decPrivateModeFlag = false;
- for (Character ch: collectBuffer) {
- if (ch == '?') {
+ for (int i = 0; i < collectBuffer.length(); i++) {
+ if (collectBuffer.charAt(i) == '?') {
decPrivateModeFlag = true;
+ break;
}
}
boolean honorProtected = false;
boolean decPrivateModeFlag = false;
- for (Character ch: collectBuffer) {
- if (ch == '?') {
+ for (int i = 0; i < collectBuffer.length(); i++) {
+ if (collectBuffer.charAt(i) == '?') {
decPrivateModeFlag = true;
+ break;
}
}
private void da() {
int extendedFlag = 0;
int i = 0;
- Character [] chars = collectBuffer.toArray(new Character[0]);
- StringBuilder args = new StringBuilder();
- for (int j = 1; j < chars.length; j++) {
- args.append(chars[j]);
- }
-
- if (chars.length > 0) {
- if (chars[0] == '>') {
+ if (collectBuffer.length() > 0) {
+ String args = collectBuffer.substring(1);
+ if (collectBuffer.charAt(0) == '>') {
extendedFlag = 1;
- if (chars.length >= 2) {
+ if (collectBuffer.length() >= 2) {
i = Integer.parseInt(args.toString());
}
- } else if (chars[0] == '=') {
+ } else if (collectBuffer.charAt(0) == '=') {
extendedFlag = 2;
- if (chars.length >= 2) {
+ if (collectBuffer.length() >= 2) {
i = Integer.parseInt(args.toString());
}
} else {
private void dsr() {
boolean decPrivateModeFlag = false;
- for (Character ch: collectBuffer) {
- if (ch == '?') {
+ for (int i = 0; i < collectBuffer.length(); i++) {
+ if (collectBuffer.charAt(i) == '?') {
decPrivateModeFlag = true;
+ break;
}
}
*/
private void printerFunctions() {
boolean decPrivateModeFlag = false;
- for (Character ch: collectBuffer) {
- if (ch == '?') {
+ for (int i = 0; i < collectBuffer.length(); i++) {
+ if (collectBuffer.charAt(i) == '?') {
decPrivateModeFlag = true;
+ break;
}
}
*/
private void oscPut(final char xtermChar) {
// Collect first
- collectBuffer.add(new Character(xtermChar));
+ collectBuffer.append(xtermChar);
// Xterm cases...
if (xtermChar == 0x07) {
- Character [] chars = collectBuffer.toArray(new Character[0]);
- StringBuilder args = new StringBuilder();
- for (int j = 0; j < chars.length - 1; j++) {
- args.append(chars[j]);
- }
+ String args = collectBuffer.substring(0,
+ collectBuffer.length() - 1);
String [] p = args.toString().split(";");
if (p.length > 0) {
if ((p[0].equals("0")) || (p[0].equals("2"))) {
if ((ch >= 0x30) && (ch <= 0x7E)) {
switch (ch) {
case '0':
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> Special graphics
currentState.g0Charset = CharacterSet.DRAWING;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> Special graphics
currentState.g1Charset = CharacterSet.DRAWING;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> Special graphics
currentState.g2Charset = CharacterSet.DRAWING;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> Special graphics
currentState.g3Charset = CharacterSet.DRAWING;
}
}
break;
case '1':
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> Alternate character ROM standard character set
currentState.g0Charset = CharacterSet.ROM;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> Alternate character ROM standard character set
currentState.g1Charset = CharacterSet.ROM;
}
break;
case '2':
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> Alternate character ROM special graphics
currentState.g0Charset = CharacterSet.ROM_SPECIAL;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> Alternate character ROM special graphics
currentState.g1Charset = CharacterSet.ROM_SPECIAL;
}
break;
case '3':
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '#')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '#')) {
// DECDHL - Double-height line (top half)
dechdl(true);
}
break;
case '4':
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '#')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '#')) {
// DECDHL - Double-height line (bottom half)
dechdl(false);
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> DUTCH
currentState.g0Charset = CharacterSet.NRC_DUTCH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> DUTCH
currentState.g1Charset = CharacterSet.NRC_DUTCH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> DUTCH
currentState.g2Charset = CharacterSet.NRC_DUTCH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> DUTCH
currentState.g3Charset = CharacterSet.NRC_DUTCH;
}
}
break;
case '5':
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '#')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '#')) {
// DECSWL - Single-width line
decswl();
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> FINNISH
currentState.g0Charset = CharacterSet.NRC_FINNISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> FINNISH
currentState.g1Charset = CharacterSet.NRC_FINNISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> FINNISH
currentState.g2Charset = CharacterSet.NRC_FINNISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> FINNISH
currentState.g3Charset = CharacterSet.NRC_FINNISH;
}
}
break;
case '6':
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '#')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '#')) {
// DECDWL - Double-width line
decdwl();
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> NORWEGIAN
currentState.g0Charset = CharacterSet.NRC_NORWEGIAN;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> NORWEGIAN
currentState.g1Charset = CharacterSet.NRC_NORWEGIAN;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> NORWEGIAN
currentState.g2Charset = CharacterSet.NRC_NORWEGIAN;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> NORWEGIAN
currentState.g3Charset = CharacterSet.NRC_NORWEGIAN;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> SWEDISH
currentState.g0Charset = CharacterSet.NRC_SWEDISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> SWEDISH
currentState.g1Charset = CharacterSet.NRC_SWEDISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> SWEDISH
currentState.g2Charset = CharacterSet.NRC_SWEDISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> SWEDISH
currentState.g3Charset = CharacterSet.NRC_SWEDISH;
}
}
break;
case '8':
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '#')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '#')) {
// DECALN - Screen alignment display
decaln();
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> DEC_SUPPLEMENTAL
currentState.g0Charset = CharacterSet.DEC_SUPPLEMENTAL;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> DEC_SUPPLEMENTAL
currentState.g1Charset = CharacterSet.DEC_SUPPLEMENTAL;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> DEC_SUPPLEMENTAL
currentState.g2Charset = CharacterSet.DEC_SUPPLEMENTAL;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> DEC_SUPPLEMENTAL
currentState.g3Charset = CharacterSet.DEC_SUPPLEMENTAL;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> SWISS
currentState.g0Charset = CharacterSet.NRC_SWISS;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> SWISS
currentState.g1Charset = CharacterSet.NRC_SWISS;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> SWISS
currentState.g2Charset = CharacterSet.NRC_SWISS;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> SWISS
currentState.g3Charset = CharacterSet.NRC_SWISS;
}
case '@':
break;
case 'A':
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> United Kingdom set
currentState.g0Charset = CharacterSet.UK;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> United Kingdom set
currentState.g1Charset = CharacterSet.UK;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> United Kingdom set
currentState.g2Charset = CharacterSet.UK;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> United Kingdom set
currentState.g3Charset = CharacterSet.UK;
}
}
break;
case 'B':
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> ASCII set
currentState.g0Charset = CharacterSet.US;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> ASCII set
currentState.g1Charset = CharacterSet.US;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> ASCII
currentState.g2Charset = CharacterSet.US;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> ASCII
currentState.g3Charset = CharacterSet.US;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> FINNISH
currentState.g0Charset = CharacterSet.NRC_FINNISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> FINNISH
currentState.g1Charset = CharacterSet.NRC_FINNISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> FINNISH
currentState.g2Charset = CharacterSet.NRC_FINNISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> FINNISH
currentState.g3Charset = CharacterSet.NRC_FINNISH;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> NORWEGIAN
currentState.g0Charset = CharacterSet.NRC_NORWEGIAN;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> NORWEGIAN
currentState.g1Charset = CharacterSet.NRC_NORWEGIAN;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> NORWEGIAN
currentState.g2Charset = CharacterSet.NRC_NORWEGIAN;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> NORWEGIAN
currentState.g3Charset = CharacterSet.NRC_NORWEGIAN;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ' ')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ' ')) {
// S7C1T
s8c1t = false;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ' ')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ' ')) {
// S8C1T
s8c1t = true;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> SWEDISH
currentState.g0Charset = CharacterSet.NRC_SWEDISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> SWEDISH
currentState.g1Charset = CharacterSet.NRC_SWEDISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> SWEDISH
currentState.g2Charset = CharacterSet.NRC_SWEDISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> SWEDISH
currentState.g3Charset = CharacterSet.NRC_SWEDISH;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> GERMAN
currentState.g0Charset = CharacterSet.NRC_GERMAN;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> GERMAN
currentState.g1Charset = CharacterSet.NRC_GERMAN;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> GERMAN
currentState.g2Charset = CharacterSet.NRC_GERMAN;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> GERMAN
currentState.g3Charset = CharacterSet.NRC_GERMAN;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> FRENCH_CA
currentState.g0Charset = CharacterSet.NRC_FRENCH_CA;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> FRENCH_CA
currentState.g1Charset = CharacterSet.NRC_FRENCH_CA;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> FRENCH_CA
currentState.g2Charset = CharacterSet.NRC_FRENCH_CA;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> FRENCH_CA
currentState.g3Charset = CharacterSet.NRC_FRENCH_CA;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> FRENCH
currentState.g0Charset = CharacterSet.NRC_FRENCH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> FRENCH
currentState.g1Charset = CharacterSet.NRC_FRENCH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> FRENCH
currentState.g2Charset = CharacterSet.NRC_FRENCH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> FRENCH
currentState.g3Charset = CharacterSet.NRC_FRENCH;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> ITALIAN
currentState.g0Charset = CharacterSet.NRC_ITALIAN;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> ITALIAN
currentState.g1Charset = CharacterSet.NRC_ITALIAN;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> ITALIAN
currentState.g2Charset = CharacterSet.NRC_ITALIAN;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> ITALIAN
currentState.g3Charset = CharacterSet.NRC_ITALIAN;
}
if ((type == DeviceType.VT220)
|| (type == DeviceType.XTERM)) {
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '(')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '(')) {
// G0 --> SPANISH
currentState.g0Charset = CharacterSet.NRC_SPANISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == ')')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == ')')) {
// G1 --> SPANISH
currentState.g1Charset = CharacterSet.NRC_SPANISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '*')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '*')) {
// G2 --> SPANISH
currentState.g2Charset = CharacterSet.NRC_SPANISH;
}
- if ((collectBuffer.size() == 1)
- && (collectBuffer.get(0) == '+')) {
+ if ((collectBuffer.length() == 1)
+ && (collectBuffer.charAt(0) == '+')) {
// G3 --> SPANISH
currentState.g3Charset = CharacterSet.NRC_SPANISH;
}
case 'p':
if (((type == DeviceType.VT220)
|| (type == DeviceType.XTERM))
- && (collectBuffer.get(collectBuffer.size() - 1) == '\"')
+ && (collectBuffer.charAt(collectBuffer.length() - 1) == '\"')
) {
// DECSCL - compatibility level
decscl();
}
if ((type == DeviceType.XTERM)
- && (collectBuffer.get(collectBuffer.size() - 1) == '!')
+ && (collectBuffer.charAt(collectBuffer.length() - 1) == '!')
) {
// DECSTR - Soft terminal reset
decstr();
case 'q':
if (((type == DeviceType.VT220)
|| (type == DeviceType.XTERM))
- && (collectBuffer.get(collectBuffer.size() - 1) == '\"')
+ && (collectBuffer.charAt(collectBuffer.length() - 1) == '\"')
) {
// DECSCA
decsca();
collect(ch);
}
if (ch == 0x5C) {
- if ((collectBuffer.size() > 0)
- && (collectBuffer.get(collectBuffer.size() - 1) == 0x1B)) {
+ if ((collectBuffer.length() > 0)
+ && (collectBuffer.charAt(collectBuffer.length() - 1) == 0x1B)
+ ) {
toGround();
}
}
collect(ch);
}
if (ch == 0x5C) {
- if ((collectBuffer.size() > 0) &&
- (collectBuffer.get(collectBuffer.size() - 1) == 0x1B)) {
+ if ((collectBuffer.length() > 0) &&
+ (collectBuffer.charAt(collectBuffer.length() - 1) == 0x1B)
+ ) {
toGround();
}
}
collect(ch);
}
if (ch == 0x5C) {
- if ((collectBuffer.size() > 0) &&
- (collectBuffer.get(collectBuffer.size() - 1) == 0x1B)) {
+ if ((collectBuffer.length() > 0) &&
+ (collectBuffer.charAt(collectBuffer.length() - 1) == 0x1B)
+ ) {
toGround();
}
}
collect(ch);
}
if (ch == 0x5C) {
- if ((collectBuffer.size() > 0)
- && (collectBuffer.get(collectBuffer.size() - 1) == 0x1B)
+ if ((collectBuffer.length() > 0)
+ && (collectBuffer.charAt(collectBuffer.length() - 1) == 0x1B)
) {
toGround();
}
case VT52_DIRECT_CURSOR_ADDRESS:
// This is a special case for the VT52 sequence "ESC Y l c"
- if (collectBuffer.size() == 0) {
+ if (collectBuffer.length() == 0) {
collect(ch);
- } else if (collectBuffer.size() == 1) {
+ } else if (collectBuffer.length() == 1) {
// We've got the two characters, one in the buffer and the
// other in ch.
- cursorPosition(collectBuffer.get(0) - '\040', ch - '\040');
+ cursorPosition(collectBuffer.charAt(0) - '\040', ch - '\040');
toGround();
}
return;
* @return current cursor X
*/
public final int getCursorX() {
+ if (display.get(currentState.cursorY).isDoubleWidth()) {
+ return currentState.cursorX * 2;
+ }
return currentState.cursorX;
}
git://git.nikiroo.be / nikiroo-utils.git / commitdiff