Select to the end of row if end of line is reached.

[st.git] / st.c

diff --git a/st.c b/st.c
index aa2cd08..e2e6c57 100644 (file)
--- a/st.c
+++ b/st.c
@@ -679,17 +679,74 @@ selected(int x, int y) {
 
 void
 selsnap(int mode, int *x, int *y, int direction) {
+       int i;
+
        switch(mode) {
        case SNAP_WORD:
-               while(*x > 0 && *x < term.col-1
-                               && term.line[*y][*x + direction].c[0] != ' ') {
+               /*
+                * Snap around if the word wraps around at the end or
+                * beginning of a line.
+                */
+               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:
+               /*
+                * Snap around if the the previous line or the current one
+                * has set ATTR_WRAP at its end. Then the whole next or
+                * previous line will be selected.
+                */
                *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:
+               /*
+                * Select the whole line when the end of line is reached.
+                */
+               if(direction > 0) {
+                       i = term.col;
+                       while(--i > 0 && term.line[*y][i].c[0] == ' ')
+                               /* nothing */;
+                       if(i > 0 && i < *x)
+                               *x = term.col - 1;
+               }
                break;
        }
 }
@@ -820,7 +877,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;
@@ -3460,8 +3517,15 @@ run(void) {
                                xev--;
                        if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) {
                                if(blinkset) {
-                                       drawtimeout.tv_usec = 1000 * \
-                                               blinktimeout;
+                                       if(TIMEDIFF(now, lastblink) \
+                                                       > blinktimeout) {
+                                               drawtimeout.tv_usec = 1;
+                                       } else {
+                                               drawtimeout.tv_usec = (1000 * \
+                                                       (blinktimeout - \
+                                                       TIMEDIFF(now,
+                                                               lastblink)));
+                                       }
                                } else {
                                        tv = NULL;
                                }