Patch 8.0.1052 Problem: term_start() does not allow in_io, out_io and err_io options. Solution: Add JO_OUT_IO to get_job_options(). Files: src/terminal.c, src/testdir/test_terminal.vim
*** ../vim-8.0.1051/src/terminal.c 2017-09-02 18:33:52.457554443 +0200 --- src/terminal.c 2017-09-03 20:59:12.774344122 +0200 *************** *** 39,45 **** * * TODO: * - ":term NONE" does not work in MS-Windows. - * - test for writing lines to terminal job does not work on MS-Windows * - implement term_setsize() * - add test for giving error for invalid 'termsize' value. * - support minimal size when 'termsize' is "rows*cols". --- 39,44 ---- *************** *** 48,63 **** * - GUI: when 'confirm' is set and trying to exit Vim, dialog offers to save * changes to "!shell". * (justrajdeep, 2017 Aug 22) - * - command argument with spaces doesn't work #1999 - * :terminal ls dir\ with\ spaces - * - implement job options when starting a terminal. Allow: - * "in_io", "in_top", "in_bot", "in_name", "in_buf" - "out_io", "out_name", "out_buf", "out_modifiable", "out_msg" - "err_io", "err_name", "err_buf", "err_modifiable", "err_msg" - * Check that something is connected to the terminal. - * Test: "cat" reading from a file or buffer - * "ls" writing stdout to a file or buffer - * shell writing stderr to a file or buffer * - For the GUI fill termios with default values, perhaps like pangoterm: * http://bazaar.launchpad.net/~leonerd/pangoterm/trunk/view/head:/main.c#L134 * - if the job in the terminal does not support the mouse, we can use the --- 47,52 ---- *************** *** 219,234 **** opt->jo_out_mode = MODE_RAW; opt->jo_err_mode = MODE_RAW; opt->jo_set = JO_MODE | JO_OUT_MODE | JO_ERR_MODE; - - opt->jo_io[PART_OUT] = JIO_BUFFER; - opt->jo_io[PART_ERR] = JIO_BUFFER; - opt->jo_set |= JO_OUT_IO + JO_ERR_IO; - - opt->jo_modifiable[PART_OUT] = 0; - opt->jo_modifiable[PART_ERR] = 0; - opt->jo_set |= JO_OUT_MODIFIABLE + JO_ERR_MODIFIABLE; - - opt->jo_set |= JO_OUT_BUF + JO_ERR_BUF; } /* --- 208,213 ---- *************** *** 237,244 **** static void setup_job_options(jobopt_T *opt, int rows, int cols) { ! opt->jo_io_buf[PART_OUT] = curbuf->b_fnum; ! opt->jo_io_buf[PART_ERR] = curbuf->b_fnum; opt->jo_pty = TRUE; if ((opt->jo_set2 & JO2_TERM_ROWS) == 0) opt->jo_term_rows = rows; --- 216,239 ---- static void setup_job_options(jobopt_T *opt, int rows, int cols) { ! if (!(opt->jo_set & JO_OUT_IO)) ! { ! /* Connect stdout to the terminal. */ ! opt->jo_io[PART_OUT] = JIO_BUFFER; ! opt->jo_io_buf[PART_OUT] = curbuf->b_fnum; ! opt->jo_modifiable[PART_OUT] = 0; ! opt->jo_set |= JO_OUT_IO + JO_OUT_BUF + JO_OUT_MODIFIABLE; ! } ! ! if (!(opt->jo_set & JO_ERR_IO)) ! { ! /* Connect stderr to the terminal. */ ! opt->jo_io[PART_ERR] = JIO_BUFFER; ! opt->jo_io_buf[PART_ERR] = curbuf->b_fnum; ! opt->jo_modifiable[PART_ERR] = 0; ! opt->jo_set |= JO_ERR_IO + JO_ERR_BUF + JO_ERR_MODIFIABLE; ! } ! opt->jo_pty = TRUE; if ((opt->jo_set2 & JO2_TERM_ROWS) == 0) opt->jo_term_rows = rows; *************** *** 258,263 **** --- 253,267 ---- if (check_restricted() || check_secure()) return; + 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; + } + term = (term_T *)alloc_clear(sizeof(term_T)); if (term == NULL) return; *************** *** 2833,2843 **** jobopt_T opt; init_job_options(&opt); - /* TODO: allow more job options */ if (argvars[1].v_type != VAR_UNKNOWN && get_job_options(&argvars[1], &opt, JO_TIMEOUT_ALL + JO_STOPONEXIT ! + JO_EXIT_CB + JO_CLOSE_CALLBACK, 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) --- 2837,2846 ---- jobopt_T opt; init_job_options(&opt); if (argvars[1].v_type != VAR_UNKNOWN && get_job_options(&argvars[1], &opt, JO_TIMEOUT_ALL + JO_STOPONEXIT ! + 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) *************** *** 3254,3260 **** { create_vterm(term, term->tl_rows, term->tl_cols); - /* TODO: if the command is "NONE" only create a pty. */ term->tl_job = job_start(argvar, opt); if (term->tl_job != NULL) ++term->tl_job->jv_refcount; --- 3257,3262 ---- *** ../vim-8.0.1051/src/testdir/test_terminal.vim 2017-09-03 19:52:12.924868135 +0200 --- src/testdir/test_terminal.vim 2017-09-03 20:47:07.783162844 +0200 *************** *** 164,173 **** call term_wait(1234) call term_wait(buf) ! if has('win32') ! " TODO: this should not be needed ! sleep 100m ! endif call Check_123(buf) " Must still work after the job ended. --- 164,171 ---- call term_wait(1234) call term_wait(buf) ! let g:buf = buf ! call WaitFor('len(term_scrape(g:buf, 1)) > 0') call Check_123(buf) " Must still work after the job ended. *************** *** 573,575 **** --- 571,615 ---- call delete('Xdir with spaces', 'rf') bwipe endfunc + + func Test_terminal_wrong_options() + call assert_fails('call term_start(&shell, { + \ "in_io": "file", + \ "in_name": "xxx", + \ "out_io": "file", + \ "out_name": "xxx", + \ "err_io": "file", + \ "err_name": "xxx" + \ })', 'E474:') + call assert_fails('call term_start(&shell, { + \ "out_buf": bufnr("%") + \ })', 'E474:') + call assert_fails('call term_start(&shell, { + \ "err_buf": bufnr("%") + \ })', 'E474:') + endfunc + + func Test_terminal_redir_file() + let cmd = Get_cat_123_cmd() + let buf = term_start(cmd, {'out_io': 'file', 'out_name': 'Xfile'}) + call term_wait(buf) + call WaitFor('len(readfile("Xfile")) > 0') + call assert_match('123', readfile('Xfile')[0]) + call delete('Xfile') + + if has('unix') + let buf = term_start('xyzabc', {'err_io': 'file', 'err_name': 'Xfile'}) + call term_wait(buf) + call WaitFor('len(readfile("Xfile")) > 0') + call assert_match('executing job failed', readfile('Xfile')[0]) + call delete('Xfile') + + call writefile(['one line'], 'Xfile') + let buf = term_start('cat', {'in_io': 'file', 'in_name': 'Xfile'}) + call term_wait(buf) + call WaitFor('term_getline(' . buf . ', 1) == "one line"') + call assert_equal('one line', term_getline(buf, 1)) + bwipe + call delete('Xfile') + endif + endfunc *** ../vim-8.0.1051/src/version.c 2017-09-03 19:52:12.924868135 +0200 --- src/version.c 2017-09-03 20:58:25.718654528 +0200 *************** *** 771,772 **** --- 771,774 ---- { /* Add new patch number below this line */ + /**/ + 1052, /**/ -- hundred-and-one symptoms of being an internet addict: 72. Somebody at IRC just mentioned a way to obtain full motion video without a PC using a wireless protocol called NTSC, you wonder how you never heard about it /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
