zymon/st
1
0
Fork 0
mirror of https://github.com/LukeSmithxyz/st.git synced 2024-11-21 23:05:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move calls to selsnap into selnormalize

Browse source 
This simplifies getbuttoninfo() and bpress(), and fixes a bug which made word
snapping behave incorrectly when a delimiter was at the beginning or end of
line.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
This commit is contained in:
Ivan Delalande 2014-08-20 21:14:08 +02:00 committed by Roberto E. Vargas Caballero
parent 83dea7fd7b
commit c490a60b80
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
st.c
View file

@ -682,6 +682,9 @@ selnormalize(void) {
sel.nb.y = MIN(sel.ob.y, sel.oe.y); sel.nb.y = MIN(sel.ob.y, sel.oe.y);
sel.ne.y = MAX(sel.ob.y, sel.oe.y); sel.ne.y = MAX(sel.ob.y, sel.oe.y);
selsnap(sel.snap, &sel.nb.x, &sel.nb.y, -1);
selsnap(sel.snap, &sel.ne.x, &sel.ne.y, +1);
/* expand selection over line breaks */ /* expand selection over line breaks */
if (sel.type == SEL_RECTANGULAR) if (sel.type == SEL_RECTANGULAR)
return; return;
@ -777,15 +780,6 @@ getbuttoninfo(XEvent *e) {
sel.oe.x = x2col(e->xbutton.x); sel.oe.x = x2col(e->xbutton.x);
sel.oe.y = y2row(e->xbutton.y); sel.oe.y = y2row(e->xbutton.y);
if(sel.ob.y < sel.oe.y
|| (sel.ob.y == sel.oe.y && sel.ob.x < sel.oe.x)) {
selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1);
selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1);
} else {
selsnap(sel.snap, &sel.oe.x, &sel.oe.y, -1);
selsnap(sel.snap, &sel.ob.x, &sel.ob.y, +1);
}
selnormalize(); selnormalize();
sel.type = SEL_REGULAR; sel.type = SEL_REGULAR;
@ -900,8 +894,6 @@ bpress(XEvent *e) {
} else { } else {
sel.snap = 0; sel.snap = 0;
} }
selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1);
selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1);
selnormalize(); selnormalize();
/* /*