marco/st
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify selected().

Browse Source
This commit is contained in:
noname 2014-04-27 15:16:41 +04:00 committed by Roberto E. Vargas Caballero
parent 9e3e8ce466
commit 5f91983541
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
st.c
View File

@ -674,18 +674,13 @@ selsort(void) {
static inline bool
selected(int x, int y) {
if(sel.ne.y == y && sel.nb.y == y)
return BETWEEN(x, sel.nb.x, sel.ne.x);
if(sel.type == SEL_RECTANGULAR)
return BETWEEN(y, sel.nb.y, sel.ne.y)
&& BETWEEN(x, sel.nb.x, sel.ne.x);
if(sel.type == SEL_RECTANGULAR) {
return ((sel.nb.y <= y && y <= sel.ne.y)
&& (sel.nb.x <= x && x <= sel.ne.x));
}
return ((sel.nb.y < y && y < sel.ne.y)
|| (y == sel.ne.y && x <= sel.ne.x))
|| (y == sel.nb.y && x >= sel.nb.x
&& (x <= sel.ne.x || sel.nb.y != sel.ne.y));
return BETWEEN(y, sel.nb.y, sel.ne.y)
&& (y != sel.nb.y || x >= sel.nb.x)
&& (y != sel.ne.y || x <= sel.ne.x);
}
void