st

Index Commits Files Refs README LICENSE

commit 045a0fab4f80b57f4a982ae6bc5f33fe21d66111
parent 9c30066e73f0105c3fccb7582c8172d5117857b3
Author: Jakub Leszczak <szatan@gecc.xyz>
Date:   Wed,  6 May 2020 13:36:59 +0200

Fix selection: selscroll

Diffstat:
M
st.c
 | 
26
++++++++------------------

1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/st.c b/st.c
@@ -1106,27 +1106,17 @@ selscroll(int orig, int n)
     if (sel.ob.x == -1)
         return;
 
-    if (BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
-        if ((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
+    if (BETWEEN(sel.nb.y, orig, term.bot) != BETWEEN(sel.ne.y, orig, term.bot)) {
+        selclear();
+    } else if (BETWEEN(sel.nb.y, orig, term.bot)) {
+        sel.ob.y += n;
+        sel.oe.y += n;
+        if (sel.ob.y < term.top || sel.ob.y > term.bot ||
+            sel.oe.y < term.top || sel.oe.y > term.bot) {
             selclear();
-            return;
-        }
-        if (sel.type == SEL_RECTANGULAR) {
-            if (sel.ob.y < term.top)
-                sel.ob.y = term.top;
-            if (sel.oe.y > term.bot)
-                sel.oe.y = term.bot;
         } else {
-            if (sel.ob.y < term.top) {
-                sel.ob.y = term.top;
-                sel.ob.x = 0;
-            }
-            if (sel.oe.y > term.bot) {
-                sel.oe.y = term.bot;
-                sel.oe.x = term.col;
-            }
+            selnormalize();
         }
-        selnormalize();
     }
 }