diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-03 20:52:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-03 20:52:19 +0200 |
| commit | 5be8dd087f36affa492ef6049fa813b376210543 (patch) | |
| tree | a567972a40aa5ab7f8b99f17d9c21d2b4ecd5b07 | |
| parent | e9c21aed6233185e7fbe1b462a0571c0e460a5a9 (diff) | |
| download | vim-git-5be8dd087f36affa492ef6049fa813b376210543.tar.gz | |
patch 8.0.0855: MS-Windows: can't get tty name of terminalv8.0.0855
Problem: MS-Windows: can't get tty name of terminal.
Solution: Use the winpty process number. (Yasuhiro Matsumoto, closes #1929)
| -rw-r--r-- | src/terminal.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_terminal.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/terminal.c b/src/terminal.c index 9c165337b..d3dde181b 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -2201,6 +2201,7 @@ void (*winpty_spawn_config_free)(void*); void (*winpty_error_free)(void*); LPCWSTR (*winpty_error_msg)(void*); BOOL (*winpty_set_size)(void*, int, int, void*); +HANDLE (*winpty_agent_process)(void*); #define WINPTY_DLL "winpty.dll" @@ -2230,6 +2231,7 @@ dyn_winpty_init(void) {"winpty_spawn_config_new", (FARPROC*)&winpty_spawn_config_new}, {"winpty_error_msg", (FARPROC*)&winpty_error_msg}, {"winpty_set_size", (FARPROC*)&winpty_set_size}, + {"winpty_agent_process", (FARPROC*)&winpty_agent_process}, {NULL, NULL} }; @@ -2272,6 +2274,7 @@ term_and_job_init(term_T *term, int rows, int cols, char_u *cmd, jobopt_T *opt) HANDLE jo = NULL, child_process_handle, child_thread_handle; void *winpty_err; void *spawn_config = NULL; + char buf[MAX_PATH]; if (!dyn_winpty_init()) return FAIL; @@ -2358,6 +2361,9 @@ term_and_job_init(term_T *term, int rows, int cols, char_u *cmd, jobopt_T *opt) job->jv_proc_info.dwProcessId = GetProcessId(child_process_handle); job->jv_job_object = jo; job->jv_status = JOB_STARTED; + sprintf(buf, "winpty://%lu", + GetProcessId(winpty_agent_process(term->tl_winpty))); + job->jv_tty_name = vim_strsave((char_u*)buf); ++job->jv_refcount; term->tl_job = job; diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 90bc58b85..987b1ee13 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -34,7 +34,8 @@ func Test_terminal_basic() call assert_match("^/dev/", job_info(g:job).tty) call assert_match("^/dev/", term_gettty('')) else - call assert_equal("", job_info(g:job).tty) + call assert_match("^winpty://", job_info(g:job).tty) + call assert_match("^winpty://", term_gettty('')) endif call Stop_shell_in_terminal(buf) call term_wait(buf) diff --git a/src/version.c b/src/version.c index 25750b5c6..bf30da6b0 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 855, +/**/ 854, /**/ 853, |