thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

Added strdisplaywidth() function.

Browse Source
This commit is contained in:
Bram Moolenaar
2010-07-18 15:45:49 +02:00
parent 72597a57b5
commit dc536095ac
4 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/charset.c
View File

@@ -839,14 +839,25 @@ win_chartabsize(wp, p, col)
#endif
/*
* return the number of characters the string 's' will take on the screen,
* taking into account the size of a tab
* Return the number of characters the string 's' will take on the screen,
* taking into account the size of a tab.
*/
int
linetabsize(s)
char_u *s;
{
colnr_T col = 0;
return linetabsize_col(0, s);
}
/*
* Like linetabsize(), but starting at column "startcol".
*/
int
linetabsize_col(startcol, s)
int startcol;
char_u *s;
{
colnr_T col = startcol;
while (*s != NUL)
col += lbr_chartabsize_adv(&s, col);

19
src/eval.c
View File

@@ -710,6 +710,7 @@ static void f_strlen __ARGS((typval_T *argvars, typval_T *rettv));
static void f_strpart __ARGS((typval_T *argvars, typval_T *rettv));
static void f_strridx __ARGS((typval_T *argvars, typval_T *rettv));
static void f_strtrans __ARGS((typval_T *argvars, typval_T *rettv));
static void f_strdisplaywidth __ARGS((typval_T *argvars, typval_T *rettv));
static void f_strwidth __ARGS((typval_T *argvars, typval_T *rettv));
static void f_submatch __ARGS((typval_T *argvars, typval_T *rettv));
static void f_substitute __ARGS((typval_T *argvars, typval_T *rettv));
@@ -7859,6 +7860,7 @@ static struct fst
#endif
{"str2nr", 1, 2, f_str2nr},
{"strchars", 1, 1, f_strchars},
{"strdisplaywidth", 1, 2, f_strdisplaywidth},
#ifdef HAVE_STRFTIME
{"strftime", 1, 2, f_strftime},
#endif
@@ -16804,6 +16806,23 @@ f_strchars(argvars, rettv)
#endif
}
/*
* "strdisplaywidth()" function
*/
static void
f_strdisplaywidth(argvars, rettv)
typval_T *argvars;
typval_T *rettv;
{
char_u *s = get_tv_string(&argvars[0]);
int col = 0;
if (argvars[1].v_type != VAR_UNKNOWN)
col = get_tv_number(&argvars[1]);
rettv->vval.v_number = (varnumber_T)(linetabsize_col(col, s));
}
/*
* "strwidth()" function
*/

1
src/proto/charset.pro
View File

@@ -15,6 +15,7 @@ int vim_strsize __ARGS((char_u *s));
int vim_strnsize __ARGS((char_u *s, int len));
int chartabsize __ARGS((char_u *p, colnr_T col));
int linetabsize __ARGS((char_u *s));
int linetabsize_col __ARGS((int startcol, char_u *s));
int win_linetabsize __ARGS((win_T *wp, char_u *p, colnr_T len));
int vim_isIDc __ARGS((int c));
int vim_iswordc __ARGS((int c));