mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
43 lines
1.3 KiB
Diff
43 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
|
|
|
|
|