Commit Diff

Commit:
4b17dddb104bd2ac87dd6e334aafd325197c1407
From:
Christoph Lohmann <20h@r-36.net>
Date:
Message:
Making rectangular selection work again. People sending me patches against strange revisions and basing on their own revisions make me having to reapply them. Then such errors appear. Thanks Alexander Sedov <alex0player@gmail.com> for noticing this.
Actions:
Patch | Tree
commit - 55adf0aad1d5acf0b9a00e2a9f834cef8b61b3b3
commit + 4b17dddb104bd2ac87dd6e334aafd325197c1407
blob - 0923cec886d30e4e6de4c3826a94f799a01e7e42
blob + 131cba82da7e8383f6b285fc9e8e843ac857e80a
--- st.c
+++ st.c
@@ -649,13 +649,10 @@ selected(int x, int y) {
 	if(sel.ey == y && sel.by == y) {
 		bx = MIN(sel.bx, sel.ex);
 		ex = MAX(sel.bx, sel.ex);
+
 		return BETWEEN(x, bx, ex);
 	}
 
-	return ((sel.b.y < y && y < sel.e.y)
-			|| (y == sel.e.y && x <= sel.e.x))
-			|| (y == sel.b.y && x >= sel.b.x
-				&& (x <= sel.e.x || sel.b.y != sel.e.y));
 	switch(sel.type) {
 	case SEL_REGULAR:
 		return ((sel.b.y < y && y < sel.e.y)