verdsveven/myst
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change the behavior of word snapping on delimiters

Browse Source 
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@shike2.com>
This commit is contained in:
Ivan Delalande 2014-08-20 21:20:44 +02:00 committed by Roberto E. Vargas Caballero
parent c490a60b80
commit 51466e019a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
st.c
View File

@ -709,7 +709,8 @@ selected(int x, int y) {
void void
selsnap(int mode, int *x, int *y, int direction) { selsnap(int mode, int *x, int *y, int direction) {
int newx, newy, xt, yt; int newx, newy, xt, yt;
Glyph *gp; bool delim, prevdelim;
Glyph *gp, *prevgp;
switch(mode) { switch(mode) {
case SNAP_WORD: case SNAP_WORD:
@ -717,6 +718,8 @@ selsnap(int mode, int *x, int *y, int direction) {
* Snap around if the word wraps around at the end or * Snap around if the word wraps around at the end or
* beginning of a line. * beginning of a line.
*/ */
prevgp = &term.line[*y][*x];
prevdelim = strchr(worddelimiters, prevgp->c[0]) != NULL;
for(;;) { for(;;) {
newx = *x + direction; newx = *x + direction;
newy = *y; newy = *y;
@ -738,11 +741,15 @@ selsnap(int mode, int *x, int *y, int direction) {
break; break;
gp = &term.line[newy][newx]; 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; break;
*x = newx; *x = newx;
*y = newy; *y = newy;
prevgp = gp;
prevdelim = delim;
} }
break; break;
case SNAP_LINE: case SNAP_LINE: