fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-07 19:14:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle backspace across wrapped lines (closes #59)

Browse Source
This commit is contained in:
Fredrik Fornwall
2016-03-07 23:45:02 +01:00
parent 46c9c4b80e
commit ca71265f23
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/termux/terminal/TerminalBuffer.java
View File

@@ -127,10 +127,14 @@ public final class TerminalBuffer {
mLines[externalToInternalRow(row)].mLineWrap = true; mLines[externalToInternalRow(row)].mLineWrap = true;
} }
private boolean getLineWrap(int row) { public boolean getLineWrap(int row) {
return mLines[externalToInternalRow(row)].mLineWrap; return mLines[externalToInternalRow(row)].mLineWrap;
} }
public void clearLineWrap(int row) {
mLines[externalToInternalRow(row)].mLineWrap = false;
}
/** /**
* Resize the screen which this transcript backs. Currently, this only works if the number of columns does not * Resize the screen which this transcript backs. Currently, this only works if the number of columns does not
* change or the rows expand (that is, it only works when shrinking the number of rows). * change or the rows expand (that is, it only works when shrinking the number of rows).

10
app/src/main/java/com/termux/terminal/TerminalEmulator.java
View File

@@ -475,7 +475,15 @@ public final class TerminalEmulator {
mSession.onBell(); mSession.onBell();
break; break;
case 8: // Backspace (BS, ^H). case 8: // Backspace (BS, ^H).
setCursorCol(Math.max(mLeftMargin, mCursorCol - 1)); if (mLeftMargin == mCursorCol) {
// Jump to previous line if it was auto-wrapped.
if (mCursorRow > 0 && mScreen.getLineWrap(mCursorRow-1)) {
mScreen.clearLineWrap(mCursorRow - 1);
setCursorRowCol(mCursorRow-1,mRightMargin-1);
}
} else {
setCursorCol(mCursorCol - 1);
}
break; break;
case 9: // Horizontal tab (HT, \t) - move to next tab stop, but not past edge of screen case 9: // Horizontal tab (HT, \t) - move to next tab stop, but not past edge of screen
// XXX: Should perhaps use color if writing to new cells. Try with // XXX: Should perhaps use color if writing to new cells. Try with

9
app/src/test/java/com/termux/terminal/CursorAndScreenTest.java
View File

@@ -218,4 +218,13 @@ public class CursorAndScreenTest extends TerminalTestCase {
" -"); " -");
} }
public void testBackspaceAcrossWrappedLines() {
// Backspace should not go to previous line if not auto-wrapped:
withTerminalSized(3, 3).enterString("hi\r\n\b\byou").assertLinesAre("hi ", "you", " ");
// Backspace should go to previous line if auto-wrapped:
withTerminalSized(3, 3).enterString("hi y").assertLinesAre("hi ", "y ", " ").enterString("\b\b#").assertLinesAre("hi#", "y ", " ");
// Initial backspace should do nothing:
withTerminalSized(3, 3).enterString("\b\b\b\bhi").assertLinesAre("hi ", " ", " ");
}
} }