diff -r 1052677493be runtime/doc/eval.txt --- a/runtime/doc/eval.txt Wed Sep 05 19:17:42 2012 +0200 +++ b/runtime/doc/eval.txt Fri Sep 07 04:11:15 2012 +0200 @@ -1903,6 +1903,8 @@ resolve( {filename}) String get filename a shortcut points to reverse( {list}) List reverse {list} in-place round( {expr}) Float round off {expr} +screencol() Number current cursor column +screenrow() Number current cursor row search( {pattern} [, {flags} [, {stopline} [, {timeout}]]]) Number search for {pattern} searchdecl( {name} [, {global} [, {thisblock}]]) @@ -4866,8 +4868,24 @@ echo round(-4.5) < -5.0 {only available when compiled with the |+float| feature} - - + +screencol() *screencol()* + The result is a Number, which is the current screen column of + the cursor. This function is mainly used for testing. + + Note: Always returns the current screen column, thus if used + in a command (e.g. ":echo screencol()") it will return the + column inside the command line, which is 1 when the command is + executed. To get the cursor position in the file use a + mapping: > + nnoremap GG ":echom ".screencol()."\n" +< +screenrow() *screenrow()* + The result is a Number, which is the current screen row of the + cursor. This function is mainly used for testing. + + Note: Same restrictions as |screencol()|. + search({pattern} [, {flags} [, {stopline} [, {timeout}]]]) *search()* Search for regexp pattern {pattern}. The search starts at the cursor position (you can use |cursor()| to set it). diff -r 1052677493be src/eval.c --- a/src/eval.c Wed Sep 05 19:17:42 2012 +0200 +++ b/src/eval.c Fri Sep 07 04:11:15 2012 +0200 @@ -668,6 +668,8 @@ #ifdef FEAT_FLOAT static void f_round __ARGS((typval_T *argvars, typval_T *rettv)); #endif +static void f_screencol __ARGS((typval_T *argvars, typval_T *rettv)); +static void f_screenrow __ARGS((typval_T *argvars, typval_T *rettv)); static void f_search __ARGS((typval_T *argvars, typval_T *rettv)); static void f_searchdecl __ARGS((typval_T *argvars, typval_T *rettv)); static void f_searchpair __ARGS((typval_T *argvars, typval_T *rettv)); @@ -8032,6 +8034,8 @@ #ifdef FEAT_FLOAT {"round", 1, 1, f_round}, #endif + {"screencol", 0, 0, f_screencol}, + {"screenrow", 0, 0, f_screenrow}, {"search", 1, 4, f_search}, {"searchdecl", 1, 3, f_searchdecl}, {"searchpair", 3, 7, f_searchpair}, @@ -15717,6 +15721,28 @@ #endif /* + * "screencol()" function + */ + static void +f_screencol(argvars, rettv) + typval_T *argvars; + typval_T *rettv; +{ + rettv->vval.v_number = screen_screencol() + 1; +} + +/* + * "screenrow()" function + */ + static void +f_screenrow(argvars, rettv) + typval_T *argvars; + typval_T *rettv; +{ + rettv->vval.v_number = screen_screenrow() + 1; +} + +/* * "search()" function */ static void diff -r 1052677493be src/proto/screen.pro --- a/src/proto/screen.pro Wed Sep 05 19:17:42 2012 +0200 +++ b/src/proto/screen.pro Fri Sep 07 04:11:15 2012 +0200 @@ -50,4 +50,6 @@ int messaging __ARGS((void)); void showruler __ARGS((int always)); int number_width __ARGS((win_T *wp)); +int screen_screencol __ARGS((void)); +int screen_screenrow __ARGS((void)); /* vim: set ft=c : */ diff -r 1052677493be src/screen.c --- a/src/screen.c Wed Sep 05 19:17:42 2012 +0200 +++ b/src/screen.c Fri Sep 07 04:11:15 2012 +0200 @@ -4269,7 +4269,20 @@ { /* tab amount depends on current column */ n_extra = (int)wp->w_buffer->b_p_ts - - VCOL_HLC % (int)wp->w_buffer->b_p_ts - 1; + - vcol % (int)wp->w_buffer->b_p_ts - 1; +#ifdef FEAT_CONCEAL + /* Tab alignment should be identical regardless of + * 'conceallevel' value. So tab compensates of all + * previous concealed characters, and thus resets + * vcol_off and boguscols accumulated so far in the + * line. Note that the tab can be longer than 'tabstop' + * when there are concealed characters. */ + n_extra += vcol_off; + vcol -= vcol_off; + vcol_off = 0; + col -= boguscols; + boguscols = 0; +#endif #ifdef FEAT_MBYTE mb_utf8 = FALSE; /* don't draw as UTF-8 */ #endif @@ -10251,3 +10264,23 @@ return n; } #endif + +/* + * Return the current cursor column. This is the actual position on the + * screen. First column start as 1 to be consistent with virtcol(). + */ + int +screen_screencol() +{ + return screen_cur_col; +} + +/* + * Return the current cursor row. This is the actual position on the screen. + * First row starts at 1. + */ + int +screen_screenrow() +{ + return screen_cur_row; +} diff -r 1052677493be src/testdir/Makefile --- a/src/testdir/Makefile Wed Sep 05 19:17:42 2012 +0200 +++ b/src/testdir/Makefile Fri Sep 07 04:11:15 2012 +0200 @@ -13,7 +13,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \ test7.out test8.out test9.out test10.out test11.out \ - test12.out test13.out test14.out test15.out test17.out \ + test12.out test13.out test14.out test15.out test17.out \ test18.out test19.out test20.out test21.out test22.out \ test23.out test24.out test25.out test26.out test27.out \ test28.out test29.out test30.out test31.out test32.out \ @@ -27,7 +27,7 @@ test69.out test70.out test71.out test72.out test73.out \ test74.out test75.out test76.out test77.out test78.out \ test79.out test80.out test81.out test82.out test83.out \ - test84.out test85.out test86.out test87.out + test84.out test85.out test86.out test87.out test88.out \ SCRIPTS_GUI = test16.out diff -r 1052677493be src/testdir/test88.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/testdir/test88.in Fri Sep 07 04:11:15 2012 +0200 @@ -0,0 +1,85 @@ +vim: set ft=vim + +Tests for correct display (cursor column position) with +conceal and +tabulators. + +STARTTEST +:so small.vim +:if !has('conceal') + e! test.ok + wq! test.out +:endif +:" Conceal settings. +:set conceallevel=2 +:set concealcursor=nc +:syntax match test /|/ conceal +:" Save current cursor position. Only works in mode, can't be used +:" with :normal because it moves the cursor to the command line. Thanks to ZyX +:" for the idea to use an mapping. +:let positions = [] +:nnoremap GG ":let positions += ['".screenrow().":".screencol()."']\n" +:" Start test. +/^start: +:normal ztj +GGk +:" We should end up in the same column when running these commands on the two +:" lines. +:normal ft +GGk +:normal $ +GGk +:normal 0j +GGk +:normal ft +GGk +:normal $ +GGk +:normal 0j0j +GGk +:" Same for next test block. +:normal ft +GGk +:normal $ +GGk +:normal 0j +GGk +:normal ft +GGk +:normal $ +GGk +:normal 0j0j +GGk +:" And check W with multiple tabs and conceals in a line. +:normal W +GGk +:normal W +GGk +:normal W +GGk +:normal $ +GGk +:normal 0j +GGk +:normal W +GGk +:normal W +GGk +:normal W +GGk +:normal $ +GGk +:" Display result. +:call append('$', 'end:') +:call append('$', positions) +:/^end/,$wq! test.out +ENDTEST + +start: +.concealed. text +|concealed| text + + .concealed. text + |concealed| text + +.a. .b. .c. .d. +|a| |b| |c| |d| diff -r 1052677493be src/testdir/test88.ok --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/testdir/test88.ok Fri Sep 07 04:11:15 2012 +0200 @@ -0,0 +1,23 @@ +end: +2:1 +2:17 +2:20 +3:1 +3:17 +3:20 +5:8 +5:25 +5:28 +6:8 +6:25 +6:28 +8:1 +8:9 +8:17 +8:25 +8:27 +9:1 +9:9 +9:17 +9:25 +9:26