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 <[email protected]> for noticing this.

diff --git a/st.c b/st.c
index 0923cec..131cba8 100644 (file)
--- a/st.c
+++ b/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);
        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 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)
        switch(sel.type) {
        case SEL_REGULAR:
                return ((sel.b.y < y && y < sel.e.y)