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

patch 7.4.2101

Browse Source 
Problem:    Looping over windows, buffers and tab pages is inconsistant.
Solution:   Use FOR_ALL_ macros everywhere. (Yegappan Lakshmanan)
This commit is contained in:
Bram Moolenaar
2016-07-24 22:04:11 +02:00
parent 6835dc61ae
commit 2932359000
33 changed files with 148 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/window.c
View File

@@ -209,7 +209,7 @@ newwindow:
/* cursor to preview window */
case 'P':
for (wp = firstwin; wp != NULL; wp = wp->w_next)
FOR_ALL_WINDOWS(wp)
if (wp->w_p_pvw)
break;
if (wp == NULL)
@@ -1367,7 +1367,7 @@ win_valid(win_T *win)
if (win == NULL)
return FALSE;
for (wp = firstwin; wp != NULL; wp = wp->w_next)
FOR_ALL_WINDOWS(wp)
if (wp == win)
return TRUE;
return FALSE;
@@ -1382,7 +1382,7 @@ win_count(void)
win_T *wp;
int count = 0;
for (wp = firstwin; wp != NULL; wp = wp->w_next)
FOR_ALL_WINDOWS(wp)
++count;
return count;
}
@@ -3712,7 +3712,7 @@ valid_tabpage(tabpage_T *tpc)
{
tabpage_T *tp;
for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
FOR_ALL_TABPAGES(tp)
if (tp == tpc)
return TRUE;
return FALSE;
@@ -4012,7 +4012,7 @@ tabpage_move(int nr)
first_tabpage = curtab->tp_next;
else
{
for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
FOR_ALL_TABPAGES(tp)
if (tp->tp_next == curtab)
break;
if (tp == NULL) /* "cannot happen" */
@@ -4091,7 +4091,7 @@ win_find_nr(int winnr)
win_T *wp;
# ifdef FEAT_WINDOWS
for (wp = firstwin; wp != NULL; wp = wp->w_next)
FOR_ALL_WINDOWS(wp)
if (--winnr == 0)
break;
return wp;
@@ -4112,9 +4112,7 @@ win_find_tabpage(win_T *win)
win_T *wp;
tabpage_T *tp;
for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
for (wp = (tp == curtab ? firstwin : tp->tp_firstwin);
wp != NULL; wp = wp->w_next)
FOR_ALL_TAB_WINDOWS(tp, wp)
if (wp == win)
return tp;
return NULL;
@@ -4404,7 +4402,7 @@ buf_jump_open_win(buf_T *buf)
wp = curwin;
# ifdef FEAT_WINDOWS
else
for (wp = firstwin; wp != NULL; wp = wp->w_next)
FOR_ALL_WINDOWS(wp)
if (wp->w_buffer == buf)
break;
if (wp != NULL)
@@ -4428,7 +4426,7 @@ buf_jump_open_tab(buf_T *buf)
if (wp != NULL)
return wp;
for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
FOR_ALL_TABPAGES(tp)
if (tp != curtab)
{
for (wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next)
@@ -4607,7 +4605,7 @@ win_free(
if (prevwin == wp)
prevwin = NULL;
for (ttp = first_tabpage; ttp != NULL; ttp = ttp->tp_next)
FOR_ALL_TABPAGES(ttp)
if (ttp->tp_prevwin == wp)
ttp->tp_prevwin = NULL;
}
@@ -4620,7 +4618,7 @@ win_free(
/* Remove the window from the b_wininfo lists, it may happen that the
* freed memory is re-used for another window. */
for (buf = firstbuf; buf != NULL; buf = buf->b_next)
FOR_ALL_BUFFERS(buf)
for (wip = buf->b_wininfo; wip != NULL; wip = wip->wi_next)
if (wip->wi_win == wp)
wip->wi_win = NULL;
@@ -4863,7 +4861,7 @@ win_size_save(garray_T *gap)
ga_init2(gap, (int)sizeof(int), 1);
if (ga_grow(gap, win_count() * 2) == OK)
for (wp = firstwin; wp != NULL; wp = wp->w_next)
FOR_ALL_WINDOWS(wp)
{
((int *)gap->ga_data)[gap->ga_len++] =
wp->w_width + wp->w_vsep_width;
@@ -4888,7 +4886,7 @@ win_size_restore(garray_T *gap)
for (j = 0; j < 2; ++j)
{
i = 0;
for (wp = firstwin; wp != NULL; wp = wp->w_next)
FOR_ALL_WINDOWS(wp)
{
frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]);
win_setheight_win(((int *)gap->ga_data)[i++], wp);
@@ -5384,7 +5382,7 @@ win_setminheight(void)
{
/* TODO: handle vertical splits */
room = -p_wh;
for (wp = firstwin; wp != NULL; wp = wp->w_next)
FOR_ALL_WINDOWS(wp)
room += wp->w_height - p_wmh;
if (room >= 0)
break;
@@ -6344,7 +6342,7 @@ min_rows(void)
#ifdef FEAT_WINDOWS
total = 0;
for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
FOR_ALL_TABPAGES(tp)
{
n = frame_minheight(tp->tp_topframe, NULL);
if (total < n)
@@ -6374,7 +6372,7 @@ only_one_window(void)
if (first_tabpage->tp_next != NULL)
return FALSE;
for (wp = firstwin; wp != NULL; wp = wp->w_next)
FOR_ALL_WINDOWS(wp)
if (wp->w_buffer != NULL
&& (!((wp->w_buffer->b_help && !curbuf->b_help)
# ifdef FEAT_QUICKFIX
@@ -7091,7 +7089,7 @@ win_getid(typval_T *argvars)
tabpage_T *tp;
int tabnr = get_tv_number(&argvars[1]);
for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
FOR_ALL_TABPAGES(tp)
if (--tabnr == 0)
break;
if (tp == NULL)
@@ -7112,9 +7110,7 @@ win_gotoid(typval_T *argvars)
tabpage_T *tp;
int id = get_tv_number(&argvars[0]);
for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
for (wp = tp == curtab ? firstwin : tp->tp_firstwin;
wp != NULL; wp = wp->w_next)
FOR_ALL_TAB_WINDOWS(tp, wp)
if (wp->w_id == id)
{
goto_tabpage_win(tp, wp);
@@ -7132,10 +7128,9 @@ win_id2tabwin(typval_T *argvars, list_T *list)
int tabnr = 1;
int id = get_tv_number(&argvars[0]);
for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
FOR_ALL_TABPAGES(tp)
{
for (wp = tp == curtab ? firstwin : tp->tp_firstwin;
wp != NULL; wp = wp->w_next)
FOR_ALL_WINDOWS_IN_TAB(tp, wp)
{
if (wp->w_id == id)
{
@@ -7159,7 +7154,7 @@ win_id2win(typval_T *argvars)
int nr = 1;
int id = get_tv_number(&argvars[0]);
for (wp = firstwin; wp != NULL; wp = wp->w_next)
FOR_ALL_WINDOWS(wp)
{
if (wp->w_id == id)
return nr;
@@ -7175,9 +7170,7 @@ win_findbuf(typval_T *argvars, list_T *list)
tabpage_T *tp;
int bufnr = get_tv_number(&argvars[0]);
for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
for (wp = tp == curtab ? firstwin : tp->tp_firstwin;
wp != NULL; wp = wp->w_next)
FOR_ALL_TAB_WINDOWS(tp, wp)
if (wp->w_buffer->b_fnum == bufnr)
list_append_number(list, wp->w_id);
}