diff options
| author | Brandon Coleman <metrix1978@gmail.com> | 2014-05-28 16:35:14 -0500 |
|---|---|---|
| committer | Brandon Coleman <metrix1978@gmail.com> | 2014-06-12 01:20:36 -0500 |
| commit | 7f21665673686c653389ff4e86a2ce8e17804178 (patch) | |
| tree | bffd897b743ce4b1cf79ecbd4ca988821768c3a7 /src/nvim/ui.c | |
| parent | 7cdbca77899b8bb09c7a0a4c874c06021543c986 (diff) | |
| download | rneovim-7f21665673686c653389ff4e86a2ce8e17804178.tar.gz rneovim-7f21665673686c653389ff4e86a2ce8e17804178.tar.bz2 rneovim-7f21665673686c653389ff4e86a2ce8e17804178.zip | |
move/remove W_* macros
move W_ENDCOL to screen.c
remove the rest of the W_* macros
Diffstat (limited to 'src/nvim/ui.c')
| -rw-r--r-- | src/nvim/ui.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/ui.c b/src/nvim/ui.c index 256d35f089..78b540e6a8 100644 --- a/src/nvim/ui.c +++ b/src/nvim/ui.c @@ -648,7 +648,7 @@ retnomove: || (!on_status_line && !on_sep_line && ( - wp->w_p_rl ? col < W_WIDTH(wp) - wp->w_p_fdc : + wp->w_p_rl ? col < wp->w_width - wp->w_p_fdc : col >= wp->w_p_fdc + (cmdwin_type == 0 && wp == curwin ? 0 : 1) @@ -717,8 +717,8 @@ retnomove: } - row -= W_WINROW(curwin); - col -= W_WINCOL(curwin); + row -= curwin->w_winrow; + col -= curwin->w_wincol; /* * When clicking beyond the end of the window, scroll the screen. @@ -787,7 +787,7 @@ retnomove: /* Check for position outside of the fold column. */ if ( - curwin->w_p_rl ? col < W_WIDTH(curwin) - curwin->w_p_fdc : + curwin->w_p_rl ? col < curwin->w_width - curwin->w_p_fdc : col >= curwin->w_p_fdc + (cmdwin_type == 0 ? 0 : 1) ) @@ -847,7 +847,7 @@ int mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump) int count; if (win->w_p_rl) - col = W_WIDTH(win) - 1 - col; + col = win->w_width - 1 - col; lnum = win->w_topline; @@ -879,7 +879,7 @@ int mouse_comp_pos(win_T *win, int *rowp, int *colp, linenr_T *lnump) off = win_col_off(win) - win_col_off2(win); if (col < off) col = off; - col += row * (W_WIDTH(win) - off); + col += row * (win->w_width - off); /* add skip column (for long wrapping line) */ col += win->w_skipcol; } |