vim: src/session.c comparison

comparison src/session.c @ 22226:4ed106deb772 v8.2.1662

patch 8.2.1662: :mksession does not restore shared terminal buffer properly Commit: https://github.com/vim/vim/commit/0e655111e9dbdbdf69fee1b199f2b9c355bf4a10 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Sep 11 20:36:36 2020 +0200 patch 8.2.1662: :mksession does not restore shared terminal buffer properly Problem: :mksession does not restore shared terminal buffer properly. Solution: Keep a hashtab with terminal buffers. (Rob Pilling, closes https://github.com/vim/vim/issues/6930)

author	Bram Moolenaar <Bram@vim.org>
date	Fri, 11 Sep 2020 20:45:04 +0200
parents	407351a89c61
children	0bbc8be90207

comparison

equal deleted inserted replaced

-:4d538e35eebd
+:4ed106deb772
 put_view(
 FILE	*fd,
 win_T	*wp,
 int		add_edit,	// add ":edit" command to view
 unsigned	*flagp,		// vop_flags or ssop_flags
-int		current_arg_idx) // current argument index of the window, use
+int		current_arg_idx	// current argument index of the window, use
-				 // -1 if unknown
+				// -1 if unknown
+#ifdef FEAT_TERMINAL
+, hashtab_T *terminal_bufs
+#endif
+)
 {
 win_T	*save_curwin;
 int		f;
 int		do_cursor;
 int		did_next = FALSE;
 if (add_edit && (!did_next || wp->w_arg_idx_invalid))
 {
 # ifdef FEAT_TERMINAL
 	if (bt_terminal(wp->w_buffer))
 	{
-	    if (term_write_session(fd, wp) == FAIL)
+	    if (term_write_session(fd, wp, terminal_bufs) == FAIL)
 		return FAIL;
 	}
 	else
 # endif
 	// Load the file.
 int		restore_stal = FALSE;
 win_T	*tab_firstwin;
 frame_T	*tab_topframe;
 int		cur_arg_idx = 0;
 int		next_arg_idx = 0;
+int		ret = FAIL;
+#ifdef FEAT_TERMINAL
+hashtab_T	terminal_bufs;
+hash_init(&terminal_bufs);
+#endif
 if (ssop_flags & SSOP_BUFFERS)
 	only_save_windows = FALSE;		// Save ALL buffers
 // Begin by setting the this_session variable, and then other
 // sessionable variables.
 #ifdef FEAT_EVAL
 if (put_line(fd, "let v:this_session=expand(\"<sfile>:p\")") == FAIL)
-	return FAIL;
+	goto fail;
 if (ssop_flags & SSOP_GLOBALS)
 	if (store_session_globals(fd) == FAIL)
-	    return FAIL;
+	    goto fail;
 #endif
 // Close all windows and tabs but one.
 if (put_line(fd, "silent only") == FAIL)
-	return FAIL;
+	goto fail;
 if ((ssop_flags & SSOP_TABPAGES)
 	    && put_line(fd, "silent tabonly") == FAIL)
-	return FAIL;
+	goto fail;
 // Now a :cd command to the session directory or the current directory
 if (ssop_flags & SSOP_SESDIR)
 {
 	if (put_line(fd, "exe \"cd \" . escape(expand(\"<sfile>:p:h\"), ' ')")
 								      == FAIL)
-	    return FAIL;
+	    goto fail;
 }
 else if (ssop_flags & SSOP_CURDIR)
 {
 	sname = home_replace_save(NULL, globaldir != NULL ? globaldir : dirnow);
 	if (sname == NULL
 		|| fputs("cd ", fd) < 0
 		|| ses_put_fname(fd, sname, &ssop_flags) == FAIL
 		|| put_eol(fd) == FAIL)
 	{
 	    vim_free(sname);
-	    return FAIL;
+	    goto fail;
 	}
 	vim_free(sname);
 }
 // If there is an empty, unnamed buffer we will wipe it out later.
 // Remember the buffer number.
 if (put_line(fd, "if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''") == FAIL)
-	return FAIL;
+	goto fail;
 if (put_line(fd, "  let s:wipebuf = bufnr('%')") == FAIL)
-	return FAIL;
+	goto fail;
 if (put_line(fd, "endif") == FAIL)
-	return FAIL;
+	goto fail;
 // Now save the current files, current buffer first.
 if (put_line(fd, "set shortmess=aoO") == FAIL)
-	return FAIL;
+	goto fail;
 // the global argument list
 if (ses_arglist(fd, "argglobal", &global_alist.al_ga,
 			    !(ssop_flags & SSOP_CURDIR), &ssop_flags) == FAIL)
-	return FAIL;
+	goto fail;
 if (ssop_flags & SSOP_RESIZE)
 {
 	// Note: after the restore we still check it worked!
 	if (fprintf(fd, "set lines=%ld columns=%ld" , Rows, Columns) < 0
 		|| put_eol(fd) == FAIL)
-	    return FAIL;
+	    goto fail;
 }
 #ifdef FEAT_GUI
 if (gui.in_use && (ssop_flags & SSOP_WINPOS))
 {
 	if (gui_mch_get_winpos(&x, &y) == OK)
 	{
 	    // Note: after the restore we still check it worked!
 	    if (fprintf(fd, "winpos %d %d", x, y) < 0 || put_eol(fd) == FAIL)
-		return FAIL;
+		goto fail;
 	}
 }
 #endif
 // When there are two or more tabpages and 'showtabline' is 1 the tabline
 // in the first tab, which may cause problems.  Set 'showtabline' to 2
 // temporarily to avoid that.
 if (p_stal == 1 && first_tabpage->tp_next != NULL)
 {
 	if (put_line(fd, "set stal=2") == FAIL)
-	    return FAIL;
+	    goto fail;
 	restore_stal = TRUE;
 }
 // May repeat putting Windows for each tab, when "tabpages" is in
 // 'sessionoptions'.
 	// Similar to ses_win_rec() below, populate the tab pages first so
 	// later local options won't be copied to the new tabs.
 	FOR_ALL_TABPAGES(tp)
 	    if (tp->tp_next != NULL && put_line(fd, "tabnew") == FAIL)
-		return FAIL;
+		goto fail;
 	if (first_tabpage->tp_next != NULL && put_line(fd, "tabrewind") == FAIL)
-	    return FAIL;
+	    goto fail;
 }
 for (tabnr = 1; ; ++tabnr)
 {
 	tabpage_T *tp = NULL;
 	int	need_tabnext = FALSE;
 		    && !bt_nofilename(wp->w_buffer)
 #endif
 		    )
 	    {
 		if (need_tabnext && put_line(fd, "tabnext") == FAIL)
-		    return FAIL;
+		    goto fail;
 		need_tabnext = FALSE;
 		if (fputs("edit ", fd) < 0
 			      || ses_fname(fd, wp->w_buffer, &ssop_flags, TRUE)
 								       == FAIL)
-		    return FAIL;
+		    goto fail;
 		if (!wp->w_arg_idx_invalid)
 		    edited_win = wp;
 		break;
 	    }
 	}
 	// If no file got edited create an empty tab page.
 	if (need_tabnext && put_line(fd, "tabnext") == FAIL)
-	    return FAIL;
+	    goto fail;
 	// Save current window layout.
 	if (put_line(fd, "set splitbelow splitright") == FAIL)
-	    return FAIL;
+	    goto fail;
 	if (ses_win_rec(fd, tab_topframe) == FAIL)
-	    return FAIL;
+	    goto fail;
 	if (!p_sb && put_line(fd, "set nosplitbelow") == FAIL)
-	    return FAIL;
+	    goto fail;
 	if (!p_spr && put_line(fd, "set nosplitright") == FAIL)
-	    return FAIL;
+	    goto fail;
 	// Check if window sizes can be restored (no windows omitted).
 	// Remember the window number of the current window after restoring.
 	nr = 0;
 	for (wp = tab_firstwin; wp != NULL; wp = W_NEXT(wp))
 		cnr = nr;
 	}
 	// Go to the first window.
 	if (put_line(fd, "wincmd t") == FAIL)
-	    return FAIL;
+	    goto fail;
 	// If more than one window, see if sizes can be restored.
 	// First set 'winheight' and 'winwidth' to 1 to avoid the windows being
 	// resized when moving between windows.
 	// Do this before restoring the view, so that the topline and the
 	// user has set winheight or winwidth.
 	if (put_line(fd, "set winminheight=0") == FAIL
 		|| put_line(fd, "set winheight=1") == FAIL
 		|| put_line(fd, "set winminwidth=0") == FAIL
 		|| put_line(fd, "set winwidth=1") == FAIL)
-	    return FAIL;
+	    goto fail;
 	if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL)
-	    return FAIL;
+	    goto fail;
 	// Restore the tab-local working directory if specified
 	// Do this before the windows, so that the window-local directory can
 	// override the tab-local directory.
 	if (tp != NULL && tp->tp_localdir != NULL && ssop_flags & SSOP_CURDIR)
 	{
 	    if (fputs("tcd ", fd) < 0
 		    || ses_put_fname(fd, tp->tp_localdir, &ssop_flags) == FAIL
 		    || put_eol(fd) == FAIL)
-		return FAIL;
+		goto fail;
 	    did_lcd = TRUE;
 	}
 	// Restore the view of the window (options, file, cursor, etc.).
 	for (wp = tab_firstwin; wp != NULL; wp = wp->w_next)
 	{
 	    if (!ses_do_win(wp))
 		continue;
-	    if (put_view(fd, wp, wp != edited_win, &ssop_flags,
+	    if (put_view(fd, wp, wp != edited_win, &ssop_flags, cur_arg_idx
-							 cur_arg_idx) == FAIL)
+#ifdef FEAT_TERMINAL
-		return FAIL;
+							 , &terminal_bufs
+#endif
+		 ) == FAIL)
+		goto fail;
 	    if (nr > 1 && put_line(fd, "wincmd w") == FAIL)
-		return FAIL;
+		goto fail;
 	    next_arg_idx = wp->w_arg_idx;
 	}
 	// The argument index in the first tab page is zero, need to set it in
 	// each window.  For further tab pages it's the window where we do
 	cur_arg_idx = next_arg_idx;
 	// Restore cursor to the current window if it's not the first one.
 	if (cnr > 1 && (fprintf(fd, "%dwincmd w", cnr) < 0
 						      || put_eol(fd) == FAIL))
-	    return FAIL;
+	    goto fail;
 	// Restore window sizes again after jumping around in windows, because
 	// the current window has a minimum size while others may not.
 	if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL)
-	    return FAIL;
+	    goto fail;
 	// Don't continue in another tab page when doing only the current one
 	// or when at the last tab page.
 	if (!(ssop_flags & SSOP_TABPAGES))
 	    break;
 if (ssop_flags & SSOP_TABPAGES)
 {
 	if (fprintf(fd, "tabnext %d", tabpage_index(curtab)) < 0
 		|| put_eol(fd) == FAIL)
-	    return FAIL;
+	    goto fail;
 }
 if (restore_stal && put_line(fd, "set stal=1") == FAIL)
-	return FAIL;
+	goto fail;
 // Now put the remaining buffers into the buffer list.
 // This is near the end, so that when 'hidden' is set we don't create extra
 // buffers.  If the buffer was already created with another command the
 // ":badd" will have no effect.
 		&& buf->b_p_bl)
 	{
 	    if (fprintf(fd, "badd +%ld ", buf->b_wininfo == NULL ? 1L
 					   : buf->b_wininfo->wi_fpos.lnum) < 0
 		    || ses_fname(fd, buf, &ssop_flags, TRUE) == FAIL)
-		return FAIL;
+		goto fail;
 	}
 }
 // Wipe out an empty unnamed buffer we started in.
 if (put_line(fd, "if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0")
 								       == FAIL)
-	return FAIL;
+	goto fail;
 if (put_line(fd, "  silent exe 'bwipe ' . s:wipebuf") == FAIL)
-	return FAIL;
+	goto fail;
 if (put_line(fd, "endif") == FAIL)
-	return FAIL;
+	goto fail;
 if (put_line(fd, "unlet! s:wipebuf") == FAIL)
-	return FAIL;
+	goto fail;
 // Re-apply 'winheight', 'winwidth' and 'shortmess'.
 if (fprintf(fd, "set winheight=%ld winwidth=%ld shortmess=%s",
 			       p_wh, p_wiw, p_shm) < 0 || put_eol(fd) == FAIL)
-	return FAIL;
+	goto fail;
 // Re-apply 'winminheight' and 'winminwidth'.
 if (fprintf(fd, "set winminheight=%ld winminwidth=%ld",
 				      p_wmh, p_wmw) < 0 || put_eol(fd) == FAIL)
-	return FAIL;
+	goto fail;
 // Lastly, execute the x.vim file if it exists.
 if (put_line(fd, "let s:sx = expand(\"<sfile>:p:r\").\"x.vim\"") == FAIL
 	    || put_line(fd, "if filereadable(s:sx)") == FAIL
 	    || put_line(fd, "  exe \"source \" . fnameescape(s:sx)") == FAIL
 	    || put_line(fd, "endif") == FAIL)
-	return FAIL;
+	goto fail;
-return OK;
+ret = OK;
+fail:
+#ifdef FEAT_TERMINAL
+hash_clear_all(&terminal_bufs, 0);
+#endif
+return ret;
 }
 /*
 * Get the name of the view file for the current buffer.
 */
 #ifdef FEAT_SESSION
 int		view_session = FALSE;
 int		using_vdir = FALSE;	// using 'viewdir'?
 char_u	*viewFile = NULL;
 unsigned	*flagp;
+#endif
+#ifdef FEAT_TERMINAL
+hashtab_T	terminal_bufs;
+hash_init(&terminal_bufs);
 #endif
 if (eap->cmdidx == CMD_mksession || eap->cmdidx == CMD_mkview)
 {
 #ifdef FEAT_SESSION
 		    vim_free(dirnow);
 		}
 	    }
 	    else
 	    {
-		failed |= (put_view(fd, curwin, !using_vdir, flagp,
+		failed |= (put_view(fd, curwin, !using_vdir, flagp, -1
-								 -1) == FAIL);
+#ifdef FEAT_TERMINAL
+							       , &terminal_bufs
+#endif
+			    ) == FAIL);
 	    }
 	    if (put_line(fd, "let &so = s:so_save | let &siso = s:siso_save")
 								      == FAIL)
 		failed = TRUE;
 #ifdef FEAT_SEARCH_EXTRA

Mercurial > vim

comparison src/session.c @ 22226:4ed106deb772 v8.2.1662