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

Do not limit cursor movement to scroll region

Browse Source 
The scrolling region set by DECSTBM should not affect the
Cursor Down (CUD) and Cursor Up (CUU) escape sequences.

Fixes #1340.
This commit is contained in:
Fredrik Fornwall
2019-11-10 22:05:06 +01:00
parent 070436a6ed
commit cdccc2c433
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
View File

@@ -1376,10 +1376,10 @@ public final class TerminalEmulator {
} }
break; break;
case 'A': // "CSI${n}A" - Cursor up (CUU) ${n} rows. case 'A': // "CSI${n}A" - Cursor up (CUU) ${n} rows.
setCursorRow(Math.max(mTopMargin, mCursorRow - getArg0(1))); setCursorRow(Math.max(0, mCursorRow - getArg0(1)));
break; break;
case 'B': // "CSI${n}B" - Cursor down (CUD) ${n} rows. case 'B': // "CSI${n}B" - Cursor down (CUD) ${n} rows.
setCursorRow(Math.min(mBottomMargin - 1, mCursorRow + getArg0(1))); setCursorRow(Math.min(mRows - 1, mCursorRow + getArg0(1)));
break; break;
case 'C': // "CSI${n}C" - Cursor forward (CUF). case 'C': // "CSI${n}C" - Cursor forward (CUF).
case 'a': // "CSI${n}a" - Horizontal position relative (HPR). From ISO-6428/ECMA-48. case 'a': // "CSI${n}a" - Horizontal position relative (HPR). From ISO-6428/ECMA-48.

20
terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
View File

@@ -107,4 +107,24 @@ public class ScrollRegionTest extends TerminalTestCase {
assertLinesAre("1 ", "2 ", "3 ", "QQ", "YY"); assertLinesAre("1 ", "2 ", "3 ", "QQ", "YY");
} }
/** See https://github.com/termux/termux-app/issues/1340 */
public void testScrollRegionDoesNotLimitCursorMovement() {
withTerminalSized(6, 4)
.enterString("\033[4;7r\033[3;1Haaa\033[Axxx")
.assertLinesAre(
" ",
" xxx",
"aaa ",
" "
);
withTerminalSized(6, 4)
.enterString("\033[1;3r\033[3;1Haaa\033[Bxxx")
.assertLinesAre(
" ",
" ",
"aaa ",
" xxx"
);
}
} }