mirror of
git://slackware.nl/current.git
synced 2025-01-10 05:25:51 +01:00
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
|
From 7ff23512fd6c6af1dba87083446f85baf75e9c71 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kurt Hindenburg <kurt.hindenburg@gmail.com>
|
||
|
|
Date: Sat, 1 Jul 2017 19:12:39 -0400
|
||
|
|
Subject: Correct scrollUp behavior
|
||
|
|
|
||
|
|
CSI S escape sequence (SU, scroll up) ignored if number of lines to
|
||
|
|
scroll bigger than scrollable lines
|
||
|
|
|
||
|
|
REVIEW: 130133
|
||
|
|
BUG: 379318
|
||
|
|
---
|
||
|
|
src/Screen.cpp | 9 +++++++--
|
||
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/Screen.cpp b/src/Screen.cpp
|
||
|
|
index 94841a9..15bd685 100644
|
||
|
|
--- a/src/Screen.cpp
|
||
|
|
+++ b/src/Screen.cpp
|
||
|
|
@@ -746,13 +746,18 @@ QRect Screen::lastScrolledRegion() const
|
||
|
|
|
||
|
|
void Screen::scrollUp(int from, int n)
|
||
|
|
{
|
||
|
|
- if (n <= 0 || from + n > _bottomMargin) return;
|
||
|
|
+ if (n <= 0)
|
||
|
|
+ return;
|
||
|
|
+ if (from > _bottomMargin)
|
||
|
|
+ return;
|
||
|
|
+ if (from + n > _bottomMargin)
|
||
|
|
+ n = _bottomMargin + 1 - from;
|
||
|
|
|
||
|
|
_scrolledLines -= n;
|
||
|
|
_lastScrolledRegion = QRect(0, _topMargin, _columns - 1, (_bottomMargin - _topMargin));
|
||
|
|
|
||
|
|
//FIXME: make sure `topMargin', `bottomMargin', `from', `n' is in bounds.
|
||
|
|
- moveImage(loc(0, from), loc(0, from + n), loc(_columns - 1, _bottomMargin));
|
||
|
|
+ moveImage(loc(0, from), loc(0, from + n), loc(_columns, _bottomMargin));
|
||
|
|
clearImage(loc(0, _bottomMargin - n + 1), loc(_columns - 1, _bottomMargin), ' ');
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
cgit v0.11.2
|
||
|
|
|
||
|
|
|