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

updated for version 7.2-203

Browse Source
This commit is contained in:
Bram Moolenaar
2009-06-16 14:01:43 +00:00
parent 8b38e2416c
commit 746ebd3b6a
10 changed files with 341 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
src/fileio.c
View File

@@ -8365,7 +8365,7 @@ ex_doautoall(eap)
/* Execute the modeline settings, but don't set window-local /* Execute the modeline settings, but don't set window-local
* options if we are using the current window for another buffer. */ * options if we are using the current window for another buffer. */
do_modelines(aco.save_curwin == NULL ? OPT_NOWIN : 0); do_modelines(curwin == aucmd_win ? OPT_NOWIN : 0);
/* restore the current window */ /* restore the current window */
aucmd_restbuf(&aco); aucmd_restbuf(&aco);
@@ -8381,8 +8381,8 @@ ex_doautoall(eap)
/* /*
* Prepare for executing autocommands for (hidden) buffer "buf". * Prepare for executing autocommands for (hidden) buffer "buf".
* Search a window for the current buffer. Save the cursor position and * Search for a visible window containing the current buffer. If there isn't
* screen offset. * one then use "aucmd_win".
* Set "curbuf" and "curwin" to match "buf". * Set "curbuf" and "curwin" to match "buf".
* When FEAT_AUTOCMD is not defined another version is used, see below. * When FEAT_AUTOCMD is not defined another version is used, see below.
*/ */
@@ -8392,8 +8392,9 @@ aucmd_prepbuf(aco, buf)
buf_T *buf; /* new curbuf */ buf_T *buf; /* new curbuf */
{ {
win_T *win; win_T *win;
#ifdef FEAT_WINDOWS
aco->new_curbuf = buf; int save_ea;
#endif
/* Find a window that is for the new buffer */ /* Find a window that is for the new buffer */
if (buf == curbuf) /* be quick when buf is curbuf */ if (buf == curbuf) /* be quick when buf is curbuf */
@@ -8407,42 +8408,53 @@ aucmd_prepbuf(aco, buf)
win = NULL; win = NULL;
#endif #endif
/* /* Allocate "aucmd_win" when needed. If this fails (out of memory) fall
* Prefer to use an existing window for the buffer, it has the least side * back to using the current window. */
* effects (esp. if "buf" is curbuf). if (win == NULL && aucmd_win == NULL)
* Otherwise, use curwin for "buf". It might make some items in the {
* window invalid. At least save the cursor and topline. win_alloc_aucmd_win();
*/ if (aucmd_win == NULL)
win = curwin;
}
aco->save_curwin = curwin;
aco->save_curbuf = curbuf;
if (win != NULL) if (win != NULL)
{ {
/* there is a window for "buf", make it the curwin */ /* There is a window for "buf" in the current tab page, make it the
aco->save_curwin = curwin; * curwin. This is preferred, it has the least side effects (esp. if
* "buf" is curbuf). */
curwin = win; curwin = win;
aco->save_buf = win->w_buffer;
aco->new_curwin = win;
} }
else else
{ {
/* there is no window for "buf", use curwin */ /* There is no window for "buf", use "aucmd_win". To minimize the side
aco->save_curwin = NULL; * effects, insert it in a the current tab page.
aco->save_buf = curbuf; * Anything related to a window (e.g., setting folds) may have
--curbuf->b_nwindows; * unexpected results. */
curwin = aucmd_win;
curwin->w_buffer = buf; curwin->w_buffer = buf;
++buf->b_nwindows; ++buf->b_nwindows;
/* save cursor and topline, set them to safe values */ #ifdef FEAT_WINDOWS
aco->save_cursor = curwin->w_cursor; /* Split the current window, put the aucmd_win in the upper half. */
curwin->w_cursor.lnum = 1; make_snapshot(SNAP_AUCMD_IDX);
curwin->w_cursor.col = 0; save_ea = p_ea;
aco->save_topline = curwin->w_topline; p_ea = FALSE;
curwin->w_topline = 1; (void)win_split_ins(0, WSP_TOP, aucmd_win, 0);
#ifdef FEAT_DIFF (void)win_comp_pos(); /* recompute window positions */
aco->save_topfill = curwin->w_topfill; p_ea = save_ea;
curwin->w_topfill = 0; #endif
/* set cursor and topline to safe values */
curwin_init();
#ifdef FEAT_VERTSPLIT
curwin->w_wincol = 0;
curwin->w_width = Columns;
#endif #endif
} }
curbuf = buf; curbuf = buf;
aco->new_curwin = curwin;
aco->new_curbuf = curbuf;
} }
/* /*
@@ -8454,21 +8466,86 @@ aucmd_prepbuf(aco, buf)
aucmd_restbuf(aco) aucmd_restbuf(aco)
aco_save_T *aco; /* structure holding saved values */ aco_save_T *aco; /* structure holding saved values */
{ {
if (aco->save_curwin != NULL) #ifdef FEAT_WINDOWS
int dummy;
#endif
if (aco->new_curwin == aucmd_win)
{
--curbuf->b_nwindows;
#ifdef FEAT_WINDOWS
/* Find "aucmd_win", it can't be closed, but it may be in another tab
* page. */
if (curwin != aucmd_win)
{
tabpage_T *tp;
win_T *wp;
FOR_ALL_TAB_WINDOWS(tp, wp)
{
if (wp == aucmd_win)
{
if (tp != curtab)
goto_tabpage_tp(tp);
win_goto(aucmd_win);
break;
}
}
}
/* Remove the window and frame from the tree of frames. */
(void)winframe_remove(curwin, &dummy, NULL);
win_remove(curwin, NULL);
last_status(FALSE); /* may need to remove last status line */
restore_snapshot(SNAP_AUCMD_IDX, FALSE);
(void)win_comp_pos(); /* recompute window positions */
if (win_valid(aco->save_curwin))
curwin = aco->save_curwin;
else
/* Hmm, original window disappeared. Just use the first one. */
curwin = firstwin;
# ifdef FEAT_EVAL
vars_clear(&aucmd_win->w_vars.dv_hashtab); /* free all w: variables */
# endif
#else
curwin = aco->save_curwin;
#endif
curbuf = curwin->w_buffer;
/* the buffer contents may have changed */
check_cursor();
if (curwin->w_topline > curbuf->b_ml.ml_line_count)
{
curwin->w_topline = curbuf->b_ml.ml_line_count;
#ifdef FEAT_DIFF
curwin->w_topfill = 0;
#endif
}
#if defined(FEAT_GUI)
/* Hide the scrollbars from the aucmd_win and update. */
gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_LEFT], FALSE);
gui_mch_enable_scrollbar(&aucmd_win->w_scrollbars[SBAR_RIGHT], FALSE);
gui_may_update_scrollbars();
#endif
}
else
{ {
/* restore curwin */ /* restore curwin */
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
if (win_valid(aco->save_curwin)) if (win_valid(aco->save_curwin))
#endif #endif
{ {
/* restore the buffer which was previously edited by curwin, if /* Restore the buffer which was previously edited by curwin, if
* it's still the same window and it's valid */ * it was chagned, we are still the same window and the buffer is
* valid. */
if (curwin == aco->new_curwin if (curwin == aco->new_curwin
&& buf_valid(aco->save_buf) && curbuf != aco->new_curbuf
&& aco->save_buf->b_ml.ml_mfp != NULL) && buf_valid(aco->new_curbuf)
&& aco->new_curbuf->b_ml.ml_mfp != NULL)
{ {
--curbuf->b_nwindows; --curbuf->b_nwindows;
curbuf = aco->save_buf; curbuf = aco->new_curbuf;
curwin->w_buffer = curbuf; curwin->w_buffer = curbuf;
++curbuf->b_nwindows; ++curbuf->b_nwindows;
} }
@@ -8477,34 +8554,6 @@ aucmd_restbuf(aco)
curbuf = curwin->w_buffer; curbuf = curwin->w_buffer;
} }
} }
else
{
/* restore buffer for curwin if it still exists and is loaded */
if (buf_valid(aco->save_buf) && aco->save_buf->b_ml.ml_mfp != NULL)
{
--curbuf->b_nwindows;
curbuf = aco->save_buf;
curwin->w_buffer = curbuf;
++curbuf->b_nwindows;
curwin->w_cursor = aco->save_cursor;
check_cursor();
/* check topline < line_count, in case lines got deleted */
if (aco->save_topline <= curbuf->b_ml.ml_line_count)
{
curwin->w_topline = aco->save_topline;
#ifdef FEAT_DIFF
curwin->w_topfill = aco->save_topfill;
#endif
}
else
{
curwin->w_topline = curbuf->b_ml.ml_line_count;
#ifdef FEAT_DIFF
curwin->w_topfill = 0;
#endif
}
}
}
} }
static int autocmd_nested = FALSE; static int autocmd_nested = FALSE;
@@ -9419,9 +9468,11 @@ aucmd_prepbuf(aco, buf)
aco_save_T *aco; /* structure to save values in */ aco_save_T *aco; /* structure to save values in */
buf_T *buf; /* new curbuf */ buf_T *buf; /* new curbuf */
{ {
aco->save_buf = curbuf; aco->save_curbuf = curbuf;
--curbuf->b_nwindows;
curbuf = buf; curbuf = buf;
curwin->w_buffer = buf; curwin->w_buffer = buf;
++curbuf->b_nwindows;
} }
/* /*
@@ -9432,8 +9483,10 @@ aucmd_prepbuf(aco, buf)
aucmd_restbuf(aco) aucmd_restbuf(aco)
aco_save_T *aco; /* structure holding saved values */ aco_save_T *aco; /* structure holding saved values */
{ {
curbuf = aco->save_buf; --curbuf->b_nwindows;
curbuf = aco->save_curbuf;
curwin->w_buffer = curbuf; curwin->w_buffer = curbuf;
++curbuf->b_nwindows;
} }
#endif /* FEAT_AUTOCMD */ #endif /* FEAT_AUTOCMD */

4
src/globals.h
View File

@@ -539,6 +539,10 @@ EXTERN win_T *prevwin INIT(= NULL); /* previous window */
EXTERN win_T *curwin; /* currently active window */ EXTERN win_T *curwin; /* currently active window */
#ifdef FEAT_AUTOCMD
EXTERN win_T *aucmd_win; /* window used in aucmd_prepbuf() */
#endif
/* /*
* The window layout is kept in a tree of frames. topframe points to the top * The window layout is kept in a tree of frames. topframe points to the top
* of the tree. * of the tree.

15
src/gui.c
View File

@@ -3879,6 +3879,21 @@ gui_drag_scrollbar(sb, value, still_dragging)
* Scrollbar stuff: * Scrollbar stuff:
*/ */
/*
* Called when something in the window layout has changed.
*/
void
gui_may_update_scrollbars()
{
if (gui.in_use && starting == 0)
{
out_flush();
gui_init_which_components(NULL);
gui_update_scrollbars(TRUE);
}
need_mouse_correct = TRUE;
}
void void
gui_update_scrollbars(force) gui_update_scrollbars(force)
int force; /* Force all scrollbars to get updated */ int force; /* Force all scrollbars to get updated */

2
src/if_perl.xs
View File

@@ -1234,7 +1234,7 @@ Delete(vimbuf, ...)
{ {
ml_delete(lnum, 0); ml_delete(lnum, 0);
deleted_lines_mark(lnum, 1L); deleted_lines_mark(lnum, 1L);
if (aco.save_buf == curbuf) if (aco.save_curbuf == curbuf)
check_cursor(); check_cursor();
} }

1
src/proto/gui.pro
View File

@@ -43,6 +43,7 @@ void gui_remove_scrollbars __ARGS((void));
void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp)); void gui_create_scrollbar __ARGS((scrollbar_T *sb, int type, win_T *wp));
scrollbar_T *gui_find_scrollbar __ARGS((long ident)); scrollbar_T *gui_find_scrollbar __ARGS((long ident));
void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging)); void gui_drag_scrollbar __ARGS((scrollbar_T *sb, long value, int still_dragging));
void gui_may_update_scrollbars __ARGS((void));
void gui_update_scrollbars __ARGS((int force)); void gui_update_scrollbars __ARGS((int force));
int gui_do_scroll __ARGS((void)); int gui_do_scroll __ARGS((void));
int gui_do_horiz_scroll __ARGS((void)); int gui_do_horiz_scroll __ARGS((void));

7
src/proto/window.pro
View File

@@ -1,6 +1,7 @@
/* window.c */ /* window.c */
void do_window __ARGS((int nchar, long Prenum, int xchar)); void do_window __ARGS((int nchar, long Prenum, int xchar));
int win_split __ARGS((int size, int flags)); int win_split __ARGS((int size, int flags));
int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));
int win_valid __ARGS((win_T *win)); int win_valid __ARGS((win_T *win));
int win_count __ARGS((void)); int win_count __ARGS((void));
int make_windows __ARGS((int count, int vertical)); int make_windows __ARGS((int count, int vertical));
@@ -10,9 +11,11 @@ void close_windows __ARGS((buf_T *buf, int keep_curwin));
void win_close __ARGS((win_T *win, int free_buf)); void win_close __ARGS((win_T *win, int free_buf));
void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp)); void win_close_othertab __ARGS((win_T *win, int free_buf, tabpage_T *tp));
void win_free_all __ARGS((void)); void win_free_all __ARGS((void));
win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
void close_others __ARGS((int message, int forceit)); void close_others __ARGS((int message, int forceit));
void curwin_init __ARGS((void)); void curwin_init __ARGS((void));
int win_alloc_first __ARGS((void)); int win_alloc_first __ARGS((void));
void win_alloc_aucmd_win __ARGS((void));
void win_init_size __ARGS((void)); void win_init_size __ARGS((void));
void free_tabpage __ARGS((tabpage_T *tp)); void free_tabpage __ARGS((tabpage_T *tp));
int win_new_tabpage __ARGS((int after)); int win_new_tabpage __ARGS((int after));
@@ -30,6 +33,8 @@ win_T *win_find_nr __ARGS((int winnr));
void win_enter __ARGS((win_T *wp, int undo_sync)); void win_enter __ARGS((win_T *wp, int undo_sync));
win_T *buf_jump_open_win __ARGS((buf_T *buf)); win_T *buf_jump_open_win __ARGS((buf_T *buf));
win_T *buf_jump_open_tab __ARGS((buf_T *buf)); win_T *buf_jump_open_tab __ARGS((buf_T *buf));
void win_append __ARGS((win_T *after, win_T *wp));
void win_remove __ARGS((win_T *wp, tabpage_T *tp));
int win_alloc_lines __ARGS((win_T *wp)); int win_alloc_lines __ARGS((win_T *wp));
void win_free_lsize __ARGS((win_T *wp)); void win_free_lsize __ARGS((win_T *wp));
void shell_new_rows __ARGS((void)); void shell_new_rows __ARGS((void));
@@ -58,6 +63,8 @@ int vim_FullName __ARGS((char_u *fname, char_u *buf, int len, int force));
int min_rows __ARGS((void)); int min_rows __ARGS((void));
int only_one_window __ARGS((void)); int only_one_window __ARGS((void));
void check_lnums __ARGS((int do_curwin)); void check_lnums __ARGS((int do_curwin));
void make_snapshot __ARGS((int idx));
void restore_snapshot __ARGS((int idx, int close_curwin));
int win_hasvertsplit __ARGS((void)); int win_hasvertsplit __ARGS((void));
int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id)); int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id));
int match_delete __ARGS((win_T *wp, int id, int perr)); int match_delete __ARGS((win_T *wp, int id, int perr));

4
src/screen.c
View File

@@ -7495,6 +7495,10 @@ retry:
#endif #endif
} }
} }
#ifdef FEAT_AUTOCMD
if (aucmd_win != NULL && win_alloc_lines(aucmd_win) == FAIL)
outofmem = TRUE;
#endif
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
give_up: give_up:
#endif #endif

23
src/structs.h
View File

@@ -1621,6 +1621,14 @@ struct diffblock_S
}; };
#endif #endif
#define SNAP_HELP_IDX 0
#ifdef FEAT_AUTOCMD
# define SNAP_AUCMD_IDX 1
# define SNAP_COUNT 2
#else
# define SNAP_COUNT 1
#endif
/* /*
* Tab pages point to the top frame of each tab page. * Tab pages point to the top frame of each tab page.
* Note: Most values are NOT valid for the current tab page! Use "curwin", * Note: Most values are NOT valid for the current tab page! Use "curwin",
@@ -1649,7 +1657,7 @@ struct tabpage_S
buf_T *(tp_diffbuf[DB_COUNT]); buf_T *(tp_diffbuf[DB_COUNT]);
int tp_diff_invalid; /* list of diffs is outdated */ int tp_diff_invalid; /* list of diffs is outdated */
#endif #endif
frame_T *tp_snapshot; /* window layout snapshot */ frame_T *(tp_snapshot[SNAP_COUNT]); /* window layout snapshots */
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
dictitem_T tp_winvar; /* variable for "t:" Dictionary */ dictitem_T tp_winvar; /* variable for "t:" Dictionary */
dict_T tp_vars; /* internal variables, local to tab page */ dict_T tp_vars; /* internal variables, local to tab page */
@@ -2276,16 +2284,11 @@ typedef int vimmenu_T;
*/ */
typedef struct typedef struct
{ {
buf_T *save_buf; /* saved curbuf */ buf_T *save_curbuf; /* saved curbuf */
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
buf_T *new_curbuf; /* buffer to be used */ win_T *save_curwin; /* saved curwin */
win_T *save_curwin; /* saved curwin, NULL if it didn't change */ win_T *new_curwin; /* new curwin */
win_T *new_curwin; /* new curwin if save_curwin != NULL */ buf_T *new_curbuf; /* new curbuf */
pos_T save_cursor; /* saved cursor pos of save_curwin */
linenr_T save_topline; /* saved topline of save_curwin */
# ifdef FEAT_DIFF
int save_topfill; /* saved topfill of save_curwin */
# endif
#endif #endif
} aco_save_T; } aco_save_T;

2
src/version.c
View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
203,
/**/ /**/
202, 202,
/**/ /**/

260
src/window.c
View File

@@ -11,8 +11,8 @@
static int path_is_url __ARGS((char_u *p)); static int path_is_url __ARGS((char_u *p));
#if defined(FEAT_WINDOWS) || defined(PROTO) #if defined(FEAT_WINDOWS) || defined(PROTO)
static int win_split_ins __ARGS((int size, int flags, win_T *newwin, int dir));
static void win_init __ARGS((win_T *newp, win_T *oldp, int flags)); static void win_init __ARGS((win_T *newp, win_T *oldp, int flags));
static void win_init_some __ARGS((win_T *newp, win_T *oldp));
static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col)); static void frame_comp_pos __ARGS((frame_T *topfrp, int *row, int *col));
static void frame_setheight __ARGS((frame_T *curfrp, int height)); static void frame_setheight __ARGS((frame_T *curfrp, int height));
#ifdef FEAT_VERTSPLIT #ifdef FEAT_VERTSPLIT
@@ -23,8 +23,8 @@ static void win_rotate __ARGS((int, int));
static void win_totop __ARGS((int size, int flags)); static void win_totop __ARGS((int size, int flags));
static void win_equal_rec __ARGS((win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height)); static void win_equal_rec __ARGS((win_T *next_curwin, int current, frame_T *topfr, int dir, int col, int row, int width, int height));
static int last_window __ARGS((void)); static int last_window __ARGS((void));
static int one_window __ARGS((void));
static win_T *win_free_mem __ARGS((win_T *win, int *dirp, tabpage_T *tp)); static win_T *win_free_mem __ARGS((win_T *win, int *dirp, tabpage_T *tp));
static win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
static frame_T *win_altframe __ARGS((win_T *win, tabpage_T *tp)); static frame_T *win_altframe __ARGS((win_T *win, tabpage_T *tp));
static tabpage_T *alt_tabpage __ARGS((void)); static tabpage_T *alt_tabpage __ARGS((void));
static win_T *frame2win __ARGS((frame_T *frp)); static win_T *frame2win __ARGS((frame_T *frp));
@@ -41,6 +41,7 @@ static void frame_fix_width __ARGS((win_T *wp));
#endif #endif
#endif #endif
static int win_alloc_firstwin __ARGS((win_T *oldwin)); static int win_alloc_firstwin __ARGS((win_T *oldwin));
static void new_frame __ARGS((win_T *wp));
#if defined(FEAT_WINDOWS) || defined(PROTO) #if defined(FEAT_WINDOWS) || defined(PROTO)
static tabpage_T *alloc_tabpage __ARGS((void)); static tabpage_T *alloc_tabpage __ARGS((void));
static int leave_tabpage __ARGS((buf_T *new_curbuf)); static int leave_tabpage __ARGS((buf_T *new_curbuf));
@@ -49,8 +50,6 @@ static void frame_fix_height __ARGS((win_T *wp));
static int frame_minheight __ARGS((frame_T *topfrp, win_T *next_curwin)); static int frame_minheight __ARGS((frame_T *topfrp, win_T *next_curwin));
static void win_enter_ext __ARGS((win_T *wp, int undo_sync, int no_curwin)); static void win_enter_ext __ARGS((win_T *wp, int undo_sync, int no_curwin));
static void win_free __ARGS((win_T *wp, tabpage_T *tp)); static void win_free __ARGS((win_T *wp, tabpage_T *tp));
static void win_append __ARGS((win_T *, win_T *));
static void win_remove __ARGS((win_T *, tabpage_T *tp));
static void frame_append __ARGS((frame_T *after, frame_T *frp)); static void frame_append __ARGS((frame_T *after, frame_T *frp));
static void frame_insert __ARGS((frame_T *before, frame_T *frp)); static void frame_insert __ARGS((frame_T *before, frame_T *frp));
static void frame_remove __ARGS((frame_T *frp)); static void frame_remove __ARGS((frame_T *frp));
@@ -62,17 +61,15 @@ static void win_goto_hor __ARGS((int left, long count));
static void frame_add_height __ARGS((frame_T *frp, int n)); static void frame_add_height __ARGS((frame_T *frp, int n));
static void last_status_rec __ARGS((frame_T *fr, int statusline)); static void last_status_rec __ARGS((frame_T *fr, int statusline));
static void make_snapshot __ARGS((void));
static void make_snapshot_rec __ARGS((frame_T *fr, frame_T **frp)); static void make_snapshot_rec __ARGS((frame_T *fr, frame_T **frp));
static void clear_snapshot __ARGS((tabpage_T *tp)); static void clear_snapshot __ARGS((tabpage_T *tp, int idx));
static void clear_snapshot_rec __ARGS((frame_T *fr)); static void clear_snapshot_rec __ARGS((frame_T *fr));
static void restore_snapshot __ARGS((int close_curwin));
static int check_snapshot_rec __ARGS((frame_T *sn, frame_T *fr)); static int check_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr)); static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
#endif /* FEAT_WINDOWS */ #endif /* FEAT_WINDOWS */
static win_T *win_alloc __ARGS((win_T *after)); static win_T *win_alloc __ARGS((win_T *after, int hidden));
static void win_new_height __ARGS((win_T *, int)); static void win_new_height __ARGS((win_T *, int));
#define URL_SLASH 1 /* path_is_url() has found "://" */ #define URL_SLASH 1 /* path_is_url() has found "://" */
@@ -259,7 +256,7 @@ newwindow:
/* cursor to previous window with wrap around */ /* cursor to previous window with wrap around */
case 'W': case 'W':
CHECK_CMDWIN CHECK_CMDWIN
if (lastwin == firstwin && Prenum != 1) /* just one window */ if (firstwin == lastwin && Prenum != 1) /* just one window */
beep_flush(); beep_flush();
else else
{ {
@@ -343,7 +340,7 @@ newwindow:
/* move window to new tab page */ /* move window to new tab page */
case 'T': case 'T':
if (firstwin == lastwin) if (one_window())
MSG(_(m_onlyone)); MSG(_(m_onlyone));
else else
{ {
@@ -679,9 +676,9 @@ win_split(size, flags)
/* When creating the help window make a snapshot of the window layout. /* When creating the help window make a snapshot of the window layout.
* Otherwise clear the snapshot, it's now invalid. */ * Otherwise clear the snapshot, it's now invalid. */
if (flags & WSP_HELP) if (flags & WSP_HELP)
make_snapshot(); make_snapshot(SNAP_HELP_IDX);
else else
clear_snapshot(curtab); clear_snapshot(curtab, SNAP_HELP_IDX);
return win_split_ins(size, flags, NULL, 0); return win_split_ins(size, flags, NULL, 0);
} }
@@ -692,7 +689,7 @@ win_split(size, flags)
* top/left/right/bottom. * top/left/right/bottom.
* return FAIL for failure, OK otherwise * return FAIL for failure, OK otherwise
*/ */
static int int
win_split_ins(size, flags, newwin, dir) win_split_ins(size, flags, newwin, dir)
int size; int size;
int flags; int flags;
@@ -893,14 +890,14 @@ win_split_ins(size, flags, newwin, dir)
{ {
/* new window below/right of current one */ /* new window below/right of current one */
if (newwin == NULL) if (newwin == NULL)
wp = win_alloc(oldwin); wp = win_alloc(oldwin, FALSE);
else else
win_append(oldwin, wp); win_append(oldwin, wp);
} }
else else
{ {
if (newwin == NULL) if (newwin == NULL)
wp = win_alloc(oldwin->w_prev); wp = win_alloc(oldwin->w_prev, FALSE);
else else
win_append(oldwin->w_prev, wp); win_append(oldwin->w_prev, wp);
} }
@@ -910,6 +907,13 @@ win_split_ins(size, flags, newwin, dir)
if (wp == NULL) if (wp == NULL)
return FAIL; return FAIL;
new_frame(wp);
if (wp->w_frame == NULL)
{
win_free(wp, NULL);
return FAIL;
}
/* make the contents of the new window the same as the current one */ /* make the contents of the new window the same as the current one */
win_init(wp, curwin, flags); win_init(wp, curwin, flags);
} }
@@ -970,13 +974,7 @@ win_split_ins(size, flags, newwin, dir)
} }
if (newwin == NULL) if (newwin == NULL)
{ frp = wp->w_frame;
/* Create a frame for the new window. */
frp = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
frp->fr_layout = FR_LEAF;
frp->fr_win = wp;
wp->w_frame = frp;
}
else else
frp = newwin->w_frame; frp = newwin->w_frame;
frp->fr_parent = curfrp->fr_parent; frp->fr_parent = curfrp->fr_parent;
@@ -1156,6 +1154,7 @@ win_split_ins(size, flags, newwin, dir)
return OK; return OK;
} }
/* /*
* Initialize window "newp" from window "oldp". * Initialize window "newp" from window "oldp".
* Used when splitting a window and when creating a new tab page. * Used when splitting a window and when creating a new tab page.
@@ -1204,14 +1203,7 @@ win_init(newp, oldp, flags)
if (oldp->w_localdir != NULL) if (oldp->w_localdir != NULL)
newp->w_localdir = vim_strsave(oldp->w_localdir); newp->w_localdir = vim_strsave(oldp->w_localdir);
/* Use the same argument list. */ /* copy tagstack and folds */
newp->w_alist = oldp->w_alist;
++newp->w_alist->al_refcount;
newp->w_arg_idx = oldp->w_arg_idx;
/*
* copy tagstack and options from existing window
*/
for (i = 0; i < oldp->w_tagstacklen; i++) for (i = 0; i < oldp->w_tagstacklen; i++)
{ {
newp->w_tagstack[i] = oldp->w_tagstack[i]; newp->w_tagstack[i] = oldp->w_tagstack[i];
@@ -1221,10 +1213,29 @@ win_init(newp, oldp, flags)
} }
newp->w_tagstackidx = oldp->w_tagstackidx; newp->w_tagstackidx = oldp->w_tagstackidx;
newp->w_tagstacklen = oldp->w_tagstacklen; newp->w_tagstacklen = oldp->w_tagstacklen;
win_copy_options(oldp, newp);
# ifdef FEAT_FOLDING # ifdef FEAT_FOLDING
copyFoldingState(oldp, newp); copyFoldingState(oldp, newp);
# endif # endif
win_init_some(newp, oldp);
}
/*
* Initialize window "newp" from window"old".
* Only the essential things are copied.
*/
static void
win_init_some(newp, oldp)
win_T *newp;
win_T *oldp;
{
/* Use the same argument list. */
newp->w_alist = oldp->w_alist;
++newp->w_alist->al_refcount;
newp->w_arg_idx = oldp->w_arg_idx;
/* copy options from existing window */
win_copy_options(oldp, newp);
} }
#endif /* FEAT_WINDOWS */ #endif /* FEAT_WINDOWS */
@@ -1565,15 +1576,8 @@ win_totop(size, flags)
#if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT) #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
/* When 'guioptions' includes 'L' or 'R' may have to remove or add /* When 'guioptions' includes 'L' or 'R' may have to remove or add
* scrollbars. Have to update them anyway. */ * scrollbars. Have to update them anyway. */
if (gui.in_use) gui_may_update_scrollbars();
{
out_flush();
gui_init_which_components(NULL);
gui_update_scrollbars(TRUE);
}
need_mouse_correct = TRUE;
#endif #endif
} }
/* /*
@@ -2048,13 +2052,40 @@ close_windows(buf, keep_curwin)
} }
/* /*
* Return TRUE if the current window is the only window that exists. * Return TRUE if the current window is the only window that exists (ignoring
* "aucmd_win").
* Returns FALSE if there is a window, possibly in another tab page. * Returns FALSE if there is a window, possibly in another tab page.
*/ */
static int static int
last_window() last_window()
{ {
return (lastwin == firstwin && first_tabpage->tp_next == NULL); return (one_window() && first_tabpage->tp_next == NULL);
}
/*
* Return TRUE if there is only one window other than "aucmd_win" in the
* current tab page.
*/
static int
one_window()
{
#ifdef FEAT_AUTOCMD
win_T *wp;
int seen_one = FALSE;
FOR_ALL_WINDOWS(wp)
{
if (wp != aucmd_win)
{
if (seen_one)
return FALSE;
seen_one = TRUE;
}
}
return TRUE;
#else
return firstwin == lastwin;
#endif
} }
/* /*
@@ -2083,6 +2114,19 @@ win_close(win, free_buf)
return; return;
} }
#ifdef FEAT_AUTOCMD
if (win == aucmd_win)
{
EMSG(_("E813: Cannot close autocmd window"));
return;
}
if ((firstwin == aucmd_win || lastwin == aucmd_win) && one_window())
{
EMSG(_("E814: Cannot close window, only autocmd window would remain"));
return;
}
#endif
/* /*
* When closing the last window in a tab page first go to another tab * When closing the last window in a tab page first go to another tab
* page and then close the window and the tab page. This avoids that * page and then close the window and the tab page. This avoids that
@@ -2112,7 +2156,7 @@ win_close(win, free_buf)
if (win->w_buffer->b_help) if (win->w_buffer->b_help)
help_window = TRUE; help_window = TRUE;
else else
clear_snapshot(curtab); clear_snapshot(curtab, SNAP_HELP_IDX);
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
if (win == curwin) if (win == curwin)
@@ -2229,7 +2273,7 @@ win_close(win, free_buf)
/* After closing the help window, try restoring the window layout from /* After closing the help window, try restoring the window layout from
* before it was opened. */ * before it was opened. */
if (help_window) if (help_window)
restore_snapshot(close_curwin); restore_snapshot(SNAP_HELP_IDX, close_curwin);
#if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT) #if defined(FEAT_GUI) && defined(FEAT_VERTSPLIT)
/* When 'guioptions' includes 'L' or 'R' may have to remove scrollbars. */ /* When 'guioptions' includes 'L' or 'R' may have to remove scrollbars. */
@@ -2344,6 +2388,14 @@ win_free_all()
while (firstwin != NULL) while (firstwin != NULL)
(void)win_free_mem(firstwin, &dummy, NULL); (void)win_free_mem(firstwin, &dummy, NULL);
# ifdef FEAT_AUTOCMD
if (aucmd_win != NULL)
{
(void)win_free_mem(aucmd_win, &dummy, NULL);
aucmd_win = NULL;
}
# endif
} }
#endif #endif
@@ -2351,7 +2403,7 @@ win_free_all()
* Remove a window and its frame from the tree of frames. * Remove a window and its frame from the tree of frames.
* Returns a pointer to the window that got the freed up space. * Returns a pointer to the window that got the freed up space.
*/ */
static win_T * win_T *
winframe_remove(win, dirp, tp) winframe_remove(win, dirp, tp)
win_T *win; win_T *win;
int *dirp UNUSED; /* set to 'v' or 'h' for direction if 'ea' */ int *dirp UNUSED; /* set to 'v' or 'h' for direction if 'ea' */
@@ -3090,7 +3142,7 @@ close_others(message, forceit)
win_T *nextwp; win_T *nextwp;
int r; int r;
if (lastwin == firstwin) if (one_window())
{ {
if (message if (message
#ifdef FEAT_AUTOCMD #ifdef FEAT_AUTOCMD
@@ -3194,9 +3246,30 @@ win_alloc_first()
first_tabpage->tp_topframe = topframe; first_tabpage->tp_topframe = topframe;
curtab = first_tabpage; curtab = first_tabpage;
#endif #endif
return OK; return OK;
} }
#if defined(FEAT_AUTOCMD) || defined(PROTO)
/*
* Init "aucmd_win". This can only be done after the first
* window is fully initialized, thus it can't be in win_alloc_first().
*/
void
win_alloc_aucmd_win()
{
aucmd_win = win_alloc(NULL, TRUE);
if (aucmd_win != NULL)
{
win_init_some(aucmd_win, curwin);
# ifdef FEAT_SCROLLBIND
aucmd_win->w_p_scb = FALSE;
# endif
new_frame(aucmd_win);
}
}
#endif
/* /*
* Allocate the first window or the first window in a new tab page. * Allocate the first window or the first window in a new tab page.
* When "oldwin" is NULL create an empty buffer for it. * When "oldwin" is NULL create an empty buffer for it.
@@ -3208,7 +3281,7 @@ win_alloc_first()
win_alloc_firstwin(oldwin) win_alloc_firstwin(oldwin)
win_T *oldwin; win_T *oldwin;
{ {
curwin = win_alloc(NULL); curwin = win_alloc(NULL, FALSE);
if (oldwin == NULL) if (oldwin == NULL)
{ {
/* Very first window, need to create an empty buffer for it and /* Very first window, need to create an empty buffer for it and
@@ -3236,20 +3309,35 @@ win_alloc_firstwin(oldwin)
} }
#endif #endif
topframe = (frame_T *)alloc_clear((unsigned)sizeof(frame_T)); new_frame(curwin);
if (topframe == NULL) if (curwin->w_frame == NULL)
return FAIL; return FAIL;
topframe->fr_layout = FR_LEAF; topframe = curwin->w_frame;
#ifdef FEAT_VERTSPLIT #ifdef FEAT_VERTSPLIT
topframe->fr_width = Columns; topframe->fr_width = Columns;
#endif #endif
topframe->fr_height = Rows - p_ch; topframe->fr_height = Rows - p_ch;
topframe->fr_win = curwin; topframe->fr_win = curwin;
curwin->w_frame = topframe;
return OK; return OK;
} }
/*
* Create a frame for window "wp".
*/
static void
new_frame(win_T *wp)
{
frame_T *frp = (frame_T *)alloc_clear((unsigned)sizeof(frame_T));
wp->w_frame = frp;
if (frp != NULL)
{
frp->fr_layout = FR_LEAF;
frp->fr_win = wp;
}
}
/* /*
* Initialize the window and frame size to the maximum. * Initialize the window and frame size to the maximum.
*/ */
@@ -3300,10 +3388,13 @@ alloc_tabpage()
free_tabpage(tp) free_tabpage(tp)
tabpage_T *tp; tabpage_T *tp;
{ {
int idx;
# ifdef FEAT_DIFF # ifdef FEAT_DIFF
diff_clear(tp); diff_clear(tp);
# endif # endif
clear_snapshot(tp); for (idx = 0; idx < SNAP_COUNT; ++idx)
clear_snapshot(tp, idx);
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
vars_clear(&tp->tp_vars.dv_hashtab); /* free all t: variables */ vars_clear(&tp->tp_vars.dv_hashtab); /* free all t: variables */
#endif #endif
@@ -3370,12 +3461,7 @@ win_new_tabpage(after)
#if defined(FEAT_GUI) #if defined(FEAT_GUI)
/* When 'guioptions' includes 'L' or 'R' may have to remove or add /* When 'guioptions' includes 'L' or 'R' may have to remove or add
* scrollbars. Have to update them anyway. */ * scrollbars. Have to update them anyway. */
if (gui.in_use && starting == 0) gui_may_update_scrollbars();
{
gui_init_which_components(NULL);
gui_update_scrollbars(TRUE);
}
need_mouse_correct = TRUE;
#endif #endif
redraw_all_later(CLEAR); redraw_all_later(CLEAR);
@@ -3593,12 +3679,7 @@ enter_tabpage(tp, old_curbuf)
#if defined(FEAT_GUI) #if defined(FEAT_GUI)
/* When 'guioptions' includes 'L' or 'R' may have to remove or add /* When 'guioptions' includes 'L' or 'R' may have to remove or add
* scrollbars. Have to update them anyway. */ * scrollbars. Have to update them anyway. */
if (gui.in_use && starting == 0) gui_may_update_scrollbars();
{
gui_init_which_components(NULL);
gui_update_scrollbars(TRUE);
}
need_mouse_correct = TRUE;
#endif #endif
redraw_all_later(CLEAR); redraw_all_later(CLEAR);
@@ -4150,11 +4231,13 @@ buf_jump_open_tab(buf)
#endif #endif
/* /*
* allocate a window structure and link it in the window list * Allocate a window structure and link it in the window list when "hidden" is
* FALSE.
*/ */
static win_T * static win_T *
win_alloc(after) win_alloc(after, hidden)
win_T *after UNUSED; win_T *after UNUSED;
int hidden UNUSED;
{ {
win_T *newwin; win_T *newwin;
@@ -4180,7 +4263,8 @@ win_alloc(after)
* link the window in the window list * link the window in the window list
*/ */
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
win_append(after, newwin); if (!hidden)
win_append(after, newwin);
#endif #endif
#ifdef FEAT_VERTSPLIT #ifdef FEAT_VERTSPLIT
newwin->w_wincol = 0; newwin->w_wincol = 0;
@@ -4314,7 +4398,7 @@ win_free(wp, tp)
/* /*
* Append window "wp" in the window list after window "after". * Append window "wp" in the window list after window "after".
*/ */
static void void
win_append(after, wp) win_append(after, wp)
win_T *after, *wp; win_T *after, *wp;
{ {
@@ -4340,7 +4424,7 @@ win_append(after, wp)
/* /*
* Remove a window from the window list. * Remove a window from the window list.
*/ */
static void void
win_remove(wp, tp) win_remove(wp, tp)
win_T *wp; win_T *wp;
tabpage_T *tp; /* tab page "win" is in, NULL for current */ tabpage_T *tp; /* tab page "win" is in, NULL for current */
@@ -6040,6 +6124,7 @@ min_rows()
/* /*
* Return TRUE if there is only one window (in the current tab page), not * Return TRUE if there is only one window (in the current tab page), not
* counting a help or preview window, unless it is the current window. * counting a help or preview window, unless it is the current window.
* Does not count "aucmd_win".
*/ */
int int
only_one_window() only_one_window()
@@ -6053,11 +6138,15 @@ only_one_window()
return FALSE; return FALSE;
for (wp = firstwin; wp != NULL; wp = wp->w_next) for (wp = firstwin; wp != NULL; wp = wp->w_next)
if (!((wp->w_buffer->b_help && !curbuf->b_help) if ((!((wp->w_buffer->b_help && !curbuf->b_help)
# ifdef FEAT_QUICKFIX # ifdef FEAT_QUICKFIX
|| wp->w_p_pvw || wp->w_p_pvw
# endif # endif
) || wp == curwin) ) || wp == curwin)
# ifdef FEAT_AUTOCMD
&& wp != aucmd_win
# endif
)
++count; ++count;
return (count <= 1); return (count <= 1);
#else #else
@@ -6112,11 +6201,12 @@ check_lnums(do_curwin)
/* /*
* Create a snapshot of the current frame sizes. * Create a snapshot of the current frame sizes.
*/ */
static void void
make_snapshot() make_snapshot(idx)
int idx;
{ {
clear_snapshot(curtab); clear_snapshot(curtab, idx);
make_snapshot_rec(topframe, &curtab->tp_snapshot); make_snapshot_rec(topframe, &curtab->tp_snapshot[idx]);
} }
static void static void
@@ -6144,11 +6234,12 @@ make_snapshot_rec(fr, frp)
* Remove any existing snapshot. * Remove any existing snapshot.
*/ */
static void static void
clear_snapshot(tp) clear_snapshot(tp, idx)
tabpage_T *tp; tabpage_T *tp;
int idx;
{ {
clear_snapshot_rec(tp->tp_snapshot); clear_snapshot_rec(tp->tp_snapshot[idx]);
tp->tp_snapshot = NULL; tp->tp_snapshot[idx] = NULL;
} }
static void static void
@@ -6168,26 +6259,27 @@ clear_snapshot_rec(fr)
* This is only done if the screen size didn't change and the window layout is * This is only done if the screen size didn't change and the window layout is
* still the same. * still the same.
*/ */
static void void
restore_snapshot(close_curwin) restore_snapshot(idx, close_curwin)
int idx;
int close_curwin; /* closing current window */ int close_curwin; /* closing current window */
{ {
win_T *wp; win_T *wp;
if (curtab->tp_snapshot != NULL if (curtab->tp_snapshot[idx] != NULL
# ifdef FEAT_VERTSPLIT # ifdef FEAT_VERTSPLIT
&& curtab->tp_snapshot->fr_width == topframe->fr_width && curtab->tp_snapshot[idx]->fr_width == topframe->fr_width
# endif # endif
&& curtab->tp_snapshot->fr_height == topframe->fr_height && curtab->tp_snapshot[idx]->fr_height == topframe->fr_height
&& check_snapshot_rec(curtab->tp_snapshot, topframe) == OK) && check_snapshot_rec(curtab->tp_snapshot[idx], topframe) == OK)
{ {
wp = restore_snapshot_rec(curtab->tp_snapshot, topframe); wp = restore_snapshot_rec(curtab->tp_snapshot[idx], topframe);
win_comp_pos(); win_comp_pos();
if (wp != NULL && close_curwin) if (wp != NULL && close_curwin)
win_goto(wp); win_goto(wp);
redraw_all_later(CLEAR); redraw_all_later(CLEAR);
} }
clear_snapshot(curtab); clear_snapshot(curtab, idx);
} }
/* /*