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.
This commit is contained in:
Christoph Lohmann 2013-03-20 21:19:28 +01:00
parent 55adf0aad1
commit 4b17dddb10

5
st.c
View File

@ -649,13 +649,10 @@ selected(int x, int y) {
if(sel.ey == y && sel.by == y) { if(sel.ey == y && sel.by == y) {
bx = MIN(sel.bx, sel.ex); bx = MIN(sel.bx, sel.ex);
ex = MAX(sel.bx, sel.ex); ex = MAX(sel.bx, sel.ex);
return BETWEEN(x, bx, 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) { switch(sel.type) {
case SEL_REGULAR: case SEL_REGULAR:
return ((sel.b.y < y && y < sel.e.y) return ((sel.b.y < y && y < sel.e.y)