aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Palevich <jackpal@google.com>2012-09-22 22:11:27 -0700
committerJack Palevich <jackpal@google.com>2012-09-22 22:36:17 -0700
commitd455767e5dabad58644cdf4288b0cea0386bce58 (patch)
tree2e76877752073c7e442da7c1677b451f26c568fe
parentdf74020c9deb33f8e0b687db035af8dc4f9d8dcc (diff)
downloadAndroidTerm-d455767e5dabad58644cdf4288b0cea0386bce58.tar.gz
ED - Erase in Display should ignore scrolling margins.
-rw-r--r--libraries/emulatorview/src/jackpal/androidterm/emulatorview/TerminalEmulator.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/libraries/emulatorview/src/jackpal/androidterm/emulatorview/TerminalEmulator.java b/libraries/emulatorview/src/jackpal/androidterm/emulatorview/TerminalEmulator.java
index 30d7f5e..1da2663 100644
--- a/libraries/emulatorview/src/jackpal/androidterm/emulatorview/TerminalEmulator.java
+++ b/libraries/emulatorview/src/jackpal/androidterm/emulatorview/TerminalEmulator.java
@@ -1039,21 +1039,22 @@ class TerminalEmulator {
setHorizontalVerticalPosition();
break;
- case 'J': // ESC [ Pn J - Erase in Display
+ case 'J': // ESC [ Pn J - ED - Erase in Display
+ // ED ignores the scrolling margins.
switch (getArg0(0)) {
case 0: // Clear below
blockClear(mCursorCol, mCursorRow, mColumns - mCursorCol);
blockClear(0, mCursorRow + 1, mColumns,
- mBottomMargin - (mCursorRow + 1));
+ mRows - (mCursorRow + 1));
break;
case 1: // Erase from the start of the screen to the cursor.
- blockClear(0, mTopMargin, mColumns, mCursorRow - mTopMargin);
+ blockClear(0, 0, mColumns, mCursorRow);
blockClear(0, mCursorRow, mCursorCol + 1);
break;
case 2: // Clear all
- blockClear(0, mTopMargin, mColumns, mBottomMargin - mTopMargin);
+ blockClear(0, 0, mColumns, mRows);
break;
default: