[hackers] [st] Change the behavior of word snapping on delimiters || Ivan Delalande

From: <git_AT_suckless.org>
Date: Fri, 22 Aug 2014 16:06:07 +0200

commit 51466e019a67e9319e6c5a7fa4205842ca860b71
Author: Ivan Delalande <colona_AT_ycc.fr>
Date: Wed Aug 20 21:20:44 2014 +0200

    Change the behavior of word snapping on delimiters
    
    This makes any sequence of identical delimiters be considered a single
    word in word-snapping mode. This seems more coherent for this mode and
    is similar to what xterm does.
    
    Signed-off-by: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>

diff --git a/st.c b/st.c
index 01ab962..497885b 100644
--- a/st.c
+++ b/st.c
_AT_@ -709,7 +709,8 @@ selected(int x, int y) {
 void
 selsnap(int mode, int *x, int *y, int direction) {
         int newx, newy, xt, yt;
- Glyph *gp;
+ bool delim, prevdelim;
+ Glyph *gp, *prevgp;
 
         switch(mode) {
         case SNAP_WORD:
_AT_@ -717,6 +718,8 @@ selsnap(int mode, int *x, int *y, int direction) {
                  * Snap around if the word wraps around at the end or
                  * beginning of a line.
                  */
+ prevgp = &term.line[*y][*x];
+ prevdelim = strchr(worddelimiters, prevgp->c[0]) != NULL;
                 for(;;) {
                         newx = *x + direction;
                         newy = *y;
_AT_@ -738,11 +741,15 @@ selsnap(int mode, int *x, int *y, int direction) {
                                 break;
 
                         gp = &term.line[newy][newx];
- if (!(gp->mode & ATTR_WDUMMY) && strchr(worddelimiters, gp->c[0]))
+ delim = strchr(worddelimiters, gp->c[0]) != NULL;
+ if(!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
+ || (delim && gp->c[0] != prevgp->c[0])))
                                 break;
 
                         *x = newx;
                         *y = newy;
+ prevgp = gp;
+ prevdelim = delim;
                 }
                 break;
         case SNAP_LINE:
Received on Fri Aug 22 2014 - 16:06:07 CEST