vim: src/terminal.c comparison

comparison src/terminal.c @ 12393:128cd982c7b8 v8.0.1076

patch 8.0.1076: term_start() does not take callbacks commit https://github.com/vim/vim/commit/3c518400d1a51929572dd9fcf77dba94d78d7545 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Sep 8 20:47:00 2017 +0200 patch 8.0.1076: term_start() does not take callbacks Problem: term_start() does not take callbacks. When using two terminals without a job only one is read from. A terminal without a window returns the wrong pty. Solution: Support "callback", "out_cb" and "err_cb". Fix terminal without a window. Fix reading from multiple channels.

author	Christian Brabandt <cb@256bit.org>
date	Fri, 08 Sep 2017 21:00:04 +0200
parents	438c64b76eef
children	eb8d5c4936f1

comparison

equal deleted inserted replaced

-:e70744183d63
+:128cd982c7b8
 	opt->jo_term_rows = rows;
 if ((opt->jo_set2 & JO2_TERM_COLS) == 0)
 	opt->jo_term_cols = cols;
 }
-static void
+/*
+* Start a terminal window and return its buffer.
+* Returns NULL when failed.
+*/
+static buf_T *
 term_start(typval_T *argvar, jobopt_T *opt, int forceit)
 {
 exarg_T	split_ea;
 win_T	*old_curwin = curwin;
 term_T	*term;
 buf_T	*old_curbuf = NULL;
 int		res;
+buf_T	*newbuf;
 if (check_restricted() || check_secure())
-	return;
+	return NULL;
 if ((opt->jo_set & (JO_IN_IO + JO_OUT_IO + JO_ERR_IO))
 					 == (JO_IN_IO + JO_OUT_IO + JO_ERR_IO)
 	|| (!(opt->jo_set & JO_OUT_IO) && (opt->jo_set & JO_OUT_BUF))
 	|| (!(opt->jo_set & JO_ERR_IO) && (opt->jo_set & JO_ERR_BUF)))
 {
 	EMSG(_(e_invarg));
-	return;
+	return NULL;
 }
 term = (term_T *)alloc_clear(sizeof(term_T));
 if (term == NULL)
-	return;
+	return NULL;
 term->tl_dirty_row_end = MAX_ROW;
 term->tl_cursor_visible = TRUE;
 term->tl_cursor_shape = VTERM_PROP_CURSORSHAPE_BLOCK;
 term->tl_finish = opt->jo_term_finish;
 ga_init2(&term->tl_scrollback, sizeof(sb_line_T), 300);
 	/* Create a new buffer in the current window. */
 	if (!can_abandon(curbuf, forceit))
 	{
 	    no_write_message();
 	    vim_free(term);
-	    return;
+	    return NULL;
 	}
 	if (do_ecmd(0, NULL, NULL, &split_ea, ECMD_ONE,
 		     ECMD_HIDE + (forceit ? ECMD_FORCEIT : 0), curwin) == FAIL)
 	{
 	    vim_free(term);
-	    return;
+	    return NULL;
 	}
 }
 else if (opt->jo_hidden)
 {
 	buf_T *buf;
 	buf = buflist_new((char_u *)"", NULL, (linenr_T)0,
 							 BLN_NEW | BLN_LISTED);
 	if (buf == NULL || ml_open(buf) == FAIL)
 	{
 	    vim_free(term);
-	    return;
+	    return NULL;
 	}
 	old_curbuf = curbuf;
 	--curbuf->b_nwindows;
 	curbuf = buf;
 	curwin->w_buffer = buf;
 	ex_splitview(&split_ea);
 	if (curwin == old_curwin)
 	{
 	    /* split failed */
 	    vim_free(term);
-	    return;
+	    return NULL;
 	}
 }
 term->tl_buffer = curbuf;
 curbuf->b_term = term;
 	    && STRCMP(argvar->vval.v_string, "NONE") == 0)
 	res = create_pty_only(term, opt);
 else
 	res = term_and_job_init(term, argvar, opt);
+newbuf = curbuf;
 if (res == OK)
 {
 	/* Get and remember the size we ended up with.  Update the pty. */
 	vterm_get_size(term->tl_vterm, &term->tl_rows, &term->tl_cols);
 	term_report_winsize(term, term->tl_rows, term->tl_cols);
 	}
 	/* Wiping out the buffer will also close the window and call
 	 * free_terminal(). */
 	do_buffer(DOBUF_WIPE, DOBUF_FIRST, FORWARD, buf->b_fnum, TRUE);
-}
+	return NULL;
+}
+return newbuf;
 }
 /*
 * ":terminal": open a terminal window and execute a job in it.
 */
 	if (buffer == curbuf)
 	{
 	    update_screen(0);
 	    update_cursor(term, TRUE);
 	}
-	else
+	else if (buffer->b_nwindows > 0)
 	    redraw_after_callback(TRUE);
 }
 }
 /*
 	&& (term->tl_job->jv_status == JOB_STARTED
 		|| term->tl_job->jv_channel->ch_keep_open);
 }
 /*
+* Return TRUE if "term" has an active channel and used ":term NONE".
+*/
+int
+term_none_open(term_T *term)
+{
+/* Also consider the job finished when the channel is closed, to avoid a
+* race condition when updating the title. */
+return term != NULL
+	&& term->tl_job != NULL
+	&& channel_is_open(term->tl_job->jv_channel)
+	&& term->tl_job->jv_channel->ch_keep_open;
+}
+/*
 * Add the last line of the scrollback buffer to the buffer in the window.
 */
 static void
 add_scrollback_line_to_buffer(term_T *term, char_u *text, int len)
 {
 	    else
 		txt = (char_u *)_("Terminal-finished");
 	}
 	else if (term->tl_title != NULL)
 	    txt = term->tl_title;
+	else if (term_none_open(term))
+	    txt = (char_u *)_("active");
 	else if (term_job_running(term))
 	    txt = (char_u *)_("running");
 	else
 	    txt = (char_u *)_("finished");
 	len = 9 + STRLEN(term->tl_buffer->b_fname) + STRLEN(txt);
 */
 void
 f_term_start(typval_T *argvars, typval_T *rettv)
 {
 jobopt_T	opt;
+buf_T	*buf;
 init_job_options(&opt);
 if (argvars[1].v_type != VAR_UNKNOWN
 	    && get_job_options(&argvars[1], &opt,
 		JO_TIMEOUT_ALL + JO_STOPONEXIT
+		    + JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK
 		    + JO_EXIT_CB + JO_CLOSE_CALLBACK + JO_OUT_IO,
 		JO2_TERM_NAME + JO2_TERM_FINISH + JO2_HIDDEN + JO2_TERM_OPENCMD
 		    + JO2_TERM_COLS + JO2_TERM_ROWS + JO2_VERTICAL + JO2_CURWIN
 		    + JO2_CWD + JO2_ENV + JO2_EOF_CHARS) == FAIL)
 	return;
 if (opt.jo_vertical)
 	cmdmod.split = WSP_VERT;
-term_start(&argvars[0], &opt, FALSE);
+buf = term_start(&argvars[0], &opt, FALSE);
-if (curbuf->b_term != NULL)
+if (buf != NULL && buf->b_term != NULL)
-	rettv->vval.v_number = curbuf->b_fnum;
+	rettv->vval.v_number = buf->b_fnum;
 }
 /*
 * "term_wait" function
 */
 }
 static int
 create_pty_only(term_T *term, jobopt_T *opt)
 {
-int ret;
 create_vterm(term, term->tl_rows, term->tl_cols);
 term->tl_job = job_alloc();
 if (term->tl_job == NULL)
 	return FAIL;
 ++term->tl_job->jv_refcount;
 /* behave like the job is already finished */
 term->tl_job->jv_status = JOB_FINISHED;
-ret = mch_create_pty_channel(term->tl_job, opt);
+return mch_create_pty_channel(term->tl_job, opt);
-return ret;
 }
 /*
 * Free the terminal emulator part of "term".
 */

Mercurial > vim

comparison src/terminal.c @ 12393:128cd982c7b8 v8.0.1076