aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Lohmann <20h@r-36.net>2013-04-28 18:14:15 +0200
committerChristoph Lohmann <20h@r-36.net>2013-04-28 18:14:15 +0200
commit911ba5674bc4eb53a2ed548856a50032c39ca7f2 (patch)
tree3b9f17e8a1e5ea451dfcac44ad6092f07de584a8
parenta53017c8b47f511cf0462ac910cf9223a31ceb2f (diff)
downloadst-911ba5674bc4eb53a2ed548856a50032c39ca7f2.tar.gz
Selection snapping is now considering wrapping.
Thanks Alexander Rezinsky <alexrez@gmail.com> for mentioning this!
-rw-r--r--st.c42
1 files changed, 39 insertions, 3 deletions
diff --git a/st.c b/st.c
index aa2cd08..5095315 100644
--- a/st.c
+++ b/st.c
@@ -681,13 +681,49 @@ void
selsnap(int mode, int *x, int *y, int direction) {
switch(mode) {
case SNAP_WORD:
- while(*x > 0 && *x < term.col-1
- && term.line[*y][*x + direction].c[0] != ' ') {
+ for(;;) {
+ if(direction < 0 && *x <= 0) {
+ if(*y > 0 && term.line[*y - 1][term.col-1].mode
+ & ATTR_WRAP) {
+ *y -= 1;
+ *x = term.col-1;
+ } else {
+ break;
+ }
+ }
+ if(direction > 0 && *x >= term.col-1) {
+ if(*y < term.row-1 && term.line[*y][*x].mode
+ & ATTR_WRAP) {
+ *y += 1;
+ *x = 0;
+ } else {
+ break;
+ }
+ }
+
+ if(term.line[*y][*x + direction].c[0] == ' ')
+ break;
+
*x += direction;
}
break;
case SNAP_LINE:
*x = (direction < 0) ? 0 : term.col - 1;
+ if(direction < 0 && *y > 0) {
+ for(; *y > 0; *y += direction) {
+ if(!(term.line[*y-1][term.col-1].mode
+ & ATTR_WRAP)) {
+ break;
+ }
+ }
+ } else if(direction > 0 && *y < term.row-1) {
+ for(; *y < term.row; *y += direction) {
+ if(!(term.line[*y][term.col-1].mode
+ & ATTR_WRAP)) {
+ break;
+ }
+ }
+ }
break;
default:
break;
@@ -820,7 +856,7 @@ bpress(XEvent *e) {
sel.snap = 0;
}
selsnap(sel.snap, &sel.bx, &sel.by, -1);
- selsnap(sel.snap, &sel.ex, &sel.ey, 1);
+ selsnap(sel.snap, &sel.ex, &sel.ey, +1);
sel.b.x = sel.bx;
sel.b.y = sel.by;
sel.e.x = sel.ex;