aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/popupmnu.c
diff options
context:
space:
mode:
authorBrandon Coleman <metrix1978@gmail.com>2014-05-28 16:35:14 -0500
committerBrandon Coleman <metrix1978@gmail.com>2014-06-12 01:20:36 -0500
commit7f21665673686c653389ff4e86a2ce8e17804178 (patch)
treebffd897b743ce4b1cf79ecbd4ca988821768c3a7 /src/nvim/popupmnu.c
parent7cdbca77899b8bb09c7a0a4c874c06021543c986 (diff)
downloadrneovim-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/popupmnu.c')
-rw-r--r--src/nvim/popupmnu.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index 97db6efe37..b0ed3047ae 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -73,7 +73,7 @@ redo:
validate_cursor_col();
pum_array = NULL;
- row = curwin->w_wrow + W_WINROW(curwin);
+ row = curwin->w_wrow + curwin->w_winrow;
if (firstwin->w_p_pvw) {
top_clear = firstwin->w_height;
@@ -189,9 +189,9 @@ redo:
// Calculate column
if (curwin->w_p_rl) {
- col = W_WINCOL(curwin) + W_WIDTH(curwin) - curwin->w_wcol - 1;
+ col = curwin->w_wincol + curwin->w_width - curwin->w_wcol - 1;
} else {
- col = W_WINCOL(curwin) + curwin->w_wcol;
+ col = curwin->w_wincol + curwin->w_wcol;
}
// if there are more items than room we need a scrollbar
@@ -299,7 +299,7 @@ void pum_redraw(void)
// prepend a space if there is room
if (curwin->w_p_rl) {
- if (pum_col < W_WINCOL(curwin) + W_WIDTH(curwin) - 1) {
+ if (pum_col < curwin->w_wincol + curwin->w_width - 1) {
screen_putchar(' ', row, pum_col + 1, attr);
}
} else if (pum_col > 0) {